From 4d46820cf44290216be9de98ca78f0fc55903d47 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Mon, 1 Jan 2018 21:25:11 +0100
Subject: [PATCH] Reformatted for code style.

---
 .idea/codeStyleSettings.xml                   |   14 +
 .../java/dk/camelot64/kickc/Compiler.java     |   56 +-
 .../java/dk/camelot64/kickc/NumberParser.java |    2 +-
 .../kickc/asm/AsmAddressingMode.java          |    2 +-
 .../camelot64/kickc/asm/AsmBasicUpstart.java  |    2 +-
 .../dk/camelot64/kickc/asm/AsmClobber.java    |   71 +-
 .../dk/camelot64/kickc/asm/AsmComment.java    |    2 +-
 .../dk/camelot64/kickc/asm/AsmConstant.java   |    4 +-
 .../dk/camelot64/kickc/asm/AsmDataFill.java   |    6 +-
 .../camelot64/kickc/asm/AsmDataNumeric.java   |   30 +-
 .../dk/camelot64/kickc/asm/AsmDataString.java |    2 +-
 .../camelot64/kickc/asm/AsmInstruction.java   |   16 +-
 .../kickc/asm/AsmInstructionSet.java          |   76 +-
 .../java/dk/camelot64/kickc/asm/AsmLabel.java |   12 +-
 .../dk/camelot64/kickc/asm/AsmLabelDecl.java  |    4 +-
 .../dk/camelot64/kickc/asm/AsmProgram.java    |   32 +-
 .../asm/AsmProgramStaticRegisterValues.java   |  374 +++---
 .../dk/camelot64/kickc/asm/AsmScopeBegin.java |    2 +-
 .../dk/camelot64/kickc/asm/AsmScopeEnd.java   |    2 +-
 .../dk/camelot64/kickc/asm/AsmSegment.java    |   28 +-
 .../java/dk/camelot64/kickc/asm/AsmSetPc.java |    2 +-
 .../camelot64/kickc/fragment/AsmFormat.java   |  262 ++---
 .../camelot64/kickc/fragment/AsmFragment.java |  536 ++++-----
 .../kickc/fragment/AsmFragmentManager.java    | 1004 ++++++++---------
 .../kickc/fragment/AsmFragmentSignature.java  |  120 +-
 .../kickc/fragment/AsmFragmentSynthesis.java  |  164 +--
 .../kickc/fragment/AsmFragmentTemplate.java   |  195 ++--
 .../kickc/fragment/AsmFragmentUsages.java     |  312 ++---
 .../dk/camelot64/kickc/model/CallGraph.java   |   35 +-
 .../camelot64/kickc/model/CompileError.java   |    2 +-
 .../kickc/model/ConstantArrayList.java        |    4 +-
 .../camelot64/kickc/model/ConstantBinary.java |    2 +-
 .../camelot64/kickc/model/ConstantBool.java   |    4 +-
 .../camelot64/kickc/model/ConstantChar.java   |    4 +-
 .../camelot64/kickc/model/ConstantDouble.java |    4 +-
 .../kickc/model/ConstantInteger.java          |   10 +-
 .../camelot64/kickc/model/ConstantString.java |    4 +-
 .../camelot64/kickc/model/ConstantUnary.java  |    8 +-
 .../kickc/model/ConstantValueCalculator.java  |   37 +-
 .../dk/camelot64/kickc/model/ConstantVar.java |   28 +-
 .../kickc/model/ControlFlowBlock.java         |   66 +-
 .../kickc/model/ControlFlowGraph.java         |   60 +-
 .../model/ControlFlowGraphBaseVisitor.java    |    6 +-
 .../model/ControlFlowGraphCopyVisitor.java    |   18 +-
 .../kickc/model/DominatorsBlock.java          |   17 +-
 .../kickc/model/DominatorsGraph.java          |   10 +-
 .../java/dk/camelot64/kickc/model/LValue.java |    2 +-
 .../java/dk/camelot64/kickc/model/Label.java  |   18 +-
 .../dk/camelot64/kickc/model/LabelRef.java    |    2 +-
 .../dk/camelot64/kickc/model/LiveRange.java   |  295 ++---
 .../model/LiveRangeEquivalenceClass.java      |   12 +-
 .../model/LiveRangeEquivalenceClassSet.java   |   19 +-
 .../kickc/model/LiveRangeVariables.java       |   19 +-
 .../model/LiveRangeVariablesEffective.java    |  154 +--
 .../kickc/model/LvalueIntermediate.java       |    8 +-
 .../dk/camelot64/kickc/model/NaturalLoop.java |   24 +-
 .../camelot64/kickc/model/NaturalLoopSet.java |   23 +-
 .../dk/camelot64/kickc/model/Operator.java    |  105 +-
 .../camelot64/kickc/model/PhiTransitions.java |   40 +-
 .../model/PointerDereferenceIndexed.java      |    4 +-
 .../kickc/model/PointerDereferenceSimple.java |    2 +-
 .../dk/camelot64/kickc/model/Procedure.java   |   37 +-
 .../kickc/model/ProcedureModifiedVars.java    |    9 +-
 .../camelot64/kickc/model/ProcedureRef.java   |    6 +-
 .../dk/camelot64/kickc/model/Program.java     |   60 +-
 .../camelot64/kickc/model/ProgramScope.java   |    4 +-
 .../java/dk/camelot64/kickc/model/RValue.java |    2 +-
 .../kickc/model/RegisterCombination.java      |   10 +-
 .../model/RegisterCombinationIterator.java    |    4 +-
 .../kickc/model/RegisterPotentials.java       |   10 +-
 .../kickc/model/RegisterUpliftProgram.java    |    2 +-
 .../kickc/model/RegisterUpliftScope.java      |   18 +-
 .../dk/camelot64/kickc/model/Registers.java   |   16 +-
 .../java/dk/camelot64/kickc/model/Scope.java  |  114 +-
 .../dk/camelot64/kickc/model/ScopeRef.java    |    2 +-
 .../dk/camelot64/kickc/model/Statement.java   |    6 +-
 .../kickc/model/StatementAssignment.java      |   20 +-
 .../camelot64/kickc/model/StatementBase.java  |   18 +-
 .../camelot64/kickc/model/StatementCall.java  |   24 +-
 .../kickc/model/StatementConditionalJump.java |   39 +-
 .../camelot64/kickc/model/StatementInfos.java |    5 +
 .../camelot64/kickc/model/StatementJump.java  |    2 +-
 .../camelot64/kickc/model/StatementLabel.java |    2 +-
 .../kickc/model/StatementPhiBlock.java        |   61 +-
 .../kickc/model/StatementProcedureBegin.java  |   12 +-
 .../kickc/model/StatementProcedureEnd.java    |    2 +-
 .../kickc/model/StatementReturn.java          |    8 +-
 .../kickc/model/StatementSequence.java        |    4 +-
 .../java/dk/camelot64/kickc/model/Symbol.java |    4 +-
 .../dk/camelot64/kickc/model/SymbolRef.java   |   24 +-
 .../dk/camelot64/kickc/model/SymbolType.java  |   46 +-
 .../kickc/model/SymbolTypeBasic.java          |    4 +-
 .../kickc/model/SymbolTypeInference.java      |   12 +-
 .../kickc/model/SymbolTypeInline.java         |   17 +-
 .../kickc/model/SymbolTypeInteger.java        |    2 +-
 .../kickc/model/SymbolTypePointer.java        |    6 +-
 .../kickc/model/SymbolTypeProcedure.java      |    2 +-
 .../kickc/model/SymbolTypeProgram.java        |    2 +-
 .../java/dk/camelot64/kickc/model/Value.java  |    4 +-
 .../dk/camelot64/kickc/model/ValueList.java   |   10 +-
 .../dk/camelot64/kickc/model/Variable.java    |   39 +-
 .../kickc/model/VariableReferenceInfos.java   |   32 +-
 .../kickc/model/VariableRegisterWeights.java  |    8 +-
 .../kickc/model/VariableUnversioned.java      |    6 +-
 .../kickc/model/VariableVersion.java          |    8 +-
 .../camelot64/kickc/passes/AliasReplacer.java |   33 +-
 .../passes/ParseTreeConstantEvaluator.java    |  184 +--
 .../Pass0GenerateStatementSequence.java       |   63 +-
 .../kickc/passes/Pass1AddTypePromotions.java  |   19 +-
 .../kickc/passes/Pass1AssertArrayLengths.java |    8 +-
 .../Pass1AssertNoLValueIntermediate.java      |    6 +-
 .../kickc/passes/Pass1AssertReturn.java       |   18 +-
 .../kickc/passes/Pass1AssertUsedVars.java     |   21 +-
 .../dk/camelot64/kickc/passes/Pass1Base.java  |    6 +-
 .../passes/Pass1EliminateEmptyBlocks.java     |   12 +-
 .../Pass1EliminateUncalledProcedures.java     |   16 +-
 .../passes/Pass1ExtractInlineStrings.java     |    6 +-
 .../kickc/passes/Pass1FixLValuesLoHi.java     |   10 +-
 .../passes/Pass1GenerateControlFlowGraph.java |   20 +-
 ...ss1GenerateSingleStaticAssignmentForm.java |   94 +-
 .../passes/Pass1ModifiedVarsAnalysis.java     |    9 +-
 .../passes/Pass1ProcedureCallParameters.java  |   13 +-
 .../Pass1ProcedureCallsReturnValue.java       |   30 +-
 .../kickc/passes/Pass1TypeInference.java      |   16 +-
 .../kickc/passes/Pass2AliasElimination.java   |  304 +++--
 .../kickc/passes/Pass2AssertBlocks.java       |   19 +-
 .../passes/Pass2AssertNoCallLvalues.java      |    4 +-
 .../passes/Pass2AssertNoCallParameters.java   |    9 +-
 .../kickc/passes/Pass2AssertNoLabels.java     |    6 +-
 .../kickc/passes/Pass2AssertNoProcs.java      |    9 +-
 .../passes/Pass2AssertNoReturnValues.java     |    4 +-
 .../passes/Pass2AssertSingleAssignment.java   |   10 +-
 .../kickc/passes/Pass2AssertSymbols.java      |   29 +-
 .../kickc/passes/Pass2AssertTypeMatch.java    |    6 +-
 .../Pass2ConditionalJumpSimplification.java   |   26 +-
 .../Pass2ConstantAdditionElimination.java     |   68 +-
 .../passes/Pass2ConstantIdentification.java   |   93 +-
 .../kickc/passes/Pass2ConstantInlining.java   |   51 +-
 .../kickc/passes/Pass2CullEmptyBlocks.java    |   33 +-
 .../passes/Pass2FixWordConstructors.java      |    2 +-
 .../passes/Pass2RedundantPhiElimination.java  |   17 +-
 .../kickc/passes/Pass2SelfPhiElimination.java |   14 +-
 .../kickc/passes/Pass2SsaOptimization.java    |   75 +-
 .../passes/Pass2UnaryNotSimplification.java   |   12 +-
 .../passes/Pass3AddNopBeforeCallOns.java      |    6 +-
 .../passes/Pass3BlockSequencePlanner.java     |   31 +-
 .../kickc/passes/Pass3CallGraphAnalysis.java  |   34 +-
 .../kickc/passes/Pass3DominatorsAnalysis.java |   16 +-
 .../kickc/passes/Pass3LiveRangesAnalysis.java |  379 ++++---
 .../Pass3LiveRangesEffectiveAnalysis.java     |   21 +-
 .../kickc/passes/Pass3LoopAnalysis.java       |   20 +-
 .../kickc/passes/Pass3LoopDepthAnalysis.java  |   30 +-
 .../kickc/passes/Pass3PhiLifting.java         |   24 +-
 .../kickc/passes/Pass3PhiMemCoalesce.java     |   77 +-
 .../kickc/passes/Pass3StatementInfos.java     |    4 +-
 .../kickc/passes/Pass3SymbolInfos.java        |    2 +-
 .../Pass3VariableRegisterWeightAnalysis.java  |   26 +-
 .../kickc/passes/Pass4AssertNoCpuClobber.java |   68 +-
 .../kickc/passes/Pass4CodeGeneration.java     |  185 ++-
 ...s4LiveRangeEquivalenceClassesFinalize.java |   18 +-
 .../Pass4RegisterUpliftCombinations.java      |  116 +-
 ...ss4RegisterUpliftPotentialAluAnalysis.java |   36 +-
 ...ass4RegisterUpliftPotentialInitialize.java |    4 +-
 ...gisterUpliftPotentialRegisterAnalysis.java |  171 ++-
 .../passes/Pass4RegisterUpliftRemains.java    |   10 +-
 .../Pass4RegisterUpliftScopeAnalysis.java     |   13 +-
 .../passes/Pass4RegisterUpliftStatic.java     |    4 +-
 .../kickc/passes/Pass4RegistersFinalize.java  |   66 +-
 .../kickc/passes/Pass4ZeroPageCoalesce.java   |   18 +-
 .../kickc/passes/Pass5AsmOptimization.java    |    6 +-
 .../passes/Pass5DoubleJumpElimination.java    |   38 +-
 .../passes/Pass5NextJumpElimination.java      |   14 +-
 .../Pass5RedundantLabelElimination.java       |   33 +-
 .../kickc/passes/Pass5RelabelLongLabels.java  |   50 +-
 .../Pass5UnnecesaryLoadElimination.java       |   70 +-
 .../Pass5UnreachableCodeElimination.java      |   14 +-
 .../passes/Pass5UnusedLabelElimination.java   |   14 +-
 .../passes/PassNEliminateUnusedVars.java      |   14 +-
 .../kickc/passes/PassNStatementIndices.java   |   12 +-
 .../passes/PassNVariableReferenceInfos.java   |  514 ++++-----
 .../camelot64/kickc/passes/ValueReplacer.java |   60 +-
 181 files changed, 4407 insertions(+), 4287 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index fe73f8f6e..72b9b41d5 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -5,6 +5,20 @@
       <value>
         <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
         <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <codeStyleSettings language="JAVA">
+          <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+          <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+          <indentOptions>
+            <option name="INDENT_SIZE" value="3" />
+            <option name="CONTINUATION_INDENT_SIZE" value="6" />
+            <option name="TAB_SIZE" value="3" />
+          </indentOptions>
+        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java
index 5d94d6a1a..37438931e 100644
--- a/src/main/java/dk/camelot64/kickc/Compiler.java
+++ b/src/main/java/dk/camelot64/kickc/Compiler.java
@@ -22,34 +22,6 @@ public class Compiler {
       this.program = new Program();
    }
 
-   public CompileLog getLog() {
-      return program.getLog();
-   }
-
-   public void addImportPath(String path) {
-      program.getImportPaths().add(path);
-   }
-
-   public Program compile(String fileName) throws IOException {
-      try {
-         Pass0GenerateStatementSequence pass0GenerateStatementSequence = new Pass0GenerateStatementSequence(program);
-         loadAndParseFile(fileName, program, pass0GenerateStatementSequence);
-         StatementSequence sequence = pass0GenerateStatementSequence.getSequence();
-         sequence.addStatement(new StatementCall(null, "main", new ArrayList<>()));
-         program.setStatementSequence(sequence);
-         pass1GenerateSSA();
-         pass2OptimizeSSA();
-         pass3Analysis();
-         pass4RegisterAllocation();
-         pass5GenerateAndOptimizeAsm();
-         return program;
-      } catch(Exception e) {
-         System.out.println("EXCEPTION DURING COMPILE " + e.getMessage());
-         System.out.println(getLog().toString());
-         throw e;
-      }
-   }
-
    public static void loadAndParseFile(String fileName, Program program, Pass0GenerateStatementSequence pass0GenerateStatementSequence) {
       try {
          File file = loadFile(fileName, program);
@@ -100,6 +72,34 @@ public class Compiler {
       throw new CompileError("File  not found " + fileName);
    }
 
+   public CompileLog getLog() {
+      return program.getLog();
+   }
+
+   public void addImportPath(String path) {
+      program.getImportPaths().add(path);
+   }
+
+   public Program compile(String fileName) throws IOException {
+      try {
+         Pass0GenerateStatementSequence pass0GenerateStatementSequence = new Pass0GenerateStatementSequence(program);
+         loadAndParseFile(fileName, program, pass0GenerateStatementSequence);
+         StatementSequence sequence = pass0GenerateStatementSequence.getSequence();
+         sequence.addStatement(new StatementCall(null, "main", new ArrayList<>()));
+         program.setStatementSequence(sequence);
+         pass1GenerateSSA();
+         pass2OptimizeSSA();
+         pass3Analysis();
+         pass4RegisterAllocation();
+         pass5GenerateAndOptimizeAsm();
+         return program;
+      } catch(Exception e) {
+         System.out.println("EXCEPTION DURING COMPILE " + e.getMessage());
+         System.out.println(getLog().toString());
+         throw e;
+      }
+   }
+
    private Program pass1GenerateSSA() {
 
       new Pass1TypeInference(program).execute();
diff --git a/src/main/java/dk/camelot64/kickc/NumberParser.java b/src/main/java/dk/camelot64/kickc/NumberParser.java
index 479539956..db39dd5ab 100644
--- a/src/main/java/dk/camelot64/kickc/NumberParser.java
+++ b/src/main/java/dk/camelot64/kickc/NumberParser.java
@@ -19,7 +19,7 @@ public class NumberParser {
             return parseDecInt(literal);
          }
       } else {
-         throw new NumberFormatException("Not Implemented: non-integer parsing. "+literal);
+         throw new NumberFormatException("Not Implemented: non-integer parsing. " + literal);
       }
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmAddressingMode.java b/src/main/java/dk/camelot64/kickc/asm/AsmAddressingMode.java
index e8bb8af4c..1498c630d 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmAddressingMode.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmAddressingMode.java
@@ -38,7 +38,7 @@ public enum AsmAddressingMode {
 
    public String getAsm(String mnemnonic, String parameter) {
       String replaced = template.replace("%i", mnemnonic);
-      if(parameter!=null) {
+      if(parameter != null) {
          replaced = replaced.replace("%p", parameter);
       }
       return replaced;
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmBasicUpstart.java b/src/main/java/dk/camelot64/kickc/asm/AsmBasicUpstart.java
index a0f8b2748..9b9a5d652 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmBasicUpstart.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmBasicUpstart.java
@@ -22,7 +22,7 @@ public class AsmBasicUpstart implements AsmLine {
 
    @Override
    public String getAsm() {
-      return ":BasicUpstart("+function+")";
+      return ":BasicUpstart(" + function + ")";
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmClobber.java b/src/main/java/dk/camelot64/kickc/asm/AsmClobber.java
index dfb1de7fe..d03f441be 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmClobber.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmClobber.java
@@ -1,8 +1,9 @@
 package dk.camelot64.kickc.asm;
 
-/** Information about what parts of the CPU an ASM instruction clobbers  */
+/** Information about what parts of the CPU an ASM instruction clobbers */
 public class AsmClobber {
 
+   public static final AsmClobber CLOBBER_ALL = new AsmClobber(true);
    boolean clobberA;
    boolean clobberX;
    boolean clobberY;
@@ -14,6 +15,7 @@ public class AsmClobber {
    public AsmClobber() {
    }
 
+
    AsmClobber(boolean clobberAll) {
       this.clobberA = clobberAll;
       this.clobberX = clobberAll;
@@ -24,69 +26,66 @@ public class AsmClobber {
       this.clobberZ = clobberAll;
    }
 
-
    public boolean isClobberA() {
       return clobberA;
    }
 
-   public boolean isClobberX() {
-      return clobberX;
-   }
-
-   public boolean isClobberY() {
-      return clobberY;
-   }
-
-   public boolean isClobberC() {
-      return clobberC;
-   }
-
-   public boolean isClobberN() {
-      return clobberN;
-   }
-
-   public boolean isClobberZ() {
-      return clobberZ;
-   }
-
-   public boolean isClobberV() {
-      return clobberV;
-   }
-
    public void setClobberA(boolean clobberA) {
       this.clobberA = clobberA;
    }
 
+   public boolean isClobberX() {
+      return clobberX;
+   }
+
    public void setClobberX(boolean clobberX) {
       this.clobberX = clobberX;
    }
 
+   public boolean isClobberY() {
+      return clobberY;
+   }
+
    public void setClobberY(boolean clobberY) {
       this.clobberY = clobberY;
    }
 
+   public boolean isClobberC() {
+      return clobberC;
+   }
+
    public void setClobberC(boolean clobberC) {
       this.clobberC = clobberC;
    }
 
+   public boolean isClobberN() {
+      return clobberN;
+   }
+
    public void setClobberN(boolean clobberN) {
       this.clobberN = clobberN;
    }
 
+   public boolean isClobberZ() {
+      return clobberZ;
+   }
+
    public void setClobberZ(boolean clobberZ) {
       this.clobberZ = clobberZ;
    }
 
+   public boolean isClobberV() {
+      return clobberV;
+   }
+
    public void setClobberV(boolean clobberV) {
       this.clobberV = clobberV;
    }
 
-   public static final AsmClobber CLOBBER_ALL = new AsmClobber(true);
-
-
    /**
     * Adds clobber.
     * Effective updates so this clobber also clobbers anything added
+    *
     * @param clobber The clobber to add
     */
    public void add(AsmClobber clobber) {
@@ -102,13 +101,13 @@ public class AsmClobber {
    @Override
    public String toString() {
       return
-            (clobberA?"A":"") +
-            (clobberX?"X":"") +
-            (clobberY?"Y":"") +
-            (clobberC?"C":"") +
-            (clobberN?"N":"") +
-            (clobberZ?"Z":"") +
-            (clobberV?"V":"") ;
+            (clobberA ? "A" : "") +
+                  (clobberX ? "X" : "") +
+                  (clobberY ? "Y" : "") +
+                  (clobberC ? "C" : "") +
+                  (clobberN ? "N" : "") +
+                  (clobberZ ? "Z" : "") +
+                  (clobberV ? "V" : "");
 
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmComment.java b/src/main/java/dk/camelot64/kickc/asm/AsmComment.java
index 7c6037d0f..3897f5f12 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmComment.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmComment.java
@@ -27,7 +27,7 @@ public class AsmComment implements AsmLine {
 
    @Override
    public String getAsm() {
-      return "// "+comment;
+      return "// " + comment;
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmConstant.java b/src/main/java/dk/camelot64/kickc/asm/AsmConstant.java
index 42ca0bc0c..84f95cbf1 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmConstant.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmConstant.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.asm;
 
-/** ASM constant declaration  */
+/** ASM constant declaration */
 public class AsmConstant implements AsmLine {
    private final String name;
    private final String value;
@@ -24,7 +24,7 @@ public class AsmConstant implements AsmLine {
 
    @Override
    public String getAsm() {
-      return ".const "+name+" = "+value;
+      return ".const " + name + " = " + value;
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmDataFill.java b/src/main/java/dk/camelot64/kickc/asm/AsmDataFill.java
index 64dfac27c..85b980c72 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmDataFill.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmDataFill.java
@@ -25,7 +25,7 @@ public class AsmDataFill implements AsmLine {
 
    @Override
    public int getLineBytes() {
-      return size*getElementBytes();
+      return size * getElementBytes();
    }
 
    @Override
@@ -36,9 +36,9 @@ public class AsmDataFill implements AsmLine {
    @Override
    public String getAsm() {
       StringBuilder asm = new StringBuilder();
-      asm.append(label+": ");
+      asm.append(label + ": ");
       asm.append(".fill ");
-      asm.append(AsmFormat.getAsmNumber(size*type.bytes));
+      asm.append(AsmFormat.getAsmNumber(size * type.bytes));
       asm.append(", ");
       asm.append(fillValue);
       return asm.toString();
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmDataNumeric.java b/src/main/java/dk/camelot64/kickc/asm/AsmDataNumeric.java
index 3fc5d0555..9a453d572 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmDataNumeric.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmDataNumeric.java
@@ -12,21 +12,6 @@ public class AsmDataNumeric implements AsmLine {
    private List<String> values;
    private int index;
 
-   public static enum Type {
-      BYTE("byte", 1),
-      WORD("word", 2),
-      DWORD("dword", 4);
-
-      public final String asm;
-      public final int bytes;
-
-      Type(String asm, int bytes) {
-         this.asm = asm;
-         this.bytes = bytes;
-      }
-
-   }
-
    public AsmDataNumeric(String label, Type type, List<String> values) {
       this.label = label;
       this.type = type;
@@ -74,4 +59,19 @@ public class AsmDataNumeric implements AsmLine {
       this.index = index;
    }
 
+   public static enum Type {
+      BYTE("byte", 1),
+      WORD("word", 2),
+      DWORD("dword", 4);
+
+      public final String asm;
+      public final int bytes;
+
+      Type(String asm, int bytes) {
+         this.asm = asm;
+         this.bytes = bytes;
+      }
+
+   }
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmDataString.java b/src/main/java/dk/camelot64/kickc/asm/AsmDataString.java
index 760d3d84c..0b2dbd979 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmDataString.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmDataString.java
@@ -25,7 +25,7 @@ public class AsmDataString implements AsmLine {
    @Override
    public String getAsm() {
       StringBuilder asm = new StringBuilder();
-      asm.append(label+": ");
+      asm.append(label + ": ");
       asm.append(".text ");
       asm.append(value);
       return asm.toString();
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmInstruction.java b/src/main/java/dk/camelot64/kickc/asm/AsmInstruction.java
index 341f34024..82d79aff2 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmInstruction.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmInstruction.java
@@ -18,10 +18,18 @@ public class AsmInstruction implements AsmLine {
       return parameter;
    }
 
+   public void setParameter(String parameter) {
+      this.parameter = parameter;
+   }
+
    public AsmInstructionType getType() {
       return type;
    }
 
+   public void setType(AsmInstructionType type) {
+      this.type = type;
+   }
+
    @Override
    public int getLineBytes() {
       return type.getBytes();
@@ -51,12 +59,4 @@ public class AsmInstruction implements AsmLine {
    public void setIndex(int index) {
       this.index = index;
    }
-
-   public void setParameter(String parameter) {
-      this.parameter = parameter;
-   }
-
-   public void setType(AsmInstructionType type) {
-      this.type = type;
-   }
 }
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmInstructionSet.java b/src/main/java/dk/camelot64/kickc/asm/AsmInstructionSet.java
index 400d894ba..769b405b1 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmInstructionSet.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmInstructionSet.java
@@ -1,7 +1,5 @@
 package dk.camelot64.kickc.asm;
 
-import dk.camelot64.kickc.NumberParser;
-
 import java.util.*;
 
 /**
@@ -10,38 +8,10 @@ import java.util.*;
 public class AsmInstructionSet {
 
    private static AsmInstructionSet set = new AsmInstructionSet();
-
-   public static AsmInstructionType getInstructionType(String mnemonic, AsmAddressingMode mode, boolean isZp) {
-      AsmInstructionType type = null;
-      if (AsmAddressingMode.ABS.equals(mode) && isZp) {
-         type = set.getType(mnemonic, AsmAddressingMode.ZP);
-      }
-      if (AsmAddressingMode.ABX.equals(mode) && isZp) {
-         type = set.getType(mnemonic, AsmAddressingMode.ZPX);
-      }
-      if (AsmAddressingMode.ABY.equals(mode) && isZp) {
-         type = set.getType(mnemonic, AsmAddressingMode.ZPY);
-      }
-      if (type == null) {
-         type = set.getType(mnemonic, mode);
-      }
-      if (type == null && AsmAddressingMode.ABS.equals(mode)) {
-         type = set.getType(mnemonic, AsmAddressingMode.REL);
-      }
-      return type;
-   }
-
    private List<AsmInstructionType> instructions;
-
    /** Maps mnemonic_addressingmMode to  the instruction type */
    private Map<String, AsmInstructionType> instructionsMap;
 
-   private void add(int opcode, String mnemonic, AsmAddressingMode addressingmMode, double cycles) {
-      AsmInstructionType instructionType = new AsmInstructionType(opcode, mnemonic, addressingmMode, cycles);
-      instructions.add(instructionType);
-      instructionsMap.put(mnemonic+"_"+addressingmMode.getName(), instructionType);
-   }
-
    public AsmInstructionSet() {
       this.instructions = new ArrayList<>();
       this.instructionsMap = new HashMap<>();
@@ -315,43 +285,43 @@ public class AsmInstructionSet {
       add(0xfe, "inc", abx, 7.0);
       add(0xff, "isc", abx, 7.0);
       List<String> jumps = Arrays.asList("jmp", "beq", "bne", "bcc", "bcs", "bvs", "bvc", "bmi", "bpl", "jsr");
-      for (AsmInstructionType instruction : instructions) {
+      for(AsmInstructionType instruction : instructions) {
          if(jumps.contains(instruction.getMnemnonic())) {
             instruction.setJump(true);
          }
       }
-      List<String> cxs = Arrays.asList("dex", "inx",  "ldx", "tax", "tsx", "las", "lax", "axs");
-      for (AsmInstructionType instruction : instructions) {
+      List<String> cxs = Arrays.asList("dex", "inx", "ldx", "tax", "tsx", "las", "lax", "axs");
+      for(AsmInstructionType instruction : instructions) {
          if(cxs.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberX(true);
          }
       }
-      List<String> cys = Arrays.asList("dey", "iny", "ldy", "tay" );
-      for (AsmInstructionType instruction : instructions) {
+      List<String> cys = Arrays.asList("dey", "iny", "ldy", "tay");
+      for(AsmInstructionType instruction : instructions) {
          if(cys.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberY(true);
          }
       }
       List<String> cas = Arrays.asList("ora", "and", "eor", "adc", "sbc", "lda", "txa", "tya", "pla", "slo", "rla", "sre", "rra", "isc", "anc", "alr", "arr", "xaa", "lax", "las");
-      for (AsmInstructionType instruction : instructions) {
+      for(AsmInstructionType instruction : instructions) {
          if(cas.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberA(true);
          }
       }
       List<String> ccs = Arrays.asList("adc", "sbc", "cmp", "cpx", "cpy", "asl", "rol", "lsr", "ror", "plp", "rti", "clc", "sec", "slo", "rla", "sre", "rra", "dcp", "isc", "anc", "alr", "arr", "axs");
-      for (AsmInstructionType instruction : instructions) {
+      for(AsmInstructionType instruction : instructions) {
          if(ccs.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberC(true);
          }
       }
       List<String> cvs = Arrays.asList("adc", "sbc", "plp", "rti", "bit", "rra", "isc", "arr");
-      for (AsmInstructionType instruction : instructions) {
+      for(AsmInstructionType instruction : instructions) {
          if(cvs.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberV(true);
          }
       }
       List<String> czs = Arrays.asList("ora", "and", "eor", "adc", "sbc", "cmp", "cpx", "cpy", "dec", "dex", "dey", "inc", "inx", "iny", "asl", "rol", "lsr", "ror", "lda", "ldx", "ldy", "tax", "txa", "tay", "tya", "tsx", "txs", "pla", "plp", "rti", "bit", "slo", "rla", "sre", "rra", "lax", "dcp", "isc", "anc", "alr", "arr", "xaa", "lax", "axs", "las");
-      for (AsmInstructionType instruction : instructions) {
+      for(AsmInstructionType instruction : instructions) {
          if(czs.contains(instruction.getMnemnonic())) {
             instruction.getClobber().setClobberZ(true);
             instruction.getClobber().setClobberN(true);
@@ -359,8 +329,34 @@ public class AsmInstructionSet {
       }
    }
 
+   public static AsmInstructionType getInstructionType(String mnemonic, AsmAddressingMode mode, boolean isZp) {
+      AsmInstructionType type = null;
+      if(AsmAddressingMode.ABS.equals(mode) && isZp) {
+         type = set.getType(mnemonic, AsmAddressingMode.ZP);
+      }
+      if(AsmAddressingMode.ABX.equals(mode) && isZp) {
+         type = set.getType(mnemonic, AsmAddressingMode.ZPX);
+      }
+      if(AsmAddressingMode.ABY.equals(mode) && isZp) {
+         type = set.getType(mnemonic, AsmAddressingMode.ZPY);
+      }
+      if(type == null) {
+         type = set.getType(mnemonic, mode);
+      }
+      if(type == null && AsmAddressingMode.ABS.equals(mode)) {
+         type = set.getType(mnemonic, AsmAddressingMode.REL);
+      }
+      return type;
+   }
+
+   private void add(int opcode, String mnemonic, AsmAddressingMode addressingmMode, double cycles) {
+      AsmInstructionType instructionType = new AsmInstructionType(opcode, mnemonic, addressingmMode, cycles);
+      instructions.add(instructionType);
+      instructionsMap.put(mnemonic + "_" + addressingmMode.getName(), instructionType);
+   }
+
    public AsmInstructionType getType(String mnemonic, AsmAddressingMode addressingMode) {
-      String key = mnemonic.toLowerCase()+"_"+addressingMode.getName();
+      String key = mnemonic.toLowerCase() + "_" + addressingMode.getName();
       return instructionsMap.get(key);
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmLabel.java b/src/main/java/dk/camelot64/kickc/asm/AsmLabel.java
index 83ed4eef9..4d1bef8e7 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmLabel.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmLabel.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.asm;
 
-/** A label / jump target  */
+/** A label / jump target */
 public class AsmLabel implements AsmLine {
 
    private String label;
@@ -15,6 +15,10 @@ public class AsmLabel implements AsmLine {
       return label;
    }
 
+   public void setLabel(String label) {
+      this.label = label;
+   }
+
    @Override
    public int getLineBytes() {
       return 0;
@@ -27,7 +31,7 @@ public class AsmLabel implements AsmLine {
 
    @Override
    public String getAsm() {
-      return label+":";
+      return label + ":";
    }
 
    @Override
@@ -44,8 +48,4 @@ public class AsmLabel implements AsmLine {
    public String toString() {
       return getAsm();
    }
-
-   public void setLabel(String label) {
-      this.label = label;
-   }
 }
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmLabelDecl.java b/src/main/java/dk/camelot64/kickc/asm/AsmLabelDecl.java
index 7501a6ca4..53f4222a1 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmLabelDecl.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmLabelDecl.java
@@ -2,7 +2,7 @@ package dk.camelot64.kickc.asm;
 
 import dk.camelot64.kickc.fragment.AsmFormat;
 
-/** A label declaration .label lbl = val  */
+/** A label declaration .label lbl = val */
 public class AsmLabelDecl implements AsmLine {
    private final String name;
    private final int address;
@@ -26,7 +26,7 @@ public class AsmLabelDecl implements AsmLine {
 
    @Override
    public String getAsm() {
-      return ".label "+name+" = "+ AsmFormat.getAsmNumber(address);
+      return ".label " + name + " = " + AsmFormat.getAsmNumber(address);
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java b/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
index 0a8715a78..b3d5a12bd 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmProgram.java
@@ -76,15 +76,17 @@ public class AsmProgram {
 
    /**
     * Add a constant declararion to the ASM
+    *
     * @param name The name of the constant
     * @param value The value of the constant
     */
-    public void addConstant(String name, String value) {
-       addLine(new AsmConstant(name, value));
-    }
+   public void addConstant(String name, String value) {
+      addLine(new AsmConstant(name, value));
+   }
 
    /**
     * Add a BYTE/WORD/DWORD data declaration tot the ASM
+    *
     * @param label The label of the data
     * @param type The type of the data
     * @param asmElements The value of the elements
@@ -95,6 +97,7 @@ public class AsmProgram {
 
    /**
     * Add a FILL data declaration to the ASM
+    *
     * @param label The label of the data
     * @param type The type of the data
     * @param size The size of data to fill
@@ -105,6 +108,7 @@ public class AsmProgram {
 
    /**
     * Add a string data declaration to the ASM
+    *
     * @param label The label of the data
     * @param value The value of the string
     */
@@ -114,6 +118,7 @@ public class AsmProgram {
 
    /**
     * Add data alignment to the ASM
+    *
     * @param alignment The number to align the address of the next data to
     */
    public void addDataAlignment(String alignment) {
@@ -129,7 +134,7 @@ public class AsmProgram {
     */
    public int getBytes() {
       int bytes = 0;
-      for (AsmSegment segment : segments) {
+      for(AsmSegment segment : segments) {
          bytes += segment.getBytes();
       }
       return bytes;
@@ -143,7 +148,7 @@ public class AsmProgram {
     */
    public double getCycles() {
       double cycles = 0.0;
-      for (AsmSegment segment : segments) {
+      for(AsmSegment segment : segments) {
          cycles += segment.getCycles();
       }
       return cycles;
@@ -157,7 +162,7 @@ public class AsmProgram {
     */
    public AsmClobber getClobber() {
       AsmClobber clobber = new AsmClobber();
-      for (AsmSegment segment : segments) {
+      for(AsmSegment segment : segments) {
          clobber.add(segment.getClobber());
       }
       return clobber;
@@ -169,12 +174,17 @@ public class AsmProgram {
 
    public String toString(AsmPrintState printState) {
       StringBuilder out = new StringBuilder();
-      for (AsmSegment segment : segments) {
+      for(AsmSegment segment : segments) {
          out.append(segment.toString(printState));
       }
       return out.toString();
    }
 
+   @Override
+   public String toString() {
+      return toString(true);
+   }
+
    static class AsmPrintState {
       boolean comments;
       String indent;
@@ -193,7 +203,7 @@ public class AsmProgram {
       }
 
       public void decIndent() {
-         if(this.indent.length()>=2) {
+         if(this.indent.length() >= 2) {
             this.indent = this.indent.substring(0, this.indent.length() - 2);
          }
       }
@@ -205,10 +215,4 @@ public class AsmProgram {
    }
 
 
-   @Override
-   public String toString() {
-      return toString(true);
-   }
-
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmProgramStaticRegisterValues.java b/src/main/java/dk/camelot64/kickc/asm/AsmProgramStaticRegisterValues.java
index 070431e3d..8ed96dc8a 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmProgramStaticRegisterValues.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmProgramStaticRegisterValues.java
@@ -18,169 +18,28 @@ public class AsmProgramStaticRegisterValues {
       initValues();
    }
 
-   public AsmRegisterValues getValues(AsmInstruction instruction) {
-      return values.get(instruction);
-   }
-
-   private void initValues() {
-      AsmRegisterValues current = new AsmRegisterValues();
-      for (AsmSegment segment : program.getSegments()) {
-         for (AsmLine line : segment.getLines()) {
-            current = updateStaticRegisterValues(current, line);
-         }
-      }
-   }
-
-   private AsmRegisterValues updateStaticRegisterValues(AsmRegisterValues current, AsmLine line) {
-      if (line instanceof AsmLabel) {
-         current = new AsmRegisterValues();
-      } else if (line instanceof AsmScopeBegin) {
-         current = new AsmRegisterValues();
-      } else if (line instanceof AsmScopeEnd) {
-         current = new AsmRegisterValues();
-      } else if (line instanceof AsmInstruction) {
-         AsmInstruction instruction = (AsmInstruction) line;
-         values.put(instruction, current);
-         current = new AsmRegisterValues(current);
-         AsmInstructionType instructionType = instruction.getType();
-         AsmClobber clobber = instructionType.getClobber();
-         if(instruction.getType().getMnemnonic().equals("jsr")) {
-            clobber = AsmClobber.CLOBBER_ALL;
-         }
-         if (clobber.isClobberA()) {
-            current.setA(null);
-            current.setaMem(null);
-         }
-         if (clobber.isClobberX()) {
-            current.setX(null);
-            current.setxMem(null);
-         }
-         if (clobber.isClobberY()) {
-            current.setY(null);
-            current.setyMem(null);
-         }
-         if (clobber.isClobberC()) {
-            current.setC(null);
-         }
-         if (clobber.isClobberN()) {
-            current.setN(null);
-         }
-         if (clobber.isClobberV()) {
-            current.setV(null);
-         }
-         if (clobber.isClobberZ()) {
-            current.setZ(null);
-         }
-         String mnemnonic = instructionType.getMnemnonic();
-         AsmAddressingMode addressingMode = instructionType.getAddressingMode();
-         if ((mnemnonic.equals("inc") || mnemnonic.equals("dec") || mnemnonic.equals("ror") || mnemnonic.equals("rol") || mnemnonic.equals("lsr") || mnemnonic.equals("asl")) && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            String modParam = instruction.getParameter();
-            if(current.getaMem()!=null && current.getaMem().equals(modParam)) {
-               current.setaMem(null);
-            }
-            if(current.getxMem()!=null && current.getxMem().equals(modParam)) {
-               current.setxMem(null);
-            }
-            if(current.getyMem()!=null && current.getyMem().equals(modParam)) {
-               current.setyMem(null);
-            }
-         }
-         if (mnemnonic.equals("lda") && addressingMode.equals(AsmAddressingMode.IMM)) {
-            current.setA(instruction.getParameter());
-            current.setaMem(null);
-            Integer immValue = getImmValue(instruction.getParameter());
-            if (immValue != null) {
-               current.setZ(immValue == 0);
-               current.setN(immValue > 127);
-            }
-         }
-         if (mnemnonic.equals("lda") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setaMem(instruction.getParameter());
-            current.setA(null);
-         }
-         if (mnemnonic.equals("sta") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setaMem(instruction.getParameter());
-         }
-         if (mnemnonic.equals("ldx") && addressingMode.equals(AsmAddressingMode.IMM)) {
-            current.setX(instruction.getParameter());
-            current.setxMem(null);
-            Integer immValue = getImmValue(instruction.getParameter());
-            if (immValue != null) {
-               current.setZ(immValue == 0);
-               current.setN(immValue > 127);
-            }
-         }
-         if (mnemnonic.equals("ldx") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setxMem(instruction.getParameter());
-            current.setX(null);
-         }
-         if (mnemnonic.equals("stx") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setxMem(instruction.getParameter());
-         }
-         if (mnemnonic.equals("ldy") && addressingMode.equals(AsmAddressingMode.IMM)) {
-            current.setY(instruction.getParameter());
-            current.setyMem(null);
-            Integer immValue = getImmValue(instruction.getParameter());
-            if (immValue != null) {
-               current.setZ(immValue == 0);
-               current.setN(immValue > 127);
-            }
-         }
-         if (mnemnonic.equals("ldy") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setyMem(instruction.getParameter());
-         }
-         if (mnemnonic.equals("sty") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
-            current.setyMem(instruction.getParameter());
-            current.setY(null);
-         }
-         if (mnemnonic.equals("txa")) {
-            current.setA(current.getX());
-            current.setaMem(current.getxMem());
-         }
-         if (mnemnonic.equals("tax")) {
-            current.setX(current.getA());
-            current.setxMem(current.getaMem());
-         }
-         if (mnemnonic.equals("tya")) {
-            current.setA(current.getY());
-            current.setaMem(current.getyMem());
-         }
-         if (mnemnonic.equals("tay")) {
-            current.setY(current.getA());
-            current.setyMem(current.getaMem());
-         }
-         if (mnemnonic.equals("sec")) {
-            current.setC(Boolean.TRUE);
-         }
-         if (mnemnonic.equals("clc")) {
-            current.setC(Boolean.FALSE);
-         }
-      }
-      return current;
-   }
-
    public static Integer getImmValue(String parameter) {
       Integer immValue = null;
-      if (parameter != null) {
+      if(parameter != null) {
          if(parameter.startsWith("<")) {
             try {
                int parValue = Integer.parseInt(parameter.substring(1));
                return 0xff & parValue;
-            } catch (NumberFormatException e) {
+            } catch(NumberFormatException e) {
                // ignore
             }
          } else if(parameter.startsWith(">")) {
             try {
                int parValue = Integer.parseInt(parameter.substring(1));
                return 0xff & (parValue / 0x100);
-            } catch (NumberFormatException e) {
+            } catch(NumberFormatException e) {
                // ignore
             }
          } else {
             try {
                immValue = Integer.parseInt(parameter);
                return immValue;
-            } catch (NumberFormatException e) {
+            } catch(NumberFormatException e) {
                // ignore
             }
          }
@@ -189,17 +48,158 @@ public class AsmProgramStaticRegisterValues {
    }
 
    public static boolean matchImm(String immVal1, String immVal2) {
-      if (immVal1 != null && immVal2 != null && immVal1.equals(immVal2)) {
+      if(immVal1 != null && immVal2 != null && immVal1.equals(immVal2)) {
          return true;
       }
       Integer immInt1 = getImmValue(immVal1);
       Integer immInt2 = getImmValue(immVal2);
-      if (immInt1 != null && immInt2 != null && immInt1.equals(immInt2)) {
+      if(immInt1 != null && immInt2 != null && immInt1.equals(immInt2)) {
          return true;
       }
       return false;
    }
 
+   public AsmRegisterValues getValues(AsmInstruction instruction) {
+      return values.get(instruction);
+   }
+
+   private void initValues() {
+      AsmRegisterValues current = new AsmRegisterValues();
+      for(AsmSegment segment : program.getSegments()) {
+         for(AsmLine line : segment.getLines()) {
+            current = updateStaticRegisterValues(current, line);
+         }
+      }
+   }
+
+   private AsmRegisterValues updateStaticRegisterValues(AsmRegisterValues current, AsmLine line) {
+      if(line instanceof AsmLabel) {
+         current = new AsmRegisterValues();
+      } else if(line instanceof AsmScopeBegin) {
+         current = new AsmRegisterValues();
+      } else if(line instanceof AsmScopeEnd) {
+         current = new AsmRegisterValues();
+      } else if(line instanceof AsmInstruction) {
+         AsmInstruction instruction = (AsmInstruction) line;
+         values.put(instruction, current);
+         current = new AsmRegisterValues(current);
+         AsmInstructionType instructionType = instruction.getType();
+         AsmClobber clobber = instructionType.getClobber();
+         if(instruction.getType().getMnemnonic().equals("jsr")) {
+            clobber = AsmClobber.CLOBBER_ALL;
+         }
+         if(clobber.isClobberA()) {
+            current.setA(null);
+            current.setaMem(null);
+         }
+         if(clobber.isClobberX()) {
+            current.setX(null);
+            current.setxMem(null);
+         }
+         if(clobber.isClobberY()) {
+            current.setY(null);
+            current.setyMem(null);
+         }
+         if(clobber.isClobberC()) {
+            current.setC(null);
+         }
+         if(clobber.isClobberN()) {
+            current.setN(null);
+         }
+         if(clobber.isClobberV()) {
+            current.setV(null);
+         }
+         if(clobber.isClobberZ()) {
+            current.setZ(null);
+         }
+         String mnemnonic = instructionType.getMnemnonic();
+         AsmAddressingMode addressingMode = instructionType.getAddressingMode();
+         if((mnemnonic.equals("inc") || mnemnonic.equals("dec") || mnemnonic.equals("ror") || mnemnonic.equals("rol") || mnemnonic.equals("lsr") || mnemnonic.equals("asl")) && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            String modParam = instruction.getParameter();
+            if(current.getaMem() != null && current.getaMem().equals(modParam)) {
+               current.setaMem(null);
+            }
+            if(current.getxMem() != null && current.getxMem().equals(modParam)) {
+               current.setxMem(null);
+            }
+            if(current.getyMem() != null && current.getyMem().equals(modParam)) {
+               current.setyMem(null);
+            }
+         }
+         if(mnemnonic.equals("lda") && addressingMode.equals(AsmAddressingMode.IMM)) {
+            current.setA(instruction.getParameter());
+            current.setaMem(null);
+            Integer immValue = getImmValue(instruction.getParameter());
+            if(immValue != null) {
+               current.setZ(immValue == 0);
+               current.setN(immValue > 127);
+            }
+         }
+         if(mnemnonic.equals("lda") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setaMem(instruction.getParameter());
+            current.setA(null);
+         }
+         if(mnemnonic.equals("sta") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setaMem(instruction.getParameter());
+         }
+         if(mnemnonic.equals("ldx") && addressingMode.equals(AsmAddressingMode.IMM)) {
+            current.setX(instruction.getParameter());
+            current.setxMem(null);
+            Integer immValue = getImmValue(instruction.getParameter());
+            if(immValue != null) {
+               current.setZ(immValue == 0);
+               current.setN(immValue > 127);
+            }
+         }
+         if(mnemnonic.equals("ldx") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setxMem(instruction.getParameter());
+            current.setX(null);
+         }
+         if(mnemnonic.equals("stx") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setxMem(instruction.getParameter());
+         }
+         if(mnemnonic.equals("ldy") && addressingMode.equals(AsmAddressingMode.IMM)) {
+            current.setY(instruction.getParameter());
+            current.setyMem(null);
+            Integer immValue = getImmValue(instruction.getParameter());
+            if(immValue != null) {
+               current.setZ(immValue == 0);
+               current.setN(immValue > 127);
+            }
+         }
+         if(mnemnonic.equals("ldy") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setyMem(instruction.getParameter());
+         }
+         if(mnemnonic.equals("sty") && (addressingMode.equals(AsmAddressingMode.ZP) || addressingMode.equals(AsmAddressingMode.ABS))) {
+            current.setyMem(instruction.getParameter());
+            current.setY(null);
+         }
+         if(mnemnonic.equals("txa")) {
+            current.setA(current.getX());
+            current.setaMem(current.getxMem());
+         }
+         if(mnemnonic.equals("tax")) {
+            current.setX(current.getA());
+            current.setxMem(current.getaMem());
+         }
+         if(mnemnonic.equals("tya")) {
+            current.setA(current.getY());
+            current.setaMem(current.getyMem());
+         }
+         if(mnemnonic.equals("tay")) {
+            current.setY(current.getA());
+            current.setyMem(current.getaMem());
+         }
+         if(mnemnonic.equals("sec")) {
+            current.setC(Boolean.TRUE);
+         }
+         if(mnemnonic.equals("clc")) {
+            current.setC(Boolean.FALSE);
+         }
+      }
+      return current;
+   }
+
    /**
     * Known values of registers/flags at an instruction. null where value is unknown.
     */
@@ -235,48 +235,64 @@ public class AsmProgramStaticRegisterValues {
          return a;
       }
 
+      public void setA(String a) {
+         this.a = a;
+      }
+
       public String getaMem() {
          return aMem;
       }
 
+      public void setaMem(String aMem) {
+         this.aMem = aMem;
+      }
+
       public String getX() {
          return x;
       }
 
-      public String getY() {
-         return y;
-      }
-
-      public Boolean getC() {
-         return c;
-      }
-
-      public Boolean getV() {
-         return v;
-      }
-
-      public Boolean getN() {
-         return n;
-      }
-
-      public Boolean getZ() {
-         return z;
-      }
-
       public void setX(String x) {
          this.x = x;
       }
 
+      public String getY() {
+         return y;
+      }
+
       public void setY(String y) {
          this.y = y;
       }
 
-      public void setA(String a) {
-         this.a = a;
+      public Boolean getC() {
+         return c;
       }
 
-      public void setaMem(String aMem) {
-         this.aMem = aMem;
+      public void setC(Boolean c) {
+         this.c = c;
+      }
+
+      public Boolean getV() {
+         return v;
+      }
+
+      public void setV(Boolean v) {
+         this.v = v;
+      }
+
+      public Boolean getN() {
+         return n;
+      }
+
+      public void setN(Boolean n) {
+         this.n = n;
+      }
+
+      public Boolean getZ() {
+         return z;
+      }
+
+      public void setZ(Boolean z) {
+         this.z = z;
       }
 
       public String getxMem() {
@@ -295,22 +311,6 @@ public class AsmProgramStaticRegisterValues {
          this.yMem = yMem;
       }
 
-      public void setC(Boolean c) {
-         this.c = c;
-      }
-
-      public void setV(Boolean v) {
-         this.v = v;
-      }
-
-      public void setN(Boolean n) {
-         this.n = n;
-      }
-
-      public void setZ(Boolean z) {
-         this.z = z;
-      }
-
 
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmScopeBegin.java b/src/main/java/dk/camelot64/kickc/asm/AsmScopeBegin.java
index a6fb1809e..fab3e932e 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmScopeBegin.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmScopeBegin.java
@@ -27,7 +27,7 @@ public class AsmScopeBegin implements AsmLine {
 
    @Override
    public String getAsm() {
-      return label+":"+" {";
+      return label + ":" + " {";
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmScopeEnd.java b/src/main/java/dk/camelot64/kickc/asm/AsmScopeEnd.java
index 3e449934b..b6b19765f 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmScopeEnd.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmScopeEnd.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.asm;
 
-/** The end of a scope  */
+/** The end of a scope */
 public class AsmScopeEnd implements AsmLine {
 
    private int index;
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmSegment.java b/src/main/java/dk/camelot64/kickc/asm/AsmSegment.java
index 54ac86350..e7f9d644e 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmSegment.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmSegment.java
@@ -70,7 +70,7 @@ public class AsmSegment {
    }
 
    public void setFragment(String fragment) {
-      this.fragment  = fragment;
+      this.fragment = fragment;
    }
 
    public String getPhiTransitionId() {
@@ -97,7 +97,7 @@ public class AsmSegment {
     */
    public int getBytes() {
       int bytes = 0;
-      for (AsmLine line : lines) {
+      for(AsmLine line : lines) {
          bytes += line.getLineBytes();
       }
       return bytes;
@@ -111,7 +111,7 @@ public class AsmSegment {
     */
    public double getCycles() {
       double cycles = 0.0;
-      for (AsmLine line : lines) {
+      for(AsmLine line : lines) {
          cycles += line.getLineCycles();
       }
       return cycles;
@@ -125,8 +125,8 @@ public class AsmSegment {
     */
    public AsmClobber getClobber() {
       AsmClobber clobber = new AsmClobber();
-      for (AsmLine line : lines) {
-         if (line instanceof AsmInstruction) {
+      for(AsmLine line : lines) {
+         if(line instanceof AsmInstruction) {
             AsmInstruction asmInstruction = (AsmInstruction) line;
             AsmInstructionType asmInstructionType = asmInstruction.getType();
             AsmClobber asmClobber = asmInstructionType.getClobber();
@@ -138,27 +138,27 @@ public class AsmSegment {
 
    public String toString(AsmProgram.AsmPrintState printState) {
       StringBuffer out = new StringBuffer();
-      if (printState.isComments()) {
+      if(printState.isComments()) {
          out.append(printState.getIndent()).append("//SEG").append(getIndex());
-         if (source != null) {
+         if(source != null) {
             out.append(" ").append(source);
          }
-         if(phiTransitionId!=null) {
+         if(phiTransitionId != null) {
             out.append(" [").append(phiTransitionId);
-            if(phiTransitionAssignmentIdx!=null) {
+            if(phiTransitionAssignmentIdx != null) {
                out.append("#").append(phiTransitionAssignmentIdx);
             }
             out.append("]");
          }
-         if (fragment!=null) {
+         if(fragment != null) {
             out.append(" -- ");
             out.append(fragment).append(" ");
          }
          out.append("\n");
       }
-      for (AsmLine line : lines) {
-         if (line instanceof AsmComment && !printState.isComments()) {
-            if (!((AsmComment) line).getComment().contains("Fragment")) {
+      for(AsmLine line : lines) {
+         if(line instanceof AsmComment && !printState.isComments()) {
+            if(!((AsmComment) line).getComment().contains("Fragment")) {
                continue;
             }
          }
@@ -166,7 +166,7 @@ public class AsmSegment {
             printState.decIndent();
          }
          out.append(printState.getIndent());
-         if (line instanceof AsmComment || line instanceof AsmInstruction || line instanceof AsmLabelDecl || line instanceof AsmConstant || line instanceof AsmDataNumeric || line instanceof AsmDataFill || line instanceof AsmDataString|| line instanceof AsmDataAlignment) {
+         if(line instanceof AsmComment || line instanceof AsmInstruction || line instanceof AsmLabelDecl || line instanceof AsmConstant || line instanceof AsmDataNumeric || line instanceof AsmDataFill || line instanceof AsmDataString || line instanceof AsmDataAlignment) {
             out.append("  ");
          }
          out.append(line.getAsm() + "\n");
diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmSetPc.java b/src/main/java/dk/camelot64/kickc/asm/AsmSetPc.java
index f3688cc10..11697de30 100644
--- a/src/main/java/dk/camelot64/kickc/asm/AsmSetPc.java
+++ b/src/main/java/dk/camelot64/kickc/asm/AsmSetPc.java
@@ -26,7 +26,7 @@ public class AsmSetPc implements AsmLine {
 
    @Override
    public String getAsm() {
-      return ".pc = "+ AsmFormat.getAsmNumber(address)+" \""+name+"\"";
+      return ".pc = " + AsmFormat.getAsmNumber(address) + " \"" + name + "\"";
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java
index 4bf6511c3..18f14f3e0 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFormat.java
@@ -2,141 +2,141 @@ package dk.camelot64.kickc.fragment;
 
 import dk.camelot64.kickc.model.*;
 
-/** Formatting of numbers, constants, names and more for KickAssembler  */
+/** Formatting of numbers, constants, names and more for KickAssembler */
 public class AsmFormat {
-    /**
-     * Get ASM code for a constant value
-     *
-     * @param value The constant value
-     * @param precedence The precedence of the outer expression operator. Used to generate perenthesis when needed.
-     * @param codeScope The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
-     * @return The ASM string representing the constant value
-     */
-    public static String getAsmConstant(Program program, ConstantValue value, int precedence, ScopeRef codeScope) {
-        if (value instanceof ConstantRef) {
-            ConstantVar constantVar = program.getScope().getConstant((ConstantRef) value);
-            String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
-            return getAsmParamName(constantVar.getScope().getRef(), asmName, codeScope);
-        } else if (value instanceof ConstantInteger) {
-            return getAsmNumber(((ConstantInteger) value).getNumber());
-        } else if (value instanceof ConstantChar) {
-            return "'" + ((ConstantChar) value).getValue() + "'";
-        } else if (value instanceof ConstantString) {
-            return "\"" + ((ConstantString) value).getValue() + "\"";
-        } else if (value instanceof ConstantUnary) {
-            ConstantUnary unary = (ConstantUnary) value;
-            Operator operator = unary.getOperator();
-            boolean parenthesis = operator.getPrecedence() > precedence;
-            return (parenthesis ? "(" : "") +
-                    getAsmConstantUnary(program, codeScope, operator, unary.getOperand(), precedence) +
-                    (parenthesis ? ")" : "");
-        } else if (value instanceof ConstantBinary) {
-            ConstantBinary binary = (ConstantBinary) value;
-            Operator operator = binary.getOperator();
-            boolean parenthesis = operator.getPrecedence() > precedence;
-            return
-                    (parenthesis ? "(" : "") +
-                            getAsmConstant(program, binary.getLeft(), operator.getPrecedence(), codeScope) +
-                            operator.getOperator() +
-                            getAsmConstant(program, binary.getRight(), operator.getPrecedence(), codeScope) +
-                            (parenthesis ? ")" : "");
-        } else {
-            throw new RuntimeException("Constant type not supported " + value);
-        }
-    }
+   /**
+    * Get ASM code for a constant value
+    *
+    * @param value The constant value
+    * @param precedence The precedence of the outer expression operator. Used to generate perenthesis when needed.
+    * @param codeScope The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
+    * @return The ASM string representing the constant value
+    */
+   public static String getAsmConstant(Program program, ConstantValue value, int precedence, ScopeRef codeScope) {
+      if(value instanceof ConstantRef) {
+         ConstantVar constantVar = program.getScope().getConstant((ConstantRef) value);
+         String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
+         return getAsmParamName(constantVar.getScope().getRef(), asmName, codeScope);
+      } else if(value instanceof ConstantInteger) {
+         return getAsmNumber(((ConstantInteger) value).getNumber());
+      } else if(value instanceof ConstantChar) {
+         return "'" + ((ConstantChar) value).getValue() + "'";
+      } else if(value instanceof ConstantString) {
+         return "\"" + ((ConstantString) value).getValue() + "\"";
+      } else if(value instanceof ConstantUnary) {
+         ConstantUnary unary = (ConstantUnary) value;
+         Operator operator = unary.getOperator();
+         boolean parenthesis = operator.getPrecedence() > precedence;
+         return (parenthesis ? "(" : "") +
+               getAsmConstantUnary(program, codeScope, operator, unary.getOperand(), precedence) +
+               (parenthesis ? ")" : "");
+      } else if(value instanceof ConstantBinary) {
+         ConstantBinary binary = (ConstantBinary) value;
+         Operator operator = binary.getOperator();
+         boolean parenthesis = operator.getPrecedence() > precedence;
+         return
+               (parenthesis ? "(" : "") +
+                     getAsmConstant(program, binary.getLeft(), operator.getPrecedence(), codeScope) +
+                     operator.getOperator() +
+                     getAsmConstant(program, binary.getRight(), operator.getPrecedence(), codeScope) +
+                     (parenthesis ? ")" : "");
+      } else {
+         throw new RuntimeException("Constant type not supported " + value);
+      }
+   }
 
-    /**
-     * Get ASM code for a constant unary expression
-     *
-     * @param program The program
-     * @param codeScope The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
-     * @param operator The unary operator
-     * @param operand The operand of the unary expression
-     * @return The ASM string representing the constant value
-     */
-    private static String getAsmConstantUnary(Program program, ScopeRef codeScope, Operator operator, ConstantValue operand, int outerPrecedence) {
-        if (Operator.CAST_BYTE.equals(operator) || Operator.CAST_SBYTE.equals(operator)) {
-            SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand);
-            if (SymbolType.isByte(operandType) || SymbolType.isSByte(operandType)) {
-                // No cast needed
-                return getAsmConstant(program, operand, outerPrecedence, codeScope);
-            } else {
-                return "$ff & " + getAsmConstant(program, operand, Operator.BOOL_AND.getPrecedence(), codeScope);
-            }
-        } else if (Operator.CAST_WORD.equals(operator) || Operator.CAST_SWORD.equals(operator) || Operator.CAST_PTRBY.equals(operator)) {
-            SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand);
-            if (SymbolType.isWord(operandType) || SymbolType.isSWord(operandType)) {
-                // No cast needed
-                return getAsmConstant(program, operand, outerPrecedence, codeScope);
-            } else {
-                return "$ffff & " + getAsmConstant(program, operand, Operator.BOOL_AND.getPrecedence(), codeScope);
-            }
-        } else if (Operator.INCREMENT.equals(operator)) {
-            return getAsmConstant(program, operand, Operator.PLUS.getPrecedence(), codeScope) + "+1";
-        } else if (Operator.DECREMENT.equals(operator)) {
-            return getAsmConstant(program, operand, Operator.PLUS.getPrecedence(), codeScope) + "-1";
-        } else {
-            return operator.getOperator() +
-                    getAsmConstant(program, operand, operator.getPrecedence(), codeScope);
-        }
-    }
+   /**
+    * Get ASM code for a constant unary expression
+    *
+    * @param program The program
+    * @param codeScope The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
+    * @param operator The unary operator
+    * @param operand The operand of the unary expression
+    * @return The ASM string representing the constant value
+    */
+   private static String getAsmConstantUnary(Program program, ScopeRef codeScope, Operator operator, ConstantValue operand, int outerPrecedence) {
+      if(Operator.CAST_BYTE.equals(operator) || Operator.CAST_SBYTE.equals(operator)) {
+         SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand);
+         if(SymbolType.isByte(operandType) || SymbolType.isSByte(operandType)) {
+            // No cast needed
+            return getAsmConstant(program, operand, outerPrecedence, codeScope);
+         } else {
+            return "$ff & " + getAsmConstant(program, operand, Operator.BOOL_AND.getPrecedence(), codeScope);
+         }
+      } else if(Operator.CAST_WORD.equals(operator) || Operator.CAST_SWORD.equals(operator) || Operator.CAST_PTRBY.equals(operator)) {
+         SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand);
+         if(SymbolType.isWord(operandType) || SymbolType.isSWord(operandType)) {
+            // No cast needed
+            return getAsmConstant(program, operand, outerPrecedence, codeScope);
+         } else {
+            return "$ffff & " + getAsmConstant(program, operand, Operator.BOOL_AND.getPrecedence(), codeScope);
+         }
+      } else if(Operator.INCREMENT.equals(operator)) {
+         return getAsmConstant(program, operand, Operator.PLUS.getPrecedence(), codeScope) + "+1";
+      } else if(Operator.DECREMENT.equals(operator)) {
+         return getAsmConstant(program, operand, Operator.PLUS.getPrecedence(), codeScope) + "-1";
+      } else {
+         return operator.getOperator() +
+               getAsmConstant(program, operand, operator.getPrecedence(), codeScope);
+      }
+   }
 
-    public static String getAsmNumber(Number number) {
-        if (number instanceof Integer) {
-            if (number.intValue() >= 0 && number.intValue() <= 9) {
-                return String.format("%d", number.intValue());
-            } else {
-                return String.format("$%x", number);
-            }
-        }
-        throw new RuntimeException("Unsupported number type " + number);
-    }
+   public static String getAsmNumber(Number number) {
+      if(number instanceof Integer) {
+         if(number.intValue() >= 0 && number.intValue() <= 9) {
+            return String.format("%d", number.intValue());
+         } else {
+            return String.format("$%x", number);
+         }
+      }
+      throw new RuntimeException("Unsupported number type " + number);
+   }
 
-    /**
-     * Get the ASM parameter for a specific bound constant/ variable
-     *
-     * @param varScopeRef The scope containing the var/const
-     * @param asmName The ASM name of the variable (local name or specific ASM name).
-     * @param codeScopeRef The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
-     * @return The ASM parameter to use in the ASM code
-     */
-    static String getAsmParamName(ScopeRef varScopeRef, String asmName, ScopeRef codeScopeRef) {
-        if (!varScopeRef.equals(codeScopeRef) && varScopeRef.getFullName().length() > 0) {
-            String param = varScopeRef.getFullName() + "." + asmName
-                    .replace('@', 'b')
-                    .replace(':', '_')
-                    .replace("#", "_")
-                    .replace("$", "_");
-            //param = ""+((Registers.RegisterZp) register).getZp();
-            return param;
-        } else {
-            String param = asmName.replace('@', 'b').replace(':', '_').replace("#", "_").replace("$", "_");
-            //param = ""+((Registers.RegisterZp) register).getZp();
-            return param;
-        }
-    }
+   /**
+    * Get the ASM parameter for a specific bound constant/ variable
+    *
+    * @param varScopeRef The scope containing the var/const
+    * @param asmName The ASM name of the variable (local name or specific ASM name).
+    * @param codeScopeRef The scope containing the code being generated. Used for adding scope to the name when needed (eg. line.x1 when referencing x1 variable inside line scope from outside line scope).
+    * @return The ASM parameter to use in the ASM code
+    */
+   static String getAsmParamName(ScopeRef varScopeRef, String asmName, ScopeRef codeScopeRef) {
+      if(!varScopeRef.equals(codeScopeRef) && varScopeRef.getFullName().length() > 0) {
+         String param = varScopeRef.getFullName() + "." + asmName
+               .replace('@', 'b')
+               .replace(':', '_')
+               .replace("#", "_")
+               .replace("$", "_");
+         //param = ""+((Registers.RegisterZp) register).getZp();
+         return param;
+      } else {
+         String param = asmName.replace('@', 'b').replace(':', '_').replace("#", "_").replace("$", "_");
+         //param = ""+((Registers.RegisterZp) register).getZp();
+         return param;
+      }
+   }
 
-    /**
-     * Get the ASM parameter for a specific bound variable
-     *
-     * @param boundVar The variable
-     * @return The ASM parameter to use in the ASM code
-     */
-    static String getAsmParamName(Variable boundVar, ScopeRef codeScopeRef) {
-        ScopeRef varScopeRef = boundVar.getScope().getRef();
-        String asmName = boundVar.getAsmName() == null ? boundVar.getLocalName() : boundVar.getAsmName();
-        return getAsmParamName(varScopeRef, asmName, codeScopeRef);
-    }
+   /**
+    * Get the ASM parameter for a specific bound variable
+    *
+    * @param boundVar The variable
+    * @return The ASM parameter to use in the ASM code
+    */
+   static String getAsmParamName(Variable boundVar, ScopeRef codeScopeRef) {
+      ScopeRef varScopeRef = boundVar.getScope().getRef();
+      String asmName = boundVar.getAsmName() == null ? boundVar.getLocalName() : boundVar.getAsmName();
+      return getAsmParamName(varScopeRef, asmName, codeScopeRef);
+   }
 
-    /**
-     * Get the ASM parameter for a specific bound constant
-     *
-     * @param boundVar The constant
-     * @return The ASM parameter to use in the ASM code
-     */
-    private static String getAsmParamName(ConstantVar boundVar, ScopeRef codeScopeRef) {
-        ScopeRef varScopeRef = boundVar.getScope().getRef();
-        String asmName = boundVar.getAsmName() == null ? boundVar.getLocalName() : boundVar.getAsmName();
-        return getAsmParamName(varScopeRef, asmName, codeScopeRef);
-    }
+   /**
+    * Get the ASM parameter for a specific bound constant
+    *
+    * @param boundVar The constant
+    * @return The ASM parameter to use in the ASM code
+    */
+   private static String getAsmParamName(ConstantVar boundVar, ScopeRef codeScopeRef) {
+      ScopeRef varScopeRef = boundVar.getScope().getRef();
+      String asmName = boundVar.getAsmName() == null ? boundVar.getLocalName() : boundVar.getAsmName();
+      return getAsmParamName(varScopeRef, asmName, codeScopeRef);
+   }
 }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragment.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragment.java
index 4de09b6f9..0b1f54343 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragment.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragment.java
@@ -12,308 +12,308 @@ import java.util.Map;
 /** ASM Code Fragment with register/variable bindings that can be used for generating ASM code for a specific statement . */
 public class AsmFragment {
 
-    /** The symbol table. */
-    private Program program;
+   /** The symbol table. */
+   private Program program;
 
-    /** The name of the fragment used in error messages. */
-    private String name;
+   /** The name of the fragment used in error messages. */
+   private String name;
 
-    /** The fragment template for the ASM code. */
-    private AsmFragmentTemplate fragmentTemplate;
+   /** The fragment template for the ASM code. */
+   private AsmFragmentTemplate fragmentTemplate;
 
-    /** Binding of named values in the fragment to values (constants, variables, ...) . */
-    private Map<String, Value> bindings;
+   /** Binding of named values in the fragment to values (constants, variables, ...) . */
+   private Map<String, Value> bindings;
 
-    /** The scope containing the fragment. Used when referencing symbols defined in other scopes. */
-    private ScopeRef codeScopeRef;
+   /** The scope containing the fragment. Used when referencing symbols defined in other scopes. */
+   private ScopeRef codeScopeRef;
 
-    public AsmFragment(
-            Program program,
-            String name,
-            ScopeRef codeScopeRef,
-            AsmFragmentTemplate fragmentTemplate,
-            Map<String, Value> bindings) {
-        this.program = program;
-        this.name = name;
-        this.fragmentTemplate = fragmentTemplate;
-        this.bindings = bindings;
-        this.codeScopeRef = codeScopeRef;
-    }
+   public AsmFragment(
+         Program program,
+         String name,
+         ScopeRef codeScopeRef,
+         AsmFragmentTemplate fragmentTemplate,
+         Map<String, Value> bindings) {
+      this.program = program;
+      this.name = name;
+      this.fragmentTemplate = fragmentTemplate;
+      this.bindings = bindings;
+      this.codeScopeRef = codeScopeRef;
+   }
 
-    public Value getBinding(String name) {
-        return bindings.get(name);
-    }
+   public Value getBinding(String name) {
+      return bindings.get(name);
+   }
 
-    /**
-     * Get the value to replace a bound name with from the fragment signature
-     *
-     * @param name The name of the bound value in the fragment
-     * @return The bound value to use in the generated ASM code
-     */
-    public AsmParameter getBoundValue(String name) {
-        Value boundValue = null;
-        if (name.length() == 2) {
-            // Short name!
-            for (String boundName : bindings.keySet()) {
-                if (boundName.substring(boundName.length() - 2).equals(name)) {
-                    boundValue = getBinding(boundName);
-                    break;
-                }
+   /**
+    * Get the value to replace a bound name with from the fragment signature
+    *
+    * @param name The name of the bound value in the fragment
+    * @return The bound value to use in the generated ASM code
+    */
+   public AsmParameter getBoundValue(String name) {
+      Value boundValue = null;
+      if(name.length() == 2) {
+         // Short name!
+         for(String boundName : bindings.keySet()) {
+            if(boundName.substring(boundName.length() - 2).equals(name)) {
+               boundValue = getBinding(boundName);
+               break;
             }
-        } else {
-            // Long name
-            boundValue = getBinding(name);
-        }
+         }
+      } else {
+         // Long name
+         boundValue = getBinding(name);
+      }
 
-        if (boundValue == null) {
-            throw new RuntimeException("Binding '" + name + "' not found in fragment " + this.name + ".asm");
-        }
-        if (boundValue instanceof Variable) {
-            Variable boundVar = (Variable) boundValue;
-            Registers.Register register = boundVar.getAllocation();
-            if (register != null && register instanceof Registers.RegisterZp) {
-                return new AsmParameter(AsmFormat.getAsmParamName(boundVar, codeScopeRef), true);
-            } else {
-                throw new RuntimeException("Register Type not implemented " + register);
-            }
-        } else if (boundValue instanceof ConstantVar) {
-            ConstantVar constantVar = (ConstantVar) boundValue;
-            String constantValueAsm = AsmFormat.getAsmConstant(program, constantVar.getRef(), 99, codeScopeRef);
-            boolean constantValueZp = SymbolType.BYTE.equals(constantVar.getType(program.getScope()));
-            return new AsmParameter(constantValueAsm, constantValueZp);
-        } else if (boundValue instanceof ConstantValue) {
-            ConstantValue boundConst = (ConstantValue) boundValue;
-            String constantValueAsm = AsmFormat.getAsmConstant(program, boundConst, 99, codeScopeRef);
-            boolean constantValueZp = SymbolType.BYTE.equals(boundConst.getType(program.getScope()));
-            return new AsmParameter(constantValueAsm, constantValueZp);
-        } else if (boundValue instanceof Label) {
-            String param = ((Label) boundValue).getLocalName().replace('@', 'b').replace(':', '_').replace("$", "_");
-            return new AsmParameter(param, false);
-        } else {
-            throw new RuntimeException("Bound Value Type not implemented " + boundValue);
-        }
-    }
+      if(boundValue == null) {
+         throw new RuntimeException("Binding '" + name + "' not found in fragment " + this.name + ".asm");
+      }
+      if(boundValue instanceof Variable) {
+         Variable boundVar = (Variable) boundValue;
+         Registers.Register register = boundVar.getAllocation();
+         if(register != null && register instanceof Registers.RegisterZp) {
+            return new AsmParameter(AsmFormat.getAsmParamName(boundVar, codeScopeRef), true);
+         } else {
+            throw new RuntimeException("Register Type not implemented " + register);
+         }
+      } else if(boundValue instanceof ConstantVar) {
+         ConstantVar constantVar = (ConstantVar) boundValue;
+         String constantValueAsm = AsmFormat.getAsmConstant(program, constantVar.getRef(), 99, codeScopeRef);
+         boolean constantValueZp = SymbolType.BYTE.equals(constantVar.getType(program.getScope()));
+         return new AsmParameter(constantValueAsm, constantValueZp);
+      } else if(boundValue instanceof ConstantValue) {
+         ConstantValue boundConst = (ConstantValue) boundValue;
+         String constantValueAsm = AsmFormat.getAsmConstant(program, boundConst, 99, codeScopeRef);
+         boolean constantValueZp = SymbolType.BYTE.equals(boundConst.getType(program.getScope()));
+         return new AsmParameter(constantValueAsm, constantValueZp);
+      } else if(boundValue instanceof Label) {
+         String param = ((Label) boundValue).getLocalName().replace('@', 'b').replace(':', '_').replace("$", "_");
+         return new AsmParameter(param, false);
+      } else {
+         throw new RuntimeException("Bound Value Type not implemented " + boundValue);
+      }
+   }
 
-    public String getFragmentName() {
-        return name;
-    }
+   public String getFragmentName() {
+      return name;
+   }
 
-    /**
-     * A parameter of an ASM instruction from a bound value.
-     */
-    public static class AsmParameter {
+   /**
+    * Generate assembler code for the assembler fragment.
+    *
+    * @param asm The assembler sequence to generate into.
+    */
+   public void generate(AsmProgram asm) {
+      AsmSequenceGenerator asmSequenceGenerator = new AsmSequenceGenerator(name, this, asm);
+      asmSequenceGenerator.generate(fragmentTemplate.getBodyAsm());
+   }
 
-        private String param;
-        private boolean zp;
+   /**
+    * A parameter of an ASM instruction from a bound value.
+    */
+   public static class AsmParameter {
 
-        public AsmParameter(String param, boolean zp) {
-            this.param = param;
-            this.zp = zp;
-        }
+      private String param;
+      private boolean zp;
 
-        public String getParam() {
-            return param;
-        }
+      public AsmParameter(String param, boolean zp) {
+         this.param = param;
+         this.zp = zp;
+      }
 
-        public boolean isZp() {
-            return zp;
-        }
-    }
+      public String getParam() {
+         return param;
+      }
 
-    /**
-     * Generate assembler code for the assembler fragment.
-     *
-     * @param asm The assembler sequence to generate into.
-     */
-    public void generate(AsmProgram asm) {
-        AsmSequenceGenerator asmSequenceGenerator = new AsmSequenceGenerator(name, this, asm);
-        asmSequenceGenerator.generate(fragmentTemplate.getBodyAsm());
-    }
+      public boolean isZp() {
+         return zp;
+      }
+   }
 
-    private static class AsmSequenceGenerator extends KickCBaseVisitor {
+   private static class AsmSequenceGenerator extends KickCBaseVisitor {
 
-        private String name;
-        private AsmProgram program;
-        private AsmFragment bindings;
+      private String name;
+      private AsmProgram program;
+      private AsmFragment bindings;
 
-        public AsmSequenceGenerator(String name, AsmFragment bindings, AsmProgram program) {
-            this.name = name;
-            this.bindings = bindings;
-            this.program = program;
-        }
+      public AsmSequenceGenerator(String name, AsmFragment bindings, AsmProgram program) {
+         this.name = name;
+         this.bindings = bindings;
+         this.program = program;
+      }
 
-        public AsmProgram getProgram() {
-            return program;
-        }
+      public AsmProgram getProgram() {
+         return program;
+      }
 
-        public void generate(KickCParser.AsmLinesContext context) {
-            this.visit(context);
-        }
+      public void generate(KickCParser.AsmLinesContext context) {
+         this.visit(context);
+      }
 
-        @Override
-        public Object visitAsmLabel(KickCParser.AsmLabelContext ctx) {
-            program.addLine(new AsmLabel(ctx.getChild(0).getText()));
-            return null;
-        }
+      @Override
+      public Object visitAsmLabel(KickCParser.AsmLabelContext ctx) {
+         program.addLine(new AsmLabel(ctx.getChild(0).getText()));
+         return null;
+      }
 
-        @Override
-        public Object visitAsmBytes(KickCParser.AsmBytesContext ctx) {
-            ArrayList<String> values = new ArrayList<>();
-            for (int i = 1; i < ctx.getChildCount(); i = i + 2) {
-                values.add(ctx.getChild(i).getText());
-            }
-            program.addLine(new AsmDataNumeric(null, AsmDataNumeric.Type.BYTE, values));
-            return null;
-        }
+      @Override
+      public Object visitAsmBytes(KickCParser.AsmBytesContext ctx) {
+         ArrayList<String> values = new ArrayList<>();
+         for(int i = 1; i < ctx.getChildCount(); i = i + 2) {
+            values.add(ctx.getChild(i).getText());
+         }
+         program.addLine(new AsmDataNumeric(null, AsmDataNumeric.Type.BYTE, values));
+         return null;
+      }
 
-        @Override
-        public Object visitAsmInstruction(KickCParser.AsmInstructionContext ctx) {
-            KickCParser.AsmParamModeContext paramModeCtx = ctx.asmParamMode();
-            AsmInstruction instruction;
-            if (paramModeCtx == null) {
-                AsmInstructionType type = AsmInstructionSet.getInstructionType(
-                        ctx.MNEMONIC().getText(),
-                        AsmAddressingMode.NON,
-                        false);
-                instruction = new AsmInstruction(type, null);
-            } else {
-                instruction = (AsmInstruction) this.visit(paramModeCtx);
-            }
-            if (instruction != null) {
-                program.addLine(instruction);
-            } else {
-                throw new RuntimeException("Error parsing ASM fragment line in dk/camelot64/kickc/fragment/asm/" + name + ".asm\n - Line: " + ctx.getText());
-            }
-            return null;
-        }
-
-        @Override
-        public Object visitAsmModeAbs(KickCParser.AsmModeAbsContext ctx) {
-            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABS);
-        }
-
-        @Override
-        public Object visitAsmModeImm(KickCParser.AsmModeImmContext ctx) {
-            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IMM);
-        }
-
-        @Override
-        public Object visitAsmModeAbsXY(KickCParser.AsmModeAbsXYContext ctx) {
-            String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
-            if (xy.equals("x")) {
-                return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABX);
-            } else if (xy.equals("y")) {
-                return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABY);
-            } else {
-                throw new RuntimeException("Unknown addressing mode " + ctx.getText());
-            }
-        }
-
-        @Override
-        public Object visitAsmModeIndIdxXY(KickCParser.AsmModeIndIdxXYContext ctx) {
-            String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
-            if (xy.equals("y")) {
-                return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IZY);
-            } else {
-                throw new RuntimeException("Unknown addressing mode " + ctx.getText());
-            }
-        }
-
-        @Override
-        public Object visitAsmModeIdxIndXY(KickCParser.AsmModeIdxIndXYContext ctx) {
-            String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
-            if (xy.equals("x")) {
-                return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IZX);
-            } else {
-                throw new RuntimeException("Unknown addressing mode " + ctx.getText());
-            }
-        }
-
-        @Override
-        public Object visitAsmModeInd(KickCParser.AsmModeIndContext ctx) {
-            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IND);
-        }
-
-        private AsmInstruction createAsmInstruction(
-                KickCParser.AsmParamModeContext ctx,
-                KickCParser.AsmExprContext exprCtx,
-                AsmAddressingMode addressingMode) {
-            KickCParser.AsmInstructionContext instructionCtx = (KickCParser.AsmInstructionContext) ctx.getParent();
-            String mnemonic = instructionCtx.MNEMONIC().getSymbol().getText();
-            AsmParameter parameter = (AsmParameter) this.visit(exprCtx);
+      @Override
+      public Object visitAsmInstruction(KickCParser.AsmInstructionContext ctx) {
+         KickCParser.AsmParamModeContext paramModeCtx = ctx.asmParamMode();
+         AsmInstruction instruction;
+         if(paramModeCtx == null) {
             AsmInstructionType type = AsmInstructionSet.getInstructionType(
-                    mnemonic,
-                    addressingMode,
-                    parameter.isZp());
-            if (type == null) {
-                throw new RuntimeException("Error in " + name + ".asm line " + ctx.getStart().getLine() + " - Instruction type unknown " + mnemonic + " " + addressingMode + " " + parameter);
-            }
-            return new AsmInstruction(type, parameter.getParam());
-        }
+                  ctx.MNEMONIC().getText(),
+                  AsmAddressingMode.NON,
+                  false);
+            instruction = new AsmInstruction(type, null);
+         } else {
+            instruction = (AsmInstruction) this.visit(paramModeCtx);
+         }
+         if(instruction != null) {
+            program.addLine(instruction);
+         } else {
+            throw new RuntimeException("Error parsing ASM fragment line in dk/camelot64/kickc/fragment/asm/" + name + ".asm\n - Line: " + ctx.getText());
+         }
+         return null;
+      }
 
-        @Override
-        public AsmParameter visitAsmExprBinary(KickCParser.AsmExprBinaryContext ctx) {
-            AsmParameter left = (AsmParameter) this.visit(ctx.asmExpr(0));
-            AsmParameter right = (AsmParameter) this.visit(ctx.asmExpr(1));
-            String param = "" + left.getParam() + ctx.getChild(1).getText() + right.getParam();
-            boolean zp = left.isZp() && right.isZp();
-            return new AsmParameter(param, zp);
-        }
+      @Override
+      public Object visitAsmModeAbs(KickCParser.AsmModeAbsContext ctx) {
+         return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABS);
+      }
 
-        @Override
-        public AsmParameter visitAsmExprUnary(KickCParser.AsmExprUnaryContext ctx) {
-            AsmParameter sub = (AsmParameter) this.visit(ctx.asmExpr());
-            String operator = ctx.getChild(0).getText();
-            String param = operator + sub.getParam();
-            boolean isZp = sub.isZp();
-            if (operator.equals("<") || operator.equals(">")) {
-                isZp = true;
-            }
-            return new AsmParameter(param, isZp);
-        }
+      @Override
+      public Object visitAsmModeImm(KickCParser.AsmModeImmContext ctx) {
+         return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IMM);
+      }
 
-        @Override
-        public AsmParameter visitAsmExprInt(KickCParser.AsmExprIntContext ctx) {
-            Number number = NumberParser.parseLiteral(ctx.NUMBER().getText());
-            ConstantInteger intVal = new ConstantInteger(number.intValue());
-            boolean isZp = SymbolType.isByte(intVal.getType()) || SymbolType.isSByte(intVal.getType());
-            String param = AsmFormat.getAsmNumber(number);
-            return new AsmParameter(param, isZp);
-        }
+      @Override
+      public Object visitAsmModeAbsXY(KickCParser.AsmModeAbsXYContext ctx) {
+         String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
+         if(xy.equals("x")) {
+            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABX);
+         } else if(xy.equals("y")) {
+            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.ABY);
+         } else {
+            throw new RuntimeException("Unknown addressing mode " + ctx.getText());
+         }
+      }
 
-        @Override
-        public Object visitAsmExprChar(KickCParser.AsmExprCharContext ctx) {
-            return new AsmParameter(ctx.getText(), true);
-        }
+      @Override
+      public Object visitAsmModeIndIdxXY(KickCParser.AsmModeIndIdxXYContext ctx) {
+         String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
+         if(xy.equals("y")) {
+            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IZY);
+         } else {
+            throw new RuntimeException("Unknown addressing mode " + ctx.getText());
+         }
+      }
 
-        @Override
-        public AsmParameter visitAsmExprLabel(KickCParser.AsmExprLabelContext ctx) {
-            String param = ctx.NAME().getSymbol().getText();
-            return new AsmParameter(param, false);
-        }
+      @Override
+      public Object visitAsmModeIdxIndXY(KickCParser.AsmModeIdxIndXYContext ctx) {
+         String xy = ctx.getChild(ctx.getChildCount() - 1).getText();
+         if(xy.equals("x")) {
+            return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IZX);
+         } else {
+            throw new RuntimeException("Unknown addressing mode " + ctx.getText());
+         }
+      }
 
-        @Override
-        public Object visitAsmExprLabelRel(KickCParser.AsmExprLabelRelContext ctx) {
-            String param = ctx.ASMREL().getSymbol().getText();
-            return new AsmParameter(param, false);
-        }
+      @Override
+      public Object visitAsmModeInd(KickCParser.AsmModeIndContext ctx) {
+         return createAsmInstruction(ctx, ctx.asmExpr(), AsmAddressingMode.IND);
+      }
 
-        @Override
-        public AsmParameter visitAsmExprReplace(KickCParser.AsmExprReplaceContext ctx) {
-            String replaceName = ctx.NAME().getSymbol().getText();
-            return bindings.getBoundValue(replaceName);
-        }
-    }
+      private AsmInstruction createAsmInstruction(
+            KickCParser.AsmParamModeContext ctx,
+            KickCParser.AsmExprContext exprCtx,
+            AsmAddressingMode addressingMode) {
+         KickCParser.AsmInstructionContext instructionCtx = (KickCParser.AsmInstructionContext) ctx.getParent();
+         String mnemonic = instructionCtx.MNEMONIC().getSymbol().getText();
+         AsmParameter parameter = (AsmParameter) this.visit(exprCtx);
+         AsmInstructionType type = AsmInstructionSet.getInstructionType(
+               mnemonic,
+               addressingMode,
+               parameter.isZp());
+         if(type == null) {
+            throw new RuntimeException("Error in " + name + ".asm line " + ctx.getStart().getLine() + " - Instruction type unknown " + mnemonic + " " + addressingMode + " " + parameter);
+         }
+         return new AsmInstruction(type, parameter.getParam());
+      }
 
-    public static class AluNotApplicableException extends RuntimeException {
+      @Override
+      public AsmParameter visitAsmExprBinary(KickCParser.AsmExprBinaryContext ctx) {
+         AsmParameter left = (AsmParameter) this.visit(ctx.asmExpr(0));
+         AsmParameter right = (AsmParameter) this.visit(ctx.asmExpr(1));
+         String param = "" + left.getParam() + ctx.getChild(1).getText() + right.getParam();
+         boolean zp = left.isZp() && right.isZp();
+         return new AsmParameter(param, zp);
+      }
 
-        public AluNotApplicableException() {
-            super("ALU register not appicable.");
-        }
+      @Override
+      public AsmParameter visitAsmExprUnary(KickCParser.AsmExprUnaryContext ctx) {
+         AsmParameter sub = (AsmParameter) this.visit(ctx.asmExpr());
+         String operator = ctx.getChild(0).getText();
+         String param = operator + sub.getParam();
+         boolean isZp = sub.isZp();
+         if(operator.equals("<") || operator.equals(">")) {
+            isZp = true;
+         }
+         return new AsmParameter(param, isZp);
+      }
 
-        public AluNotApplicableException(String message) {
-            super(message);
-        }
-    }
+      @Override
+      public AsmParameter visitAsmExprInt(KickCParser.AsmExprIntContext ctx) {
+         Number number = NumberParser.parseLiteral(ctx.NUMBER().getText());
+         ConstantInteger intVal = new ConstantInteger(number.intValue());
+         boolean isZp = SymbolType.isByte(intVal.getType()) || SymbolType.isSByte(intVal.getType());
+         String param = AsmFormat.getAsmNumber(number);
+         return new AsmParameter(param, isZp);
+      }
+
+      @Override
+      public Object visitAsmExprChar(KickCParser.AsmExprCharContext ctx) {
+         return new AsmParameter(ctx.getText(), true);
+      }
+
+      @Override
+      public AsmParameter visitAsmExprLabel(KickCParser.AsmExprLabelContext ctx) {
+         String param = ctx.NAME().getSymbol().getText();
+         return new AsmParameter(param, false);
+      }
+
+      @Override
+      public Object visitAsmExprLabelRel(KickCParser.AsmExprLabelRelContext ctx) {
+         String param = ctx.ASMREL().getSymbol().getText();
+         return new AsmParameter(param, false);
+      }
+
+      @Override
+      public AsmParameter visitAsmExprReplace(KickCParser.AsmExprReplaceContext ctx) {
+         String replaceName = ctx.NAME().getSymbol().getText();
+         return bindings.getBoundValue(replaceName);
+      }
+   }
+
+   public static class AluNotApplicableException extends RuntimeException {
+
+      public AluNotApplicableException() {
+         super("ALU register not appicable.");
+      }
+
+      public AluNotApplicableException(String message) {
+         super(message);
+      }
+   }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
index 62aeeccf4..70012c431 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
@@ -19,535 +19,531 @@ import java.util.*;
  */
 public class AsmFragmentManager {
 
-    /** Cache for the best fragment templates. Maps signature to the best fragment template for the signature. */
-    private static Map<String, AsmFragmentTemplate> bestFragmentCache = new HashMap<>();
+   /** Cache for the best fragment templates. Maps signature to the best fragment template for the signature. */
+   private static Map<String, AsmFragmentTemplate> bestFragmentCache = new HashMap<>();
 
-    /** Caches all asm fragment templates for all encountered signatures. */
-    private static Map<String, List<AsmFragmentTemplate>> fragmentTemplateCache = new LinkedHashMap<>();
+   /** Caches all asm fragment templates for all encountered signatures. */
+   private static Map<String, List<AsmFragmentTemplate>> fragmentTemplateCache = new LinkedHashMap<>();
 
-    /** Special singleton representing that the fragment can not be synthesized or loaded. */
-    private static AsmFragmentTemplate UNKNOWN = new AsmFragmentTemplate("UNKNOWN", null);
+   /** Special singleton representing that the fragment can not be synthesized or loaded. */
+   private static AsmFragmentTemplate UNKNOWN = new AsmFragmentTemplate("UNKNOWN", null);
+   /**
+    * All the synthesize rules available.
+    */
+   private static List<AsmFragmentSynthesis> fragmentSyntheses;
 
-    static Map<String, List<AsmFragmentTemplate>> getFragmentTemplateCache() {
-        return fragmentTemplateCache;
-    }
+   static Map<String, List<AsmFragmentTemplate>> getFragmentTemplateCache() {
+      return fragmentTemplateCache;
+   }
 
-    public static AsmFragment getFragment(AsmFragmentSignature signature, CompileLog log) {
-        AsmFragmentTemplate bestTemplate = bestFragmentCache.get(signature.getSignature());
-        if (bestTemplate == UNKNOWN) {
-            if (log.isVerboseFragmentLog()) {
-                log.append("Unknown fragment " + signature.getSignature());
+   public static AsmFragment getFragment(AsmFragmentSignature signature, CompileLog log) {
+      AsmFragmentTemplate bestTemplate = bestFragmentCache.get(signature.getSignature());
+      if(bestTemplate == UNKNOWN) {
+         if(log.isVerboseFragmentLog()) {
+            log.append("Unknown fragment " + signature.getSignature());
+         }
+         throw new UnknownFragmentException(signature.toString());
+      }
+      if(bestTemplate == null) {
+         AsmFragmentTemplateSynthesizer synthesizer = new AsmFragmentTemplateSynthesizer(signature.getSignature(), log);
+         List<AsmFragmentTemplate> candidates = synthesizer.loadOrSynthesizeFragment(signature.getSignature(), new AsmSynthesisPath());
+         if(candidates.size() == 0) {
+            if(log.isVerboseFragmentLog()) {
+               log.append("Unknown fragment " + signature.toString());
             }
+            bestFragmentCache.put(signature.getSignature(), UNKNOWN);
             throw new UnknownFragmentException(signature.toString());
-        }
-        if (bestTemplate == null) {
-            AsmFragmentTemplateSynthesizer synthesizer = new AsmFragmentTemplateSynthesizer(signature.getSignature(), log);
-            List<AsmFragmentTemplate> candidates = synthesizer.loadOrSynthesizeFragment(signature.getSignature(), new AsmSynthesisPath());
-            if (candidates.size() == 0) {
-                if (log.isVerboseFragmentLog()) {
-                    log.append("Unknown fragment " + signature.toString());
-                }
-                bestFragmentCache.put(signature.getSignature(), UNKNOWN);
-                throw new UnknownFragmentException(signature.toString());
+         }
+         double minScore = Double.MAX_VALUE;
+         double maxScore = Double.MIN_VALUE;
+         AsmFragmentTemplate maxTemplate = null;
+         for(AsmFragmentTemplate candidateTemplate : candidates) {
+            AsmFragment candidateFragment = new AsmFragment(
+                  signature.getProgram(),
+                  signature.getSignature(),
+                  signature.getCodeScope(),
+                  candidateTemplate,
+                  signature.getBindings());
+            AsmProgram candidateAsm = new AsmProgram();
+            candidateAsm.startSegment(null, signature.toString());
+            candidateFragment.generate(candidateAsm);
+            double score = candidateAsm.getCycles();
+            if(score < minScore) {
+               minScore = score;
+               bestTemplate = candidateTemplate;
             }
-            double minScore = Double.MAX_VALUE;
-            double maxScore = Double.MIN_VALUE;
-            AsmFragmentTemplate maxTemplate = null;
-            for (AsmFragmentTemplate candidateTemplate : candidates) {
-                AsmFragment candidateFragment = new AsmFragment(
-                        signature.getProgram(),
-                        signature.getSignature(),
-                        signature.getCodeScope(),
-                        candidateTemplate,
-                        signature.getBindings());
-                AsmProgram candidateAsm = new AsmProgram();
-                candidateAsm.startSegment(null, signature.toString());
-                candidateFragment.generate(candidateAsm);
-                double score = candidateAsm.getCycles();
-                if (score < minScore) {
-                    minScore = score;
-                    bestTemplate = candidateTemplate;
-                }
-                if (score > maxScore) {
-                    maxScore = score;
-                    maxTemplate = candidateTemplate;
-                }
+            if(score > maxScore) {
+               maxScore = score;
+               maxTemplate = candidateTemplate;
             }
-            if (log.isVerboseFragmentLog()) {
-                log.append("Found fragment   " + bestTemplate.getName() + " score: " + minScore + " from " + candidates.size() + " candidates");
+         }
+         if(log.isVerboseFragmentLog()) {
+            log.append("Found fragment   " + bestTemplate.getName() + " score: " + minScore + " from " + candidates.size() + " candidates");
+         }
+         bestFragmentCache.put(signature.getSignature(), bestTemplate);
+      }
+      // Count usages
+      AsmFragmentUsages.incUsage(bestTemplate);
+      // Return the resulting fragment instance
+      return new AsmFragment(
+            signature.getProgram(),
+            signature.getSignature(),
+            signature.getCodeScope(),
+            bestTemplate,
+            signature.getBindings());
+   }
+
+   /**
+    * Look for a fragment on the disk.
+    *
+    * @param signature The fragment signature
+    * @return The fragment file contents. Null if the fragment is not on the disk.
+    */
+   private static CharStream loadFragment(String signature) {
+      ClassLoader classLoader = AsmFragmentManager.class.getClassLoader();
+      URL fragmentUrl = classLoader.getResource("dk/camelot64/kickc/fragment/asm/" + signature + ".asm");
+      if(fragmentUrl == null) {
+         return null;
+      }
+      try {
+         InputStream fragmentStream = fragmentUrl.openStream();
+         return CharStreams.fromStream(fragmentStream);
+      } catch(IOException e) {
+         throw new RuntimeException("Error loading fragment file " + fragmentUrl);
+      }
+   }
+
+   static File[] allFragmentFiles() {
+      ClassLoader classLoader = AsmFragmentManager.class.getClassLoader();
+      String path = classLoader.getResource("dk/camelot64/kickc/fragment/asm/").getPath();
+      return new File(path).listFiles((dir, name) -> name.endsWith(".asm"));
+
+   }
+
+   private static List<AsmFragmentSynthesis> getFragmentSyntheses() {
+      if(fragmentSyntheses == null) {
+         fragmentSyntheses = initFragmentSyntheses();
+      }
+      return fragmentSyntheses;
+   }
+
+   private static List<AsmFragmentSynthesis> initFragmentSyntheses() {
+      Map<String, String> mapZ = new LinkedHashMap<>();
+      mapZ.put("z2", "z1");
+      mapZ.put("z3", "z2");
+      Map<String, String> mapZ2 = new LinkedHashMap<>();
+      mapZ2.put("z3", "z1");
+      Map<String, String> mapZ3 = new LinkedHashMap<>();
+      mapZ3.put("z3", "z2");
+      Map<String, String> mapC = new LinkedHashMap<>();
+      mapC.put("c2", "c1");
+      mapC.put("c3", "c2");
+      Map<String, String> mapC3 = new LinkedHashMap<>();
+      mapC3.put("c3", "c2");
+      Map<String, String> mapZC = new LinkedHashMap<>();
+      mapZC.putAll(mapZ);
+      mapZC.putAll(mapC);
+      Map<String, String> mapSToU = new LinkedHashMap<>();
+      mapSToU.put("vbsz1", "vbuz1");
+      mapSToU.put("vbsz2", "vbuz2");
+      mapSToU.put("vbsz3", "vbuz3");
+      mapSToU.put("vbsc1", "vbuc1");
+      mapSToU.put("vbsc2", "vbuc2");
+      mapSToU.put("vbsc3", "vbuc3");
+      mapSToU.put("vbsaa", "vbuaa");
+      mapSToU.put("vbsxx", "vbuxx");
+      mapSToU.put("vbsyy", "vbuyy");
+      mapSToU.put("vwsz1", "vwuz1");
+      mapSToU.put("vwsz2", "vwuz2");
+      mapSToU.put("vwsz3", "vwuz3");
+      mapSToU.put("vwsc1", "vwuc1");
+      mapSToU.put("vwsc2", "vwuc2");
+      mapSToU.put("vwsc3", "vwuc3");
+
+      List<AsmFragmentSynthesis> synths = new ArrayList<>();
+
+      // NEW STYLE REWRITES - Utilizes that all combinations are tried
+
+      // Replace first AA with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1xx$2", null, null));
+      // Replace two AAs with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1xx$2xx$3", null, null));
+      // Replace second (not first) AA with XX
+      synths.add(new AsmFragmentSynthesis("(.*)aa(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1aa$2xx$3", null, null));
+
+      // Replace first AA with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1yy$2", null, null));
+      // Replace two AAs with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1yy$2yy$3", null, null));
+      // Replace second (not first) AA with YY
+      synths.add(new AsmFragmentSynthesis("(.*)aa(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1aa$2yy$3", null, null));
+
+      // Replace first XX with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1aa$2", null, null));
+      // Replace two XXs with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)xx(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1aa$2aa$3", null, null));
+      // Replace second (not first) XX with AA
+      synths.add(new AsmFragmentSynthesis("(.*)xx(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1xx$2aa$3", null, null));
+
+      // Replace first YY with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1aa$2", null, null));
+      // Replace two YYs with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)yy(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1aa$2aa$3", null, null));
+      // Replace second (not first) YY with AA
+      synths.add(new AsmFragmentSynthesis("(.*)yy(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1yy$2aa$3", null, null));
+
+      // Replace Z1 with AA (only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*aa.*", "lda {z1}", "$1aa$2", null, mapZ));
+      // Replace two Z1s with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*aa.*", "lda {z1}", "$1aa$2aa$3", null, mapZ));
+      // Replace first (not second) Z1 with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*aa.*", "lda {z1}", "$1aa$2z1$3", null, null));
+      // Replace second (not first) Z1 with AA
+      synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*aa.*", "lda {z1}", "$1z1$2aa$3", null, null));
+
+      // Replace Z1 with YY (only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*yy.*", "ldy {z1}", "$1yy$2", null, mapZ));
+      // Replace two Z1s with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*yy.*", "ldy {z1}", "$1yy$2yy$3", null, mapZ));
+      // Replace first (not second) Z1 with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*yy.*", "ldy {z1}", "$1yy$2z1$3", null, null));
+      // Replace second (not first) Z1 with YY
+      synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*yy.*", "ldy {z1}", "$1z1$2yy$3", null, null));
+
+      // Replace Z1 with XX (only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*xx.*", "ldx {z1}", "$1xx$2", null, mapZ));
+      // Replace two Z1s with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*xx.*", "ldx {z1}", "$1xx$2xx$3", null, mapZ));
+      // Replace first (not second) Z1 with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*xx.*", "ldx {z1}", "$1xx$2z1$3", null, null));
+      // Replace second (not first) Z1 with XX
+      synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*xx.*", "ldx {z1}", "$1z1$2xx$3", null, null));
+
+      // Replace Z2 with AA (only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*aa.*", "lda {z2}", "$1aa$2", null, mapZ3));
+      // Replace two Z2s with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*aa.*", "lda {z2}", "$1aa$2aa$3", null, mapZ3));
+      // Replace first (of 2) Z2 with AA
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*aa.*", "lda {z2}", "$1aa$2z2$3", null, null));
+      // Replace second (of 2) Z2 with AA
+      synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*aa.*", "lda {z2}", "$1z2$2aa$3", null, null));
+
+      // Replace Z2 with YY (only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*yy.*", "ldy {z2}", "$1yy$2", null, mapZ3));
+      // Replace two Z2s with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*yy.*", "ldy {z2}", "$1yy$2yy$3", null, mapZ3));
+      // Replace first (of 2) Z2 with YY
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*yy.*", "ldy {z2}", "$1yy$2z2$3", null, null));
+      // Replace second (of 2) Z2 with YY
+      synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*yy.*", "ldy {z2}", "$1z2$2yy$3", null, null));
+
+      // Replace Z2 with XX(only one)
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*xx.*", "ldx {z2}", "$1xx$2", null, mapZ3));
+      // Replace two Z2s with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*xx.*", "ldx {z2}", "$1xx$2xx$3", null, mapZ3));
+      // Replace first (of 2) Z2 with XX
+      synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*xx.*", "ldx {z2}", "$1xx$2z2$3", null, null));
+      // Replace second (of 2) Z2 with XX
+      synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*xx.*", "ldx {z2}", "$1z2$2xx$3", null, null));
+
+
+      // OLD STYLE REWRITES - written when only one rule could be taken
+
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.aa)", ".*=vb.aa_.*", null, "$1=$4_$3_$2", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.xx)", ".*=vb.[ax][ax]_.*", null, "$1=$4_$3_$2", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.yy)", ".*=vb.[axy][axy]_.*", null, "$1=$4_$3_$2", null, null));
+
+      synths.add(new AsmFragmentSynthesis("vbuxx=(.*)", null, null, "vbuaa=$1", "tax\n", null));
+      synths.add(new AsmFragmentSynthesis("vbsxx=(.*)", null, null, "vbsaa=$1", "tax\n", null));
+      synths.add(new AsmFragmentSynthesis("vbuyy=(.*)", null, null, "vbuaa=$1", "tay\n", null));
+      synths.add(new AsmFragmentSynthesis("vbsyy=(.*)", null, null, "vbsaa=$1", "tay\n", null));
+      synths.add(new AsmFragmentSynthesis("vbuz1=(.*)", ".*=.*vb.z1.*", null, "vbuaa=$1", "sta {z1}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("vbsz1=(.*)", ".*=.*vb.z1.*", null, "vbsaa=$1", "sta {z1}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1}\n", mapC));
+      synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1=(.*c1.*)", null, null, "vb$1aa=$2", "sta {c1}\n", null));
+      synths.add(new AsmFragmentSynthesis("_deref_pbuz1=(.*)", ".*z1.*z1.*", null, "vbuaa=$1", "ldy #0\n" + "sta ({z1}),y\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("_deref_pbuz1=(.*z1.*)", null, null, "vbuaa=$1", "ldy #0\n" + "sta ({z1}),y\n", null));
+
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*)", ".*z1.*z1.*|.*c1.*c1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapZC));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1},y\n", mapC));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1},x\n", mapC));
+      synths.add(new AsmFragmentSynthesis("pb(.)z1_derefidx_vbuz2=(.*)", ".*z1.*z1.*|.*z2.*z2.*", null, "vb$1aa=$2", "ldy {z2}\n" + "sta ({z1}),y\n", mapZ2));
+
+      synths.add(new AsmFragmentSynthesis("(.*)=_deref_pb(.)c1(.*)", ".*=.*aa.*", "lda {c1}\n", "$1=vb$2aa$3", null, mapC));
+      synths.add(new AsmFragmentSynthesis("(.*)=_deref_pb(.)z1(.*)", ".*z1.*z1.*|.*=.*aa.*|.*=.*yy.*", "ldy #0\n" + "lda ({z1}),y\n", "$1=vb$2aa$3", null, mapZ));
+
+      // Convert array indexing with A register to X/Y register by prefixing tax/tay (..._derefidx_vbuaa... -> ..._derefidx_vbuxx... /... _derefidx_vbuyy... )
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuaa(.*)", ".*=.*xx.*", "tax\n", "$1=$2_derefidx_vbuxx$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuaa(.*)", ".*=.*yy.*", "tay\n", "$1=$2_derefidx_vbuyy$3", null, null));
+      // Convert array indexing with zero page to x/y register by prefixing ldx z1 / ldy z1 ( ..._derefidx_vbuzn... -> ..._derefidx_vbuxx... / ..._derefidx_vbuyy... )
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz1(.*)", ".*=.*xx.*|.*z1.*z1.*", "ldx {z1}\n", "$1=$2_derefidx_vbuxx$3", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz1(.*)", ".*=.*yy.*|.*z1.*z1.*", "ldy {z1}\n", "$1=$2_derefidx_vbuyy$3", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz2(.*)", ".*=.*xx.*|.*z2.*z2.*", "ldx {z2}\n", "$1=$2_derefidx_vbuxx$3", null, mapZ3));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz2(.*)", ".*=.*yy.*|.*z2.*z2.*", "ldy {z2}\n", "$1=$2_derefidx_vbuyy$3", null, mapZ3));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz3(.*)", ".*=.*yy.*", "ldy {z3}\n", "$1=$2_derefidx_vbuyy$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz3(.*)", ".*=.*xx.*", "ldx {z3}\n", "$1=$2_derefidx_vbuxx$3", null, null));
+      // Convert array indexing twice with A/zp1/zp2 to X/Y register with a ldx/ldy prefix ( ..._derefidx_vbunn..._derefidx_vbunn... -> ..._derefidx_vbuxx..._derefidx_vbuxx... )
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuaa(.*)_derefidx_vbuaa(.*)", ".*aa.*aa.*aa.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "tax\n", null));
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuaa(.*)_derefidx_vbuaa(.*)", ".*aa.*aa.*aa.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "tay\n", null));
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1(.*)_derefidx_vbuz1(.*)", ".*z1.*z1.*z1.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "ldx {z1}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1(.*)_derefidx_vbuz1(.*)", ".*z1.*z1.*z1.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "ldy {z1}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz2(.*)_derefidx_vbuz2(.*)", ".*z2.*z2.*z2.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "ldx {z2}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz2(.*)_derefidx_vbuz2(.*)", ".*z2.*z2.*z2.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "ldy {z2}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*c1.*)", ".*z1.*z1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*z1.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapC));
+
+      // Convert X/Y-based array indexing of a constant pointer into A-register by prefixing lda cn,x / lda cn,y ( ...pb.c1_derefidx_vbuxx... / ...pb.c1_derefidx_vbuyy... -> ...vb.aa... )
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuxx(.*)", ".*=.*aa.*|.*c1.*c1.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, mapC));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*c1.*)pb(.)c1_derefidx_vbuxx(.*)", ".*=.*aa.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuxx(.*c1.*)", ".*=.*aa.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuyy(.*)", ".*=.*aa.*|.*c1.*c1.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, mapC));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*c1.*)pb(.)c1_derefidx_vbuyy(.*)", ".*=.*aa.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuyy(.*c1.*)", ".*=.*aa.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuxx(.*)", ".*=.*aa.*|.*c2.*c2.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, mapC3));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*c2.*)pb(.)c2_derefidx_vbuxx(.*)", ".*=.*aa.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuxx(.*c2.*)", ".*=.*aa.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuyy(.*)", ".*=.*aa.*|.*c2.*c2.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, mapC3));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*c2.*)pb(.)c2_derefidx_vbuyy(.*)", ".*=.*aa.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuyy(.*c2.*)", ".*=.*aa.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, null));
+
+      // Convert zeropage/constants/X/Y in assignments to A-register using LDA/TXA/TYA prefix
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz1(.*)", ".*z1.*=.*|.*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2vbuaa$3", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz1(.*)", ".*z1.*=.*|.*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2vbsaa$3", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz2(.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbuaa$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz2(.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbsaa$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz2(.*z3.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbuaa$3", null, mapZ3));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz2(.*z3.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbsaa$3", null, mapZ3));
+
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuxx", ".*=.*[ax][ax].*xx|.*derefidx_vb.xx", "txa\n", "$1=$2_vbuaa", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsxx", ".*=.*[ax][ax].*xx|.*derefidx_vb.xx", "txa\n", "$1=$2_vbsaa", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuyy", ".*=.*[ay][ay].*yy|.*derefidx_vb.yy", "tya\n", "$1=$2_vbuaa", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsyy", ".*=-*[ay][ay].*yy|.*derefidx_vb.yy", "tya\n", "$1=$2_vbsaa", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz1", ".*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2_vbuaa", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsz1", ".*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2_vbsaa", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz2", ".*=.*aa.*|.*z2.*z2.*", "lda {z2}\n", "$1=$2_vbuaa", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz3", ".*=.*aa.*|.*z3.*z3.*", "lda {z3}\n", "$1=$2_vbuaa", null, null));
+
+      synths.add(new AsmFragmentSynthesis("vbuz1=vbuz1(.*)", ".*=.*vb.aa.*|.*z1.*z1.*z1.*", "lda {z1}\n", "vbuaa=vbuaa$1", "sta {z1}\n", mapZ));
+      synths.add(new AsmFragmentSynthesis("vbsz1=vbsz1(.*)", ".*=.*vb.aa.*|.*z1.*z1.*z1.*", "lda {z1}\n", "vbsaa=vbsaa$1", "sta {z1}\n", mapZ));
+
+      synths.add(new AsmFragmentSynthesis("vbuz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*z1.*z1.*", "lda {z1}\n", "vbuaa_$1_$2", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("vbsz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*z1.*z1.*", "lda {z1}\n", "vbsaa_$1_$2", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {c1}\n", "vb$1aa_$2_$3", null, mapC));
+      synths.add(new AsmFragmentSynthesis("_deref_pb(.)z1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*vb.yy.*|.*z1.*z1.*", "ldy #0\n" + "lda ({z1}),y\n", "vb$1aa_$2_$3", null, mapZ));
+
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1_(.*)", ".*z1.*z1.*|.*.yy.*", "ldy {z1}\n", "$1_derefidx_vbuyy_$2", null, mapZ));
+
+
+      synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*z1.*z1.*|.*vb.xx.*", "ldx {z1}\n", "$1_derefidx_vbuxx_$2_$3", null, mapZ));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy_(lt|gt|le|ge|eq|neq)_(.*)", ".*c1.*c1.*|.*aa.*", "lda {c1},y\n", "vb$1aa_$2_$3", null, mapC));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy_(lt|gt|le|ge|eq|neq)_(.*c1.*)", ".*aa.*", "lda {c1},y\n", "vb$1aa_$2_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx_(lt|gt|le|ge|eq|neq)_(.*)", ".*c1.*c1.*|.*aa.*", "lda {c1},x\n", "vb$1aa_$2_$3", null, mapC));
+      synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx_(lt|gt|le|ge|eq|neq)_(.*c1.*)", ".*aa.*", "lda {c1},x\n", "vb$1aa_$2_$3", null, null));
+
+      synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.aa)_then_(.*)", ".*vb.aa.*_ge.*", null, "$2_lt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_ge.*", null, "$2_lt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_ge.*", null, "$2_lt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.aa)_then_(.*)", ".*vb.aa.*_lt.*", null, "$2_ge_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_lt.*", null, "$2_ge_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_lt.*", null, "$2_ge_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.aa)_then_(.*)", ".*vb.aa.*_gt.*", null, "$2_le_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_gt.*", null, "$2_le_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_gt.*", null, "$2_le_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.aa)_then_(.*)", ".*vb.aa.*_le.*", null, "$2_gt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_le.*", null, "$2_gt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_le.*", null, "$2_gt_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.aa)_then_(.*)", ".*vb.aa.*_neq.*", null, "$2_neq_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_neq.*", null, "$2_neq_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_neq.*", null, "$2_neq_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.aa)_then_(.*)", ".*vb.aa.*_eq.*", null, "$2_eq_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
+
+      // Use unsigned ASM to synthesize signed ASM ( ...vbs... -> ...vbu... )
+      synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_(eq|neq)_(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_then_(.*)", null, null, "$1_$2_$3_then_$4", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_(plus|band|bxor|bor)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2_$3_$4", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=_(inc|dec)_(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)", null, null, "$1=_$2_$3", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vwsz.|vwsc.)_(eq|neq)_(vwsz.|vwsc.)_then_(.*)", null, null, "$1_$2_$3_then_$4", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsz.|vwsc.)", null, null, "$1=$2", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(v.sz.)=(v.s..)_(band|bxor|bor)_(v.s..)", null, null, "$1=$2_$3_$4", null, mapSToU));
+      synths.add(new AsmFragmentSynthesis("(vbuz.|vbuaa|vbuxx|vbuyy)=_(lo|hi)_vws(z.|c.)", null, null, "$1=_$2_vwu$3", null, mapSToU));
+
+      // Use constant word ASM to synthesize unsigned constant byte ASM ( ...vb.c... -> vw.c... )
+      synths.add(new AsmFragmentSynthesis("(vwuz.)=(vwuz.)_(plus|minus|band|bxor|bor)_vb.c(.)", null, null, "$1=$2_$3_vwuc$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(vwuz.)=vb.c(.)_(plus|minus|band|bxor|bor)_(vwuz.)", null, null, "$1=vwuc$2_$3_$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsz.)_(plus|minus|band|bxor|bor)_vb.c(.)", null, null, "$1=$2_$3_vwsc$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(vwsz.)=vb.c(.)_(plus|minus|band|bxor|bor)_(vwsz.)", null, null, "$1=vwsc$2_$3_$4", null, null));
+
+      // Move constant words to the end of the ASM signature for symmetric operators ( ...vw.c...vw.z... -> ...vw.z...vw.c... )
+      synths.add(new AsmFragmentSynthesis("(vwuz.)=(vwuc.)_(plus|band|bxor|bor)_(vwuz.)", null, null, "$1=$4_$3_$2", null, null));
+      synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsc.)_(plus|band|bxor|bor)_(vwsz.)", null, null, "$1=$4_$3_$2", null, null));
+
+      // Use Z1/Z2 ASM to synthesize Z1-only code ( ...z1...z1... -> ...z1...z2... )
+      synths.add(new AsmFragmentSynthesis("(v..)z1=(v..)z1_(plus|minus|band|bxor|bor)_(.*)", ".*z2.*", null, "$1z1=$2z2_$3_$4", null, mapZ, false));
+      synths.add(new AsmFragmentSynthesis("(v..)z1=(.*)_(plus|minus|band|bxor|bor)_(v..)z1", ".*z2.*", null, "$1z1=$2_$3_$4z2", null, mapZ, false));
+      synths.add(new AsmFragmentSynthesis("(v..)z1=_(neg|lo|hi)_(v..)z1", ".*z2.*", null, "$1z1=_$2_$3z2", null, mapZ, false));
+
+      // Convert INC/DEC to +1/-1 ( ..._inc_xxx... -> ...xxx_plus_1_... / ..._dec_xxx... -> ...xxx_minus_1_... )
+      synths.add(new AsmFragmentSynthesis("vb(.)aa=_inc_(.*)", null, null, "vb$1aa=$2_plus_1", null, null));
+      synths.add(new AsmFragmentSynthesis("vb(.)aa=_dec_(.*)", null, null, "vb$1aa=$2_minus_1", null, null));
+
+      // Synthesize XX/YY using AA
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuxx(.*)", ".*=.*aa.*|.*derefidx_vb.xx.*", "txa\n", "$1=$2vbuaa$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsxx(.*)", ".*=.*aa.*|.*derefidx_vb.xx.*", "txa\n", "$1=$2vbsaa$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuyy(.*)", ".*=.*aa.*|.*derefidx_vb.yy.*", "tya\n", "$1=$2vbuaa$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsyy(.*)", ".*=.*aa.*|.*derefidx_vb.yy.*", "tya\n", "$1=$2vbsaa$3", null, null));
+      // Synthesize constants using AA
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuc1(.*)", ".*=.*aa.*|.*c1.*c1.*|.*c1_deref.*", "lda #{c1}\n", "$1=$2vbuaa$3", null, mapC));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsc1(.*)", ".*=.*aa.*|.*c1.*c1.*|.*c1_deref.*", "lda #{c1}\n", "$1=$2vbsaa$3", null, mapC));
+
+      // Synthesize some constant pointers as constant words
+      synths.add(new AsmFragmentSynthesis("(.*)_(lt|gt|le|ge|eq|neq)_p..([cz].)_then_(.*)", null, null, "$1_$2_vwu$3_then_$4", null, null));
+      synths.add(new AsmFragmentSynthesis("p..([cz].)_(lt|gt|le|ge|eq|neq)_(.*)", null, null, "vwu$1_$2_$3", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=p..([zc].)", null, null, "$1=vwu$2", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(plus|minus|bor|bxor)_p..([cz].)", null, null, "$1=$2_$3_vwu$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=p..([cz].)_(plus|minus|bor|bxor)_(.*)", null, null, "$1=vwu$2_$3_$4", null, null));
+      synths.add(new AsmFragmentSynthesis("p..([cz].)=(.*)_(sethi|setlo|plus|minus)_(.*)", null, null, "vwu$1=$2_$3_$4", null, null));
+      synths.add(new AsmFragmentSynthesis("(.*)=p..([cz].)_(sethi|setlo|plus|minus)_(.*)", null, null, "$1=vwu$2_$3_$4", null, null));
+
+      return synths;
+   }
+
+   /**
+    * The synthesis path describes the different signatures being attempted to synthesize a fragment.
+    * Used to avoid infinite loops during synthesis.
+    */
+   static class AsmSynthesisPath {
+
+      private ArrayDeque<String> signatures;
+
+      public AsmSynthesisPath() {
+         this.signatures = new ArrayDeque<>();
+      }
+
+      private AsmSynthesisPath(ArrayDeque<String> signatures) {
+         this.signatures = signatures;
+      }
+
+      AsmSynthesisPath add(String signature) {
+         ArrayDeque<String> signatures = new ArrayDeque<>(this.signatures);
+         signatures.add(signature);
+         return new AsmSynthesisPath(signatures);
+      }
+
+      boolean has(String signature) {
+         return signatures.contains(signature);
+      }
+
+      @Override
+      public String toString() {
+         StringBuilder str = new StringBuilder();
+         boolean first = true;
+         for(String signature : signatures) {
+            if(first) {
+               first = false;
+            } else {
+               str.append(" < ");
             }
-            bestFragmentCache.put(signature.getSignature(), bestTemplate);
-        }
-        // Count usages
-        AsmFragmentUsages.incUsage(bestTemplate);
-        // Return the resulting fragment instance
-        return new AsmFragment(
-                signature.getProgram(),
-                signature.getSignature(),
-                signature.getCodeScope(),
-                bestTemplate,
-                signature.getBindings());
-    }
+            str.append(signature);
+         }
+         return str.toString();
+      }
+   }
 
+   /**
+    * Capable of creating fragments from signatures by loading them or synthesizing them from other smaller fragments.
+    * <p>
+    * The synthesizer tries a lot of different combinations and keeps track of what has already been attempted.
+    */
+   static class AsmFragmentTemplateSynthesizer {
 
-    /**
-     * The synthesis path describes the different signatures being attempted to synthesize a fragment.
-     * Used to avoid infinite loops during synthesis.
-     */
-    static class AsmSynthesisPath {
+      /** Signature of the fragment being synthesized. */
+      private String creating;
 
-        private ArrayDeque<String> signatures;
+      /** The log. */
+      private CompileLog log;
 
-        public AsmSynthesisPath() {
-            this.signatures = new ArrayDeque<>();
-        }
+      AsmFragmentTemplateSynthesizer(String creating, CompileLog log) {
+         this.creating = creating;
+         this.log = log;
+      }
 
-        private AsmSynthesisPath(ArrayDeque<String> signatures) {
-            this.signatures = signatures;
-        }
-
-        AsmSynthesisPath add(String signature) {
-            ArrayDeque<String> signatures = new ArrayDeque<>(this.signatures);
-            signatures.add(signature);
-            return new AsmSynthesisPath(signatures);
-        }
-
-        boolean has(String signature) {
-            return signatures.contains(signature);
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder str = new StringBuilder();
-            boolean first = true;
-            for (String signature : signatures) {
-                if (first) {
-                    first = false;
-                } else {
-                    str.append(" < ");
-                }
-                str.append(signature);
+      List<AsmFragmentTemplate> loadOrSynthesizeFragment(String signature, AsmSynthesisPath path) {
+         if(path.has(signature)) {
+            // Synthesis loop - stop it here
+            if(log.isVerboseFragmentLog()) {
+               log.append("Finding fragment " + path.toString() + " - Stopping synthesis loop at " + signature);
             }
-            return str.toString();
-        }
-    }
-
-    /**
-     * Capable of creating fragments from signatures by loading them or synthesizing them from other smaller fragments.
-     * <p>
-     * The synthesizer tries a lot of different combinations and keeps track of what has already been attempted.
-     */
-    static class AsmFragmentTemplateSynthesizer {
-
-        /** Signature of the fragment being synthesized. */
-        private String creating;
-
-        /** The log. */
-        private CompileLog log;
-
-        AsmFragmentTemplateSynthesizer(String creating, CompileLog log) {
-            this.creating = creating;
-            this.log = log;
-        }
-
-        List<AsmFragmentTemplate> loadOrSynthesizeFragment(String signature, AsmSynthesisPath path) {
-            if (path.has(signature)) {
-                // Synthesis loop - stop it here
-                if (log.isVerboseFragmentLog()) {
-                    log.append("Finding fragment " + path.toString() + " - Stopping synthesis loop at " + signature);
-                }
-                return new ArrayList<>();
+            return new ArrayList<>();
+         }
+         // Add the current signature to the path
+         path = path.add(signature);
+         if(fragmentTemplateCache.get(signature) != null) {
+            if(log.isVerboseFragmentLog()) {
+               log.append("Finding fragment " + path.toString() + " - Using cached " + signature);
             }
-            // Add the current signature to the path
-            path = path.add(signature);
-            if (fragmentTemplateCache.get(signature) != null) {
-                if (log.isVerboseFragmentLog()) {
-                    log.append("Finding fragment " + path.toString() + " - Using cached " + signature);
-                }
-                return fragmentTemplateCache.get(signature);
+            return fragmentTemplateCache.get(signature);
+         }
+         if(log.isVerboseFragmentLog()) {
+            log.append("Finding fragment " + path.toString() + " - Attempting  " + signature);
+         }
+         List<AsmFragmentTemplate> candidates = new ArrayList<>();
+         // Synthesize the fragment from other fragments
+         List<AsmFragmentSynthesis> synths = getFragmentSyntheses();
+         for(AsmFragmentSynthesis synth : synths) {
+            List<AsmFragmentTemplate> synthesized = synth.synthesize(signature, path, this);
+            if(synthesized != null) {
+               if(log.isVerboseFragmentLog() && synthesized.size() > 0) {
+                  log.append("Finding fragment " + path.toString() + " - Successfully synthesized " + synthesized.size() + " fragments ");
+               }
+               candidates.addAll(synthesized);
             }
-            if (log.isVerboseFragmentLog()) {
-                log.append("Finding fragment " + path.toString() + " - Attempting  " + signature);
+         }
+         // Load the fragment from disk
+         CharStream fragmentCharStream = loadFragment(signature);
+         if(fragmentCharStream != null) {
+            try {
+               String body = fragmentCharStream.toString();
+               candidates.add(new AsmFragmentTemplate(signature, body));
+
+            } catch(StringIndexOutOfBoundsException e) {
+               throw new RuntimeException("Problem reading fragment file " + signature, e);
             }
-            List<AsmFragmentTemplate> candidates = new ArrayList<>();
-            // Synthesize the fragment from other fragments
-            List<AsmFragmentSynthesis> synths = getFragmentSyntheses();
-            for (AsmFragmentSynthesis synth : synths) {
-                List<AsmFragmentTemplate> synthesized = synth.synthesize(signature, path, this);
-                if (synthesized != null) {
-                    if (log.isVerboseFragmentLog() && synthesized.size() > 0) {
-                        log.append("Finding fragment " + path.toString() + " - Successfully synthesized " + synthesized.size() + " fragments ");
-                    }
-                    candidates.addAll(synthesized);
-                }
+            if(log.isVerboseFragmentLog()) {
+               log.append("Finding fragment " + path.toString() + " - Successfully loaded " + signature + ".asm");
             }
-            // Load the fragment from disk
-            CharStream fragmentCharStream = loadFragment(signature);
-            if (fragmentCharStream != null) {
-                try {
-                    String body = fragmentCharStream.toString();
-                    candidates.add(new AsmFragmentTemplate(signature, body));
-
-                } catch (StringIndexOutOfBoundsException e) {
-                    throw new RuntimeException("Problem reading fragment file " + signature, e);
-                }
-                if (log.isVerboseFragmentLog()) {
-                    log.append("Finding fragment " + path.toString() + " - Successfully loaded " + signature + ".asm");
-                }
+         }
+         if(candidates.size() == 0) {
+            if(log.isVerboseFragmentLog()) {
+               log.append("Finding fragment " + path.toString() + " - No synthesis/file found!");
             }
-            if (candidates.size() == 0) {
-                if(log.isVerboseFragmentLog()) {
-                    log.append("Finding fragment " + path.toString() + " - No synthesis/file found!");
-                }
-            }
-            fragmentTemplateCache.put(signature, candidates);
-            return candidates;
-        }
+         }
+         fragmentTemplateCache.put(signature, candidates);
+         return candidates;
+      }
 
-        public String getCreating() {
-            return creating;
-        }
+      public String getCreating() {
+         return creating;
+      }
 
-        public CompileLog getLog() {
-            return log;
-        }
-    }
+      public CompileLog getLog() {
+         return log;
+      }
+   }
 
+   public static class UnknownFragmentException extends RuntimeException {
 
-    /**
-     * Look for a fragment on the disk.
-     *
-     * @param signature The fragment signature
-     * @return The fragment file contents. Null if the fragment is not on the disk.
-     */
-    private static CharStream loadFragment(String signature) {
-        ClassLoader classLoader = AsmFragmentManager.class.getClassLoader();
-        URL fragmentUrl = classLoader.getResource("dk/camelot64/kickc/fragment/asm/" + signature + ".asm");
-        if (fragmentUrl == null) {
-            return null;
-        }
-        try {
-            InputStream fragmentStream = fragmentUrl.openStream();
-            return CharStreams.fromStream(fragmentStream);
-        } catch (IOException e) {
-            throw new RuntimeException("Error loading fragment file " + fragmentUrl);
-        }
-    }
+      private String fragmentSignature;
 
+      UnknownFragmentException(String signature) {
+         super("Fragment not found " + signature + ".asm");
+         this.fragmentSignature = signature;
+      }
 
-    static File[] allFragmentFiles() {
-        ClassLoader classLoader = AsmFragmentManager.class.getClassLoader();
-        String path = classLoader.getResource("dk/camelot64/kickc/fragment/asm/").getPath();
-        return new File(path).listFiles((dir, name) -> name.endsWith(".asm"));
-
-    }
-
-    public static class UnknownFragmentException extends RuntimeException {
-
-        private String fragmentSignature;
-
-        UnknownFragmentException(String signature) {
-            super("Fragment not found " + signature + ".asm");
-            this.fragmentSignature = signature;
-        }
-
-        public String getFragmentSignature() {
-            return fragmentSignature;
-        }
-    }
-
-    /**
-     * All the synthesize rules available.
-     */
-    private static List<AsmFragmentSynthesis> fragmentSyntheses;
-
-    private static List<AsmFragmentSynthesis> getFragmentSyntheses() {
-        if (fragmentSyntheses == null) {
-            fragmentSyntheses = initFragmentSyntheses();
-        }
-        return fragmentSyntheses;
-    }
-
-    private static List<AsmFragmentSynthesis> initFragmentSyntheses() {
-        Map<String, String> mapZ = new LinkedHashMap<>();
-        mapZ.put("z2", "z1");
-        mapZ.put("z3", "z2");
-        Map<String, String> mapZ2 = new LinkedHashMap<>();
-        mapZ2.put("z3", "z1");
-        Map<String, String> mapZ3 = new LinkedHashMap<>();
-        mapZ3.put("z3", "z2");
-        Map<String, String> mapC = new LinkedHashMap<>();
-        mapC.put("c2", "c1");
-        mapC.put("c3", "c2");
-        Map<String, String> mapC3 = new LinkedHashMap<>();
-        mapC3.put("c3", "c2");
-        Map<String, String> mapZC = new LinkedHashMap<>();
-        mapZC.putAll(mapZ);
-        mapZC.putAll(mapC);
-        Map<String, String> mapSToU = new LinkedHashMap<>();
-        mapSToU.put("vbsz1", "vbuz1");
-        mapSToU.put("vbsz2", "vbuz2");
-        mapSToU.put("vbsz3", "vbuz3");
-        mapSToU.put("vbsc1", "vbuc1");
-        mapSToU.put("vbsc2", "vbuc2");
-        mapSToU.put("vbsc3", "vbuc3");
-        mapSToU.put("vbsaa", "vbuaa");
-        mapSToU.put("vbsxx", "vbuxx");
-        mapSToU.put("vbsyy", "vbuyy");
-        mapSToU.put("vwsz1", "vwuz1");
-        mapSToU.put("vwsz2", "vwuz2");
-        mapSToU.put("vwsz3", "vwuz3");
-        mapSToU.put("vwsc1", "vwuc1");
-        mapSToU.put("vwsc2", "vwuc2");
-        mapSToU.put("vwsc3", "vwuc3");
-
-        List<AsmFragmentSynthesis> synths = new ArrayList<>();
-
-        // NEW STYLE REWRITES - Utilizes that all combinations are tried
-
-        // Replace first AA with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1xx$2", null, null));
-        // Replace two AAs with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1xx$2xx$3", null, null));
-        // Replace second (not first) AA with XX
-        synths.add(new AsmFragmentSynthesis("(.*)aa(.*vb.)aa(.*)", "...aa=.*|.*xx.*", "tax", "$1aa$2xx$3", null, null));
-
-        // Replace first AA with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1yy$2", null, null));
-        // Replace two AAs with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)aa(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1yy$2yy$3", null, null));
-        // Replace second (not first) AA with YY
-        synths.add(new AsmFragmentSynthesis("(.*)aa(.*vb.)aa(.*)", "...aa=.*|.*yy.*", "tay", "$1aa$2yy$3", null, null));
-
-        // Replace first XX with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1aa$2", null, null));
-        // Replace two XXs with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)xx(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1aa$2aa$3", null, null));
-        // Replace second (not first) XX with AA
-        synths.add(new AsmFragmentSynthesis("(.*)xx(.*vb.)xx(.*)", "...xx=.*|.*aa.*", "txa", "$1xx$2aa$3", null, null));
-
-        // Replace first YY with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1aa$2", null, null));
-        // Replace two YYs with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)yy(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1aa$2aa$3", null, null));
-        // Replace second (not first) YY with AA
-        synths.add(new AsmFragmentSynthesis("(.*)yy(.*vb.)yy(.*)", "...yy=.*|.*aa.*", "tya", "$1yy$2aa$3", null, null));
-
-        // Replace Z1 with AA (only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*aa.*", "lda {z1}", "$1aa$2", null, mapZ));
-        // Replace two Z1s with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*aa.*", "lda {z1}", "$1aa$2aa$3", null, mapZ));
-        // Replace first (not second) Z1 with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*aa.*", "lda {z1}", "$1aa$2z1$3", null, null));
-        // Replace second (not first) Z1 with AA
-        synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*aa.*", "lda {z1}", "$1z1$2aa$3", null, null));
-
-        // Replace Z1 with YY (only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*yy.*", "ldy {z1}", "$1yy$2", null, mapZ));
-        // Replace two Z1s with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*yy.*", "ldy {z1}", "$1yy$2yy$3", null, mapZ));
-        // Replace first (not second) Z1 with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*yy.*", "ldy {z1}", "$1yy$2z1$3", null, null));
-        // Replace second (not first) Z1 with YY
-        synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*yy.*", "ldy {z1}", "$1z1$2yy$3", null, null));
-
-        // Replace Z1 with XX (only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*|.*xx.*", "ldx {z1}", "$1xx$2", null, mapZ));
-        // Replace two Z1s with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*vb.)z1(.*)", "...z1=.*|.*z1.*z1.*z1.*|.*xx.*", "ldx {z1}", "$1xx$2xx$3", null, mapZ));
-        // Replace first (not second) Z1 with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z1(.*)z1(.*)", "...z1=.*|.*xx.*", "ldx {z1}", "$1xx$2z1$3", null, null));
-        // Replace second (not first) Z1 with XX
-        synths.add(new AsmFragmentSynthesis("(.*)z1(.*vb.)z1(.*)", "...z1=.*|.*xx.*", "ldx {z1}", "$1z1$2xx$3", null, null));
-
-        // Replace Z2 with AA (only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*aa.*", "lda {z2}", "$1aa$2", null, mapZ3));
-        // Replace two Z2s with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*aa.*", "lda {z2}", "$1aa$2aa$3", null, mapZ3));
-        // Replace first (of 2) Z2 with AA
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*aa.*", "lda {z2}", "$1aa$2z2$3", null, null));
-        // Replace second (of 2) Z2 with AA
-        synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*aa.*", "lda {z2}", "$1z2$2aa$3", null, null));
-
-        // Replace Z2 with YY (only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*yy.*", "ldy {z2}", "$1yy$2", null, mapZ3));
-        // Replace two Z2s with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*yy.*", "ldy {z2}", "$1yy$2yy$3", null, mapZ3));
-        // Replace first (of 2) Z2 with YY
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*yy.*", "ldy {z2}", "$1yy$2z2$3", null, null));
-        // Replace second (of 2) Z2 with YY
-        synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*yy.*", "ldy {z2}", "$1z2$2yy$3", null, null));
-
-        // Replace Z2 with XX(only one)
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*|.*xx.*", "ldx {z2}", "$1xx$2", null, mapZ3));
-        // Replace two Z2s with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*vb.)z2(.*)", "...z2=.*|.*z2.*z2.*z2.*|.*xx.*", "ldx {z2}", "$1xx$2xx$3", null, mapZ3));
-        // Replace first (of 2) Z2 with XX
-        synths.add(new AsmFragmentSynthesis("(.*vb.)z2(.*)z2(.*)", "...z2=.*|.*xx.*", "ldx {z2}", "$1xx$2z2$3", null, null));
-        // Replace second (of 2) Z2 with XX
-        synths.add(new AsmFragmentSynthesis("(.*)z2(.*vb.)z2(.*)", "...z2=.*|.*xx.*", "ldx {z2}", "$1z2$2xx$3", null, null));
-
-
-        // OLD STYLE REWRITES - written when only one rule could be taken
-
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.aa)", ".*=vb.aa_.*", null, "$1=$4_$3_$2", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.xx)", ".*=vb.[ax][ax]_.*", null, "$1=$4_$3_$2", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(vb.yy)", ".*=vb.[axy][axy]_.*", null, "$1=$4_$3_$2", null, null));
-
-        synths.add(new AsmFragmentSynthesis("vbuxx=(.*)", null, null, "vbuaa=$1", "tax\n", null));
-        synths.add(new AsmFragmentSynthesis("vbsxx=(.*)", null, null, "vbsaa=$1", "tax\n", null));
-        synths.add(new AsmFragmentSynthesis("vbuyy=(.*)", null, null, "vbuaa=$1", "tay\n", null));
-        synths.add(new AsmFragmentSynthesis("vbsyy=(.*)", null, null, "vbsaa=$1", "tay\n", null));
-        synths.add(new AsmFragmentSynthesis("vbuz1=(.*)", ".*=.*vb.z1.*", null, "vbuaa=$1", "sta {z1}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("vbsz1=(.*)", ".*=.*vb.z1.*", null, "vbsaa=$1", "sta {z1}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1}\n", mapC));
-        synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1=(.*c1.*)", null, null, "vb$1aa=$2", "sta {c1}\n", null));
-        synths.add(new AsmFragmentSynthesis("_deref_pbuz1=(.*)", ".*z1.*z1.*", null, "vbuaa=$1", "ldy #0\n" + "sta ({z1}),y\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("_deref_pbuz1=(.*z1.*)", null, null, "vbuaa=$1", "ldy #0\n" + "sta ({z1}),y\n", null));
-
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*)", ".*z1.*z1.*|.*c1.*c1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapZC));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1},y\n", mapC));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx=(.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "sta {c1},x\n", mapC));
-        synths.add(new AsmFragmentSynthesis("pb(.)z1_derefidx_vbuz2=(.*)", ".*z1.*z1.*|.*z2.*z2.*", null, "vb$1aa=$2", "ldy {z2}\n" + "sta ({z1}),y\n", mapZ2));
-
-        synths.add(new AsmFragmentSynthesis("(.*)=_deref_pb(.)c1(.*)", ".*=.*aa.*", "lda {c1}\n", "$1=vb$2aa$3", null, mapC));
-        synths.add(new AsmFragmentSynthesis("(.*)=_deref_pb(.)z1(.*)", ".*z1.*z1.*|.*=.*aa.*|.*=.*yy.*", "ldy #0\n" + "lda ({z1}),y\n", "$1=vb$2aa$3", null, mapZ));
-
-        // Convert array indexing with A register to X/Y register by prefixing tax/tay (..._derefidx_vbuaa... -> ..._derefidx_vbuxx... /... _derefidx_vbuyy... )
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuaa(.*)", ".*=.*xx.*", "tax\n", "$1=$2_derefidx_vbuxx$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuaa(.*)", ".*=.*yy.*", "tay\n", "$1=$2_derefidx_vbuyy$3", null, null));
-        // Convert array indexing with zero page to x/y register by prefixing ldx z1 / ldy z1 ( ..._derefidx_vbuzn... -> ..._derefidx_vbuxx... / ..._derefidx_vbuyy... )
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz1(.*)", ".*=.*xx.*|.*z1.*z1.*", "ldx {z1}\n", "$1=$2_derefidx_vbuxx$3", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz1(.*)", ".*=.*yy.*|.*z1.*z1.*", "ldy {z1}\n", "$1=$2_derefidx_vbuyy$3", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz2(.*)", ".*=.*xx.*|.*z2.*z2.*", "ldx {z2}\n", "$1=$2_derefidx_vbuxx$3", null, mapZ3));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz2(.*)", ".*=.*yy.*|.*z2.*z2.*", "ldy {z2}\n", "$1=$2_derefidx_vbuyy$3", null, mapZ3));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz3(.*)", ".*=.*yy.*", "ldy {z3}\n", "$1=$2_derefidx_vbuyy$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_derefidx_vbuz3(.*)", ".*=.*xx.*", "ldx {z3}\n", "$1=$2_derefidx_vbuxx$3", null, null));
-        // Convert array indexing twice with A/zp1/zp2 to X/Y register with a ldx/ldy prefix ( ..._derefidx_vbunn..._derefidx_vbunn... -> ..._derefidx_vbuxx..._derefidx_vbuxx... )
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuaa(.*)_derefidx_vbuaa(.*)", ".*aa.*aa.*aa.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "tax\n", null));
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuaa(.*)_derefidx_vbuaa(.*)", ".*aa.*aa.*aa.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "tay\n", null));
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1(.*)_derefidx_vbuz1(.*)", ".*z1.*z1.*z1.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "ldx {z1}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1(.*)_derefidx_vbuz1(.*)", ".*z1.*z1.*z1.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "ldy {z1}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz2(.*)_derefidx_vbuz2(.*)", ".*z2.*z2.*z2.*|.*xx.*", null, "$1_derefidx_vbuxx$2_derefidx_vbuxx$3", "ldx {z2}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz2(.*)_derefidx_vbuz2(.*)", ".*z2.*z2.*z2.*|.*yy.*", null, "$1_derefidx_vbuyy$2_derefidx_vbuyy$3", "ldy {z2}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*c1.*)", ".*z1.*z1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuz1=(.*z1.*)", ".*c1.*c1.*", null, "vb$1aa=$2", "ldx {z1}\n" + "sta {c1},x\n", mapC));
-
-        // Convert X/Y-based array indexing of a constant pointer into A-register by prefixing lda cn,x / lda cn,y ( ...pb.c1_derefidx_vbuxx... / ...pb.c1_derefidx_vbuyy... -> ...vb.aa... )
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuxx(.*)", ".*=.*aa.*|.*c1.*c1.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, mapC));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*c1.*)pb(.)c1_derefidx_vbuxx(.*)", ".*=.*aa.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuxx(.*c1.*)", ".*=.*aa.*", "lda {c1},x\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuyy(.*)", ".*=.*aa.*|.*c1.*c1.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, mapC));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*c1.*)pb(.)c1_derefidx_vbuyy(.*)", ".*=.*aa.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c1_derefidx_vbuyy(.*c1.*)", ".*=.*aa.*", "lda {c1},y\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuxx(.*)", ".*=.*aa.*|.*c2.*c2.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, mapC3));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*c2.*)pb(.)c2_derefidx_vbuxx(.*)", ".*=.*aa.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuxx(.*c2.*)", ".*=.*aa.*", "lda {c2},x\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuyy(.*)", ".*=.*aa.*|.*c2.*c2.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, mapC3));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*c2.*)pb(.)c2_derefidx_vbuyy(.*)", ".*=.*aa.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)pb(.)c2_derefidx_vbuyy(.*c2.*)", ".*=.*aa.*", "lda {c2},y\n", "$1=$2vb$3aa$4", null, null));
-
-        // Convert zeropage/constants/X/Y in assignments to A-register using LDA/TXA/TYA prefix
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz1(.*)", ".*z1.*=.*|.*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2vbuaa$3", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz1(.*)", ".*z1.*=.*|.*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2vbsaa$3", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz2(.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbuaa$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz2(.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbsaa$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuz2(.*z3.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbuaa$3", null, mapZ3));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsz2(.*z3.*)", ".*z2.*=.*|.*=.*aa.*|.*z2.*z2.*|.*z3.*", "lda {z2}\n", "$1=$2vbsaa$3", null, mapZ3));
-
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuxx", ".*=.*[ax][ax].*xx|.*derefidx_vb.xx", "txa\n", "$1=$2_vbuaa", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsxx", ".*=.*[ax][ax].*xx|.*derefidx_vb.xx", "txa\n", "$1=$2_vbsaa", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuyy", ".*=.*[ay][ay].*yy|.*derefidx_vb.yy", "tya\n", "$1=$2_vbuaa", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsyy", ".*=-*[ay][ay].*yy|.*derefidx_vb.yy", "tya\n", "$1=$2_vbsaa", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz1", ".*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2_vbuaa", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbsz1", ".*=.*aa.*|.*z1.*z1.*", "lda {z1}\n", "$1=$2_vbsaa", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz2", ".*=.*aa.*|.*z2.*z2.*", "lda {z2}\n", "$1=$2_vbuaa", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_vbuz3", ".*=.*aa.*|.*z3.*z3.*", "lda {z3}\n", "$1=$2_vbuaa", null, null));
-
-        synths.add(new AsmFragmentSynthesis("vbuz1=vbuz1(.*)", ".*=.*vb.aa.*|.*z1.*z1.*z1.*", "lda {z1}\n", "vbuaa=vbuaa$1", "sta {z1}\n", mapZ));
-        synths.add(new AsmFragmentSynthesis("vbsz1=vbsz1(.*)", ".*=.*vb.aa.*|.*z1.*z1.*z1.*", "lda {z1}\n", "vbsaa=vbsaa$1", "sta {z1}\n", mapZ));
-
-        synths.add(new AsmFragmentSynthesis("vbuz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*z1.*z1.*", "lda {z1}\n", "vbuaa_$1_$2", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("vbsz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*z1.*z1.*", "lda {z1}\n", "vbsaa_$1_$2", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("_deref_pb(.)c1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {c1}\n", "vb$1aa_$2_$3", null, mapC));
-        synths.add(new AsmFragmentSynthesis("_deref_pb(.)z1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*|.*vb.yy.*|.*z1.*z1.*", "ldy #0\n" + "lda ({z1}),y\n", "vb$1aa_$2_$3", null, mapZ));
-
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1_(.*)", ".*z1.*z1.*|.*.yy.*", "ldy {z1}\n", "$1_derefidx_vbuyy_$2", null, mapZ));
-
-
-        synths.add(new AsmFragmentSynthesis("(.*)_derefidx_vbuz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*z1.*z1.*|.*vb.xx.*", "ldx {z1}\n", "$1_derefidx_vbuxx_$2_$3", null, mapZ));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy_(lt|gt|le|ge|eq|neq)_(.*)", ".*c1.*c1.*|.*aa.*", "lda {c1},y\n", "vb$1aa_$2_$3", null, mapC));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuyy_(lt|gt|le|ge|eq|neq)_(.*c1.*)", ".*aa.*", "lda {c1},y\n", "vb$1aa_$2_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx_(lt|gt|le|ge|eq|neq)_(.*)", ".*c1.*c1.*|.*aa.*", "lda {c1},x\n", "vb$1aa_$2_$3", null, mapC));
-        synths.add(new AsmFragmentSynthesis("pb(.)c1_derefidx_vbuxx_(lt|gt|le|ge|eq|neq)_(.*c1.*)", ".*aa.*", "lda {c1},x\n", "vb$1aa_$2_$3", null, null));
-
-        synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.aa)_then_(.*)", ".*vb.aa.*_ge.*", null, "$2_lt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_ge.*", null, "$2_lt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_ge_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_ge.*", null, "$2_lt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.aa)_then_(.*)", ".*vb.aa.*_lt.*", null, "$2_ge_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_lt.*", null, "$2_ge_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_lt_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_lt.*", null, "$2_ge_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.aa)_then_(.*)", ".*vb.aa.*_gt.*", null, "$2_le_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_gt.*", null, "$2_le_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_gt_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_gt.*", null, "$2_le_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.aa)_then_(.*)", ".*vb.aa.*_le.*", null, "$2_gt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_le.*", null, "$2_gt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_le_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_le.*", null, "$2_gt_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.aa)_then_(.*)", ".*vb.aa.*_neq.*", null, "$2_neq_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_neq.*", null, "$2_neq_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_neq_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_neq.*", null, "$2_neq_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.aa)_then_(.*)", ".*vb.aa.*_eq.*", null, "$2_eq_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)_eq_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
-
-        // Use unsigned ASM to synthesize signed ASM ( ...vbs... -> ...vbu... )
-        synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_(eq|neq)_(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_then_(.*)", null, null, "$1_$2_$3_then_$4", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_(plus|band|bxor|bor)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2_$3_$4", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)=_(inc|dec)_(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)", null, null, "$1=_$2_$3", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vwsz.|vwsc.)_(eq|neq)_(vwsz.|vwsc.)_then_(.*)", null, null, "$1_$2_$3_then_$4", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsz.|vwsc.)", null, null, "$1=$2", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(v.sz.)=(v.s..)_(band|bxor|bor)_(v.s..)", null, null, "$1=$2_$3_$4", null, mapSToU));
-        synths.add(new AsmFragmentSynthesis("(vbuz.|vbuaa|vbuxx|vbuyy)=_(lo|hi)_vws(z.|c.)", null, null, "$1=_$2_vwu$3", null, mapSToU));
-
-        // Use constant word ASM to synthesize unsigned constant byte ASM ( ...vb.c... -> vw.c... )
-        synths.add(new AsmFragmentSynthesis("(vwuz.)=(vwuz.)_(plus|minus|band|bxor|bor)_vb.c(.)", null, null, "$1=$2_$3_vwuc$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(vwuz.)=vb.c(.)_(plus|minus|band|bxor|bor)_(vwuz.)", null, null, "$1=vwuc$2_$3_$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsz.)_(plus|minus|band|bxor|bor)_vb.c(.)", null, null, "$1=$2_$3_vwsc$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(vwsz.)=vb.c(.)_(plus|minus|band|bxor|bor)_(vwsz.)", null, null, "$1=vwsc$2_$3_$4", null, null));
-
-        // Move constant words to the end of the ASM signature for symmetric operators ( ...vw.c...vw.z... -> ...vw.z...vw.c... )
-        synths.add(new AsmFragmentSynthesis("(vwuz.)=(vwuc.)_(plus|band|bxor|bor)_(vwuz.)", null, null, "$1=$4_$3_$2", null, null));
-        synths.add(new AsmFragmentSynthesis("(vwsz.)=(vwsc.)_(plus|band|bxor|bor)_(vwsz.)", null, null, "$1=$4_$3_$2", null, null));
-
-        // Use Z1/Z2 ASM to synthesize Z1-only code ( ...z1...z1... -> ...z1...z2... )
-        synths.add(new AsmFragmentSynthesis("(v..)z1=(v..)z1_(plus|minus|band|bxor|bor)_(.*)", ".*z2.*", null, "$1z1=$2z2_$3_$4", null, mapZ, false));
-        synths.add(new AsmFragmentSynthesis("(v..)z1=(.*)_(plus|minus|band|bxor|bor)_(v..)z1", ".*z2.*", null, "$1z1=$2_$3_$4z2", null, mapZ, false));
-        synths.add(new AsmFragmentSynthesis("(v..)z1=_(neg|lo|hi)_(v..)z1", ".*z2.*", null, "$1z1=_$2_$3z2", null, mapZ, false));
-
-        // Convert INC/DEC to +1/-1 ( ..._inc_xxx... -> ...xxx_plus_1_... / ..._dec_xxx... -> ...xxx_minus_1_... )
-        synths.add(new AsmFragmentSynthesis("vb(.)aa=_inc_(.*)", null, null, "vb$1aa=$2_plus_1", null, null));
-        synths.add(new AsmFragmentSynthesis("vb(.)aa=_dec_(.*)", null, null, "vb$1aa=$2_minus_1", null, null));
-
-        // Synthesize XX/YY using AA
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuxx(.*)", ".*=.*aa.*|.*derefidx_vb.xx.*", "txa\n", "$1=$2vbuaa$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsxx(.*)", ".*=.*aa.*|.*derefidx_vb.xx.*", "txa\n", "$1=$2vbsaa$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuyy(.*)", ".*=.*aa.*|.*derefidx_vb.yy.*", "tya\n", "$1=$2vbuaa$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsyy(.*)", ".*=.*aa.*|.*derefidx_vb.yy.*", "tya\n", "$1=$2vbsaa$3", null, null));
-        // Synthesize constants using AA
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbuc1(.*)", ".*=.*aa.*|.*c1.*c1.*|.*c1_deref.*", "lda #{c1}\n", "$1=$2vbuaa$3", null, mapC));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)vbsc1(.*)", ".*=.*aa.*|.*c1.*c1.*|.*c1_deref.*", "lda #{c1}\n", "$1=$2vbsaa$3", null, mapC));
-
-        // Synthesize some constant pointers as constant words
-        synths.add(new AsmFragmentSynthesis("(.*)_(lt|gt|le|ge|eq|neq)_p..([cz].)_then_(.*)", null, null, "$1_$2_vwu$3_then_$4", null, null));
-        synths.add(new AsmFragmentSynthesis("p..([cz].)_(lt|gt|le|ge|eq|neq)_(.*)", null, null, "vwu$1_$2_$3", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=p..([zc].)", null, null, "$1=vwu$2", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=(.*)_(plus|minus|bor|bxor)_p..([cz].)", null, null, "$1=$2_$3_vwu$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=p..([cz].)_(plus|minus|bor|bxor)_(.*)", null, null, "$1=vwu$2_$3_$4", null, null));
-        synths.add(new AsmFragmentSynthesis("p..([cz].)=(.*)_(sethi|setlo|plus|minus)_(.*)", null, null, "vwu$1=$2_$3_$4", null, null));
-        synths.add(new AsmFragmentSynthesis("(.*)=p..([cz].)_(sethi|setlo|plus|minus)_(.*)", null, null, "$1=vwu$2_$3_$4", null, null));
-
-        return synths;
-    }
+      public String getFragmentSignature() {
+         return fragmentSignature;
+      }
+   }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSignature.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSignature.java
index ff27e55c5..35ee1722b 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSignature.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSignature.java
@@ -29,6 +29,13 @@ public class AsmFragmentSignature {
     * The scope containing the fragment. Used when referencing symbols defined in other scopes.
     */
    private ScopeRef codeScopeRef;
+   /**
+    * Zero page register name indexing.
+    */
+   private int nextZpByteIdx = 1;
+   private int nextZpBoolIdx = 1;
+   private int nextConstByteIdx = 1;
+   private int nextLabelIdx = 1;
 
    public AsmFragmentSignature(
          StatementConditionalJump conditionalJump,
@@ -67,25 +74,29 @@ public class AsmFragmentSignature {
       setSignature(assignmentWithAluSignature(assignment, assignmentAlu));
    }
 
+   private static String getOperatorFragmentName(Operator operator) {
+      return operator.getAsmOperator();
+   }
+
    private String assignmentWithAluSignature(StatementAssignment assignment, StatementAssignment assignmentAlu) {
       this.codeScopeRef = program.getStatementInfos().getBlock(assignment).getScope();
-      if (!(assignment.getrValue2() instanceof VariableRef)) {
+      if(!(assignment.getrValue2() instanceof VariableRef)) {
          throw new AsmFragment.AluNotApplicableException("Error! ALU register only allowed as rValue2. " + assignment);
       }
       VariableRef assignmentRValue2 = (VariableRef) assignment.getrValue2();
       Variable assignmentRValue2Var = program.getSymbolInfos().getVariable(assignmentRValue2);
       Registers.Register rVal2Register = assignmentRValue2Var.getAllocation();
 
-      if (!rVal2Register.getType().equals(Registers.RegisterType.REG_ALU)) {
+      if(!rVal2Register.getType().equals(Registers.RegisterType.REG_ALU)) {
          throw new AsmFragment.AluNotApplicableException("Error! ALU register only allowed as rValue2. " + assignment);
       }
       StringBuilder signature = new StringBuilder();
       signature.append(bind(assignment.getlValue()));
       signature.append("=");
-      if (assignment.getrValue1() != null) {
+      if(assignment.getrValue1() != null) {
          signature.append(bind(assignment.getrValue1()));
       }
-      if (assignment.getOperator() != null) {
+      if(assignment.getOperator() != null) {
          signature.append(getOperatorFragmentName(assignment.getOperator()));
       }
       signature.append(assignmentRightSideSignature(
@@ -105,25 +116,25 @@ public class AsmFragmentSignature {
 
    private String assignmentRightSideSignature(RValue rValue1, Operator operator, RValue rValue2) {
       StringBuilder signature = new StringBuilder();
-      if (rValue1 != null) {
+      if(rValue1 != null) {
          signature.append(bind(rValue1));
       }
-      if (operator != null) {
+      if(operator != null) {
          signature.append(getOperatorFragmentName(operator));
       }
-      if (
+      if(
             rValue2 instanceof ConstantInteger &&
                   ((ConstantInteger) rValue2).getNumber() == 1 &&
                   operator != null &&
                   (operator.getOperator().equals("-") || operator.getOperator().equals("+"))) {
          signature.append("1");
-      } else if (
+      } else if(
             rValue2 instanceof ConstantInteger &&
                   ((ConstantInteger) rValue2).getNumber() <= 7 &&
                   operator != null &&
                   (operator.getOperator().equals(">>") || operator.getOperator().equals("<<"))) {
          signature.append(((ConstantInteger) rValue2).getNumber());
-      } else if (
+      } else if(
             rValue2 instanceof ConstantInteger &&
                   ((ConstantInteger) rValue2).getNumber() == 0 &&
                   operator != null &&
@@ -140,15 +151,15 @@ public class AsmFragmentSignature {
          ControlFlowBlock block,
          ControlFlowGraph graph) {
       StringBuilder signature = new StringBuilder();
-      if (conditionalJump.getrValue1() != null) {
+      if(conditionalJump.getrValue1() != null) {
          signature.append(bind(conditionalJump.getrValue1()));
       }
-      if (conditionalJump.getOperator() != null) {
+      if(conditionalJump.getOperator() != null) {
          signature.append(getOperatorFragmentName(conditionalJump.getOperator()));
       }
-      if (conditionalJump.getrValue2() instanceof ConstantInteger && ((ConstantInteger) conditionalJump.getrValue2()).getNumber() == 0) {
+      if(conditionalJump.getrValue2() instanceof ConstantInteger && ((ConstantInteger) conditionalJump.getrValue2()).getNumber() == 0) {
          signature.append("0");
-      } else if (conditionalJump.getrValue2() instanceof ConstantBool) {
+      } else if(conditionalJump.getrValue2() instanceof ConstantBool) {
          ConstantBool boolValue = (ConstantBool) conditionalJump.getrValue2();
          signature.append(boolValue.toString());
       } else {
@@ -158,7 +169,7 @@ public class AsmFragmentSignature {
       LabelRef destination = conditionalJump.getDestination();
       ControlFlowBlock destinationBlock = graph.getBlock(destination);
       String destinationLabel;
-      if (destinationBlock.hasPhiBlock()) {
+      if(destinationBlock.hasPhiBlock()) {
          destinationLabel =
                (destinationBlock.getLabel().getLocalName() +
                      "_from_" +
@@ -171,10 +182,6 @@ public class AsmFragmentSignature {
       return signature.toString();
    }
 
-   private static String getOperatorFragmentName(Operator operator) {
-      return operator.getAsmOperator();
-   }
-
    public String getSignature() {
       return signature;
    }
@@ -183,14 +190,6 @@ public class AsmFragmentSignature {
       this.signature = signature;
    }
 
-   /**
-    * Zero page register name indexing.
-    */
-   private int nextZpByteIdx = 1;
-   private int nextZpBoolIdx = 1;
-   private int nextConstByteIdx = 1;
-   private int nextLabelIdx = 1;
-
    /**
     * Add bindings of a value.
     *
@@ -198,39 +197,39 @@ public class AsmFragmentSignature {
     * @return The bound name of the value. If the value has already been bound the existing bound name is returned.
     */
    public String bind(Value value) {
-      if (value instanceof PointerDereferenceSimple) {
+      if(value instanceof PointerDereferenceSimple) {
          PointerDereferenceSimple deref = (PointerDereferenceSimple) value;
          return "_deref_" + bind(deref.getPointer());
-      } else if (value instanceof PointerDereferenceIndexed) {
+      } else if(value instanceof PointerDereferenceIndexed) {
          PointerDereferenceIndexed deref = (PointerDereferenceIndexed) value;
          return bind(deref.getPointer()) + "_derefidx_" + bind(deref.getIndex());
       }
 
-      if (value instanceof VariableRef) {
+      if(value instanceof VariableRef) {
          value = program.getSymbolInfos().getVariable((VariableRef) value);
       }
-      if (value instanceof ConstantRef) {
+      if(value instanceof ConstantRef) {
          value = program.getScope().getConstant((ConstantRef) value);
       }
 
       // Find value if it is already bound
-      for (String name : bindings.keySet()) {
+      for(String name : bindings.keySet()) {
          Value bound = bindings.get(name);
-         if (bound.equals(value)) {
+         if(bound.equals(value)) {
             return name;
          }
       }
 
-      if (value instanceof Variable) {
+      if(value instanceof Variable) {
          Variable variable = (Variable) value;
          Registers.Register register = variable.getAllocation();
          // Find value if it is already bound
-         for (String name : bindings.keySet()) {
+         for(String name : bindings.keySet()) {
             Value bound = bindings.get(name);
-            if (bound instanceof Variable) {
+            if(bound instanceof Variable) {
                Registers.Register boundRegister = ((Variable) bound).getAllocation();
-               if (boundRegister != null && boundRegister.equals(register)) {
-                  if (SymbolTypeInference.typeMatch(((Variable) bound).getType(), variable.getType())) {
+               if(boundRegister != null && boundRegister.equals(register)) {
+                  if(SymbolTypeInference.typeMatch(((Variable) bound).getType(), variable.getType())) {
                      return name;
                   }
                }
@@ -240,9 +239,9 @@ public class AsmFragmentSignature {
          String name = getTypePrefix(varType) + getRegisterName(register);
          bindings.put(name, value);
          return name;
-      } else if (value instanceof ConstantVar || value instanceof ConstantValue) {
+      } else if(value instanceof ConstantVar || value instanceof ConstantValue) {
          SymbolType constType;
-         if (value instanceof ConstantVar) {
+         if(value instanceof ConstantVar) {
             constType = ((ConstantVar) value).getType();
          } else {
             constType = SymbolTypeInference.inferType(program.getScope(), (ConstantValue) value);
@@ -250,7 +249,7 @@ public class AsmFragmentSignature {
          String name = getTypePrefix(constType) + "c" + nextConstByteIdx++;
          bindings.put(name, value);
          return name;
-      } else if (value instanceof Label) {
+      } else if(value instanceof Label) {
          String name = "la" + nextLabelIdx++;
          bindings.put(name, value);
          return name;
@@ -260,27 +259,28 @@ public class AsmFragmentSignature {
 
    /**
     * Get the symbol type part of the binding name (eg. vbu/pws/...)
+    *
     * @param type The type
     * @return The type name
     */
    private String getTypePrefix(SymbolType type) {
-      if (SymbolType.isByte(type)) {
+      if(SymbolType.isByte(type)) {
          return "vbu";
-      } else if (SymbolType.isSByte(type)) {
+      } else if(SymbolType.isSByte(type)) {
          return "vbs";
-      } else if (SymbolType.isWord(type)) {
+      } else if(SymbolType.isWord(type)) {
          return "vwu";
-      } else if (SymbolType.isSWord(type)) {
+      } else if(SymbolType.isSWord(type)) {
          return "vws";
-      } else if (SymbolType.STRING.equals(type)) {
+      } else if(SymbolType.STRING.equals(type)) {
          return "pbu";
-      } else if (type instanceof SymbolTypePointer) {
+      } else if(type instanceof SymbolTypePointer) {
          SymbolType elementType = ((SymbolTypePointer) type).getElementType();
-         if (SymbolType.isByte(elementType)) {
+         if(SymbolType.isByte(elementType)) {
             return "pbu";
-         } else if (SymbolType.isSByte(elementType)) {
+         } else if(SymbolType.isSByte(elementType)) {
             return "pbs";
-         } else if (SymbolType.isWord(elementType)) {
+         } else if(SymbolType.isWord(elementType)) {
             return "pwu";
          } else {
             throw new RuntimeException("Not implemented " + type);
@@ -293,21 +293,22 @@ public class AsmFragmentSignature {
    /**
     * Get the register part of the binding name (eg. aa, z1, c2, ...).
     * Examines all previous bindings to reuse register index if the same register is bound multiple times.
+    *
     * @param register The register
     * @return The register part of the binding name.
     */
    private String getRegisterName(Registers.Register register) {
-      if (Registers.RegisterType.ZP_BYTE.equals(register.getType())) {
+      if(Registers.RegisterType.ZP_BYTE.equals(register.getType())) {
          return "z" + getRegisterZpNameIdx((Registers.RegisterZp) register);
-      } else if (Registers.RegisterType.ZP_WORD.equals(register.getType())) {
+      } else if(Registers.RegisterType.ZP_WORD.equals(register.getType())) {
          return "z" + getRegisterZpNameIdx((Registers.RegisterZp) register);
-      } else if (Registers.RegisterType.REG_A_BYTE.equals(register.getType())) {
+      } else if(Registers.RegisterType.REG_A_BYTE.equals(register.getType())) {
          return "aa";
-      } else if (Registers.RegisterType.REG_X_BYTE.equals(register.getType())) {
+      } else if(Registers.RegisterType.REG_X_BYTE.equals(register.getType())) {
          return "xx";
-      } else if (Registers.RegisterType.REG_Y_BYTE.equals(register.getType())) {
+      } else if(Registers.RegisterType.REG_Y_BYTE.equals(register.getType())) {
          return "yy";
-      } else if (Registers.RegisterType.REG_ALU.equals(register.getType())) {
+      } else if(Registers.RegisterType.REG_ALU.equals(register.getType())) {
          throw new AsmFragment.AluNotApplicableException();
       } else {
          throw new RuntimeException("Not implemented " + register.getType());
@@ -317,17 +318,18 @@ public class AsmFragmentSignature {
    /**
     * Get the register ZP name index to use for a specific register.
     * Examines all previous bindings to reuse register index if the same register is bound multiple times.
+    *
     * @param register The register to find an index for
     * @return The index. Either reused ot allocated from {@link #nextZpByteIdx}
     */
    private String getRegisterZpNameIdx(Registers.RegisterZp register) {
-      for (String boundName : bindings.keySet()) {
+      for(String boundName : bindings.keySet()) {
          Value boundValue = bindings.get(boundName);
-         if (boundValue instanceof Variable) {
+         if(boundValue instanceof Variable) {
             Registers.Register boundRegister = ((Variable) boundValue).getAllocation();
-            if (boundRegister != null && boundRegister.isZp()) {
+            if(boundRegister != null && boundRegister.isZp()) {
                Registers.RegisterZp boundRegisterZp = (Registers.RegisterZp) boundRegister;
-               if (register.getZp() == boundRegisterZp.getZp()) {
+               if(register.getZp() == boundRegisterZp.getZp()) {
                   // Found other register with same ZP address!
                   return boundName.substring(boundName.length() - 1);
                }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSynthesis.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSynthesis.java
index 23db6ae0f..b4ed0ed36 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSynthesis.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSynthesis.java
@@ -10,94 +10,94 @@ import java.util.regex.Pattern;
 /** AsmFragment synthesis mechanism based on matching fragment signature and reusing another fragment with added prefix/postfix and some bind-mappings */
 class AsmFragmentSynthesis {
 
-    private String sigMatch;
-    private String sigAvoid;
-    private String asmPrefix;
-    private String sigReplace;
-    private String asmPostfix;
-    private Map<String, String> bindMappings;
-    private boolean mapSignature;
-    private String subSignature;
+   private String sigMatch;
+   private String sigAvoid;
+   private String asmPrefix;
+   private String sigReplace;
+   private String asmPostfix;
+   private Map<String, String> bindMappings;
+   private boolean mapSignature;
+   private String subSignature;
 
-    AsmFragmentSynthesis(String sigMatch, String sigAvoid, String asmPrefix, String sigReplace, String asmPostfix, Map<String, String> bindMappings, boolean mapSignature) {
-        this.sigMatch = sigMatch;
-        this.sigAvoid = sigAvoid;
-        this.asmPrefix = asmPrefix;
-        this.sigReplace = sigReplace;
-        this.asmPostfix = asmPostfix;
-        this.bindMappings = bindMappings;
-        this.mapSignature = mapSignature;
-    }
+   AsmFragmentSynthesis(String sigMatch, String sigAvoid, String asmPrefix, String sigReplace, String asmPostfix, Map<String, String> bindMappings, boolean mapSignature) {
+      this.sigMatch = sigMatch;
+      this.sigAvoid = sigAvoid;
+      this.asmPrefix = asmPrefix;
+      this.sigReplace = sigReplace;
+      this.asmPostfix = asmPostfix;
+      this.bindMappings = bindMappings;
+      this.mapSignature = mapSignature;
+   }
 
-    public AsmFragmentSynthesis(String sigMatch, String sigAvoid, String asmPrefix, String sigReplace, String asmPostfix, Map<String, String> bindMappings) {
-        this(sigMatch, sigAvoid, asmPrefix, sigReplace, asmPostfix, bindMappings, true);
-    }
+   public AsmFragmentSynthesis(String sigMatch, String sigAvoid, String asmPrefix, String sigReplace, String asmPostfix, Map<String, String> bindMappings) {
+      this(sigMatch, sigAvoid, asmPrefix, sigReplace, asmPostfix, bindMappings, true);
+   }
 
-    public String getName() {
-        return sigMatch + (sigAvoid == null ? "" : ("/" + sigAvoid));
-    }
+   static String regexpRewriteSignature(String signature, String match, String replace) {
+      Pattern p = Pattern.compile(match);
+      Matcher m = p.matcher(signature);
+      String output = signature;
+      if(m.find()) {
+         // getReplacement first number with "number" and second number with the first
+         output = m.replaceAll(replace);
+      }
+      return output;
+   }
 
-    public List<AsmFragmentTemplate> synthesize(String signature, AsmFragmentManager.AsmSynthesisPath path, AsmFragmentManager.AsmFragmentTemplateSynthesizer synthesizer) {
-        ArrayList<AsmFragmentTemplate> candidates = new ArrayList<>();
-        if (signature.matches(sigMatch)) {
-            if (sigAvoid == null || !signature.matches(sigAvoid)) {
-                subSignature = regexpRewriteSignature(signature, sigMatch, sigReplace);
-                if (mapSignature && bindMappings != null) {
-                    // When mapping the signature we do the map replacement in the signature
-                    for (String bound : bindMappings.keySet()) {
-                        subSignature = subSignature.replace(bound, bindMappings.get(bound));
-                    }
-                }
-                List<AsmFragmentTemplate> subFragmentTemplates = synthesizer.loadOrSynthesizeFragment(subSignature, path);
-                for (AsmFragmentTemplate subFragmentTemplate : subFragmentTemplates) {
-                    if (subFragmentTemplate != null) {
-                        StringBuilder newFragment = new StringBuilder();
-                        if (asmPrefix != null) {
-                            newFragment.append(asmPrefix).append("\n");
-                        }
-                        String subFragment = subFragmentTemplate.getBody();
-                        if (bindMappings != null) {
-                            if (mapSignature) {
-                                // When mapping the signature we do the reverse replacement in the ASM
-                                List<String> reverse = new ArrayList<>(bindMappings.keySet());
-                                Collections.reverse(reverse);
-                                for (String bound : reverse) {
-                                    subFragment = subFragment.replace("{" + bindMappings.get(bound) + "}", "{" + bound + "}");
-                                }
-                            } else {
-                                // When not mapping the signature we do the replacement directly in the ASM
-                                for (String bound : bindMappings.keySet()) {
-                                    subFragment = subFragment.replace("{" + bound + "}", "{" + bindMappings.get(bound) + "}");
-                                }
-                            }
-                        }
-                        newFragment.append(subFragment);
-                        if (asmPostfix != null) {
-                            newFragment.append("\n");
-                            newFragment.append(asmPostfix);
-                        }
-                        candidates.add(new AsmFragmentTemplate(signature, newFragment.toString(), this, subFragmentTemplate));
-                    }
-                }
+   public String getName() {
+      return sigMatch + (sigAvoid == null ? "" : ("/" + sigAvoid));
+   }
+
+   public List<AsmFragmentTemplate> synthesize(String signature, AsmFragmentManager.AsmSynthesisPath path, AsmFragmentManager.AsmFragmentTemplateSynthesizer synthesizer) {
+      ArrayList<AsmFragmentTemplate> candidates = new ArrayList<>();
+      if(signature.matches(sigMatch)) {
+         if(sigAvoid == null || !signature.matches(sigAvoid)) {
+            subSignature = regexpRewriteSignature(signature, sigMatch, sigReplace);
+            if(mapSignature && bindMappings != null) {
+               // When mapping the signature we do the map replacement in the signature
+               for(String bound : bindMappings.keySet()) {
+                  subSignature = subSignature.replace(bound, bindMappings.get(bound));
+               }
             }
-        }
-        return candidates;
-    }
+            List<AsmFragmentTemplate> subFragmentTemplates = synthesizer.loadOrSynthesizeFragment(subSignature, path);
+            for(AsmFragmentTemplate subFragmentTemplate : subFragmentTemplates) {
+               if(subFragmentTemplate != null) {
+                  StringBuilder newFragment = new StringBuilder();
+                  if(asmPrefix != null) {
+                     newFragment.append(asmPrefix).append("\n");
+                  }
+                  String subFragment = subFragmentTemplate.getBody();
+                  if(bindMappings != null) {
+                     if(mapSignature) {
+                        // When mapping the signature we do the reverse replacement in the ASM
+                        List<String> reverse = new ArrayList<>(bindMappings.keySet());
+                        Collections.reverse(reverse);
+                        for(String bound : reverse) {
+                           subFragment = subFragment.replace("{" + bindMappings.get(bound) + "}", "{" + bound + "}");
+                        }
+                     } else {
+                        // When not mapping the signature we do the replacement directly in the ASM
+                        for(String bound : bindMappings.keySet()) {
+                           subFragment = subFragment.replace("{" + bound + "}", "{" + bindMappings.get(bound) + "}");
+                        }
+                     }
+                  }
+                  newFragment.append(subFragment);
+                  if(asmPostfix != null) {
+                     newFragment.append("\n");
+                     newFragment.append(asmPostfix);
+                  }
+                  candidates.add(new AsmFragmentTemplate(signature, newFragment.toString(), this, subFragmentTemplate));
+               }
+            }
+         }
+      }
+      return candidates;
+   }
 
-    public String getSubSignature() {
-        return subSignature;
-    }
-
-    static String regexpRewriteSignature(String signature, String match, String replace) {
-        Pattern p = Pattern.compile(match);
-        Matcher m = p.matcher(signature);
-        String output = signature;
-        if (m.find()) {
-            // getReplacement first number with "number" and second number with the first
-            output = m.replaceAll(replace);
-        }
-        return output;
-    }
+   public String getSubSignature() {
+      return subSignature;
+   }
 
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java
index e2dc3e751..6b24feefc 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplate.java
@@ -10,119 +10,114 @@ import org.antlr.v4.runtime.*;
  */
 public class AsmFragmentTemplate {
 
-    /** The fragment template signature name. */
-    private String signature;
+   /** true if the fragment was loaded from disk. */
+   boolean file;
+   /** The fragment template signature name. */
+   private String signature;
+   /** The fragment template body */
+   private String body;
+   /** The parsed ASM lines. Initially null. Will be non-null, is the template is ever used to generate ASM code. */
+   private KickCParser.AsmLinesContext bodyAsm;
+   /** The synthesis that created the fragment. null if the fragment template was loaded. */
+   private AsmFragmentSynthesis synthesis;
 
-    /** The fragment template body */
-    private String body;
+   /** The sub fragment template that the synthesis modified to create this. null if the fragment template was loaded. */
+   private AsmFragmentTemplate subFragment;
 
-    /** The parsed ASM lines. Initially null. Will be non-null, is the template is ever used to generate ASM code. */
-    private KickCParser.AsmLinesContext bodyAsm;
+   public AsmFragmentTemplate(String signature, String body) {
+      this.signature = signature;
+      this.body = body;
+      this.file = true;
+   }
 
-    /** true if the fragment was loaded from disk. */
-    boolean file;
+   AsmFragmentTemplate(String signature, String body, AsmFragmentSynthesis synthesis, AsmFragmentTemplate subFragment) {
+      this.signature = signature;
+      this.body = body;
+      this.synthesis = synthesis;
+      this.subFragment = subFragment;
+      this.file = false;
+   }
 
-    /** The synthesis that created the fragment. null if the fragment template was loaded. */
-    private AsmFragmentSynthesis synthesis;
+   /**
+    * Creates an inline ASM fragment template
+    *
+    * @param bodyLines Parsed ASM body
+    */
+   public AsmFragmentTemplate(KickCParser.AsmLinesContext bodyLines) {
+      this.signature = "--inline--";
+      this.bodyAsm = bodyLines;
+   }
 
-    /** The sub fragment template that the synthesis modified to create this. null if the fragment template was loaded. */
-    private AsmFragmentTemplate subFragment;
+   /**
+    * Parse an ASM fragment.
+    *
+    * @param fragmentBody The stream containing the fragment syntax
+    * @param fragmentFileName The filename (used in error messages)
+    * @return The parsed fragment ready for generating
+    */
+   private static KickCParser.AsmLinesContext parseBody(String fragmentBody, final String fragmentFileName) {
+      CodePointCharStream fragmentCharStream = CharStreams.fromString(fragmentBody);
+      KickCLexer kickCLexer = new KickCLexer(fragmentCharStream);
+      KickCParser kickCParser = new KickCParser(new CommonTokenStream(kickCLexer));
+      kickCParser.addErrorListener(new BaseErrorListener() {
+         @Override
+         public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
+            throw new RuntimeException("Error parsing fragment " + fragmentFileName + "\n - Line: " + line + "\n - Message: " + msg);
+         }
+      });
+      kickCParser.setBuildParseTree(true);
+      KickCParser.AsmFileContext asmFile = kickCParser.asmFile();
+      return asmFile.asmLines();
+   }
 
-    public AsmFragmentTemplate(String signature, String body) {
-        this.signature = signature;
-        this.body = body;
-        this.file = true;
-    }
+   public String getSignature() {
+      return signature;
+   }
 
-    AsmFragmentTemplate(String signature, String body, AsmFragmentSynthesis synthesis, AsmFragmentTemplate subFragment) {
-        this.signature = signature;
-        this.body = body;
-        this.synthesis = synthesis;
-        this.subFragment = subFragment;
-        this.file = false;
-    }
+   public String getBody() {
+      return body;
+   }
 
-    /**
-     * Creates an inline ASM fragment template
-     *
-     * @param bodyLines Parsed ASM body
-     */
-    public AsmFragmentTemplate(KickCParser.AsmLinesContext bodyLines) {
-        this.signature = "--inline--";
-        this.bodyAsm = bodyLines;
-    }
+   public KickCParser.AsmLinesContext getBodyAsm() {
+      if(bodyAsm == null) {
+         bodyAsm = parseBody(body, signature);
+      }
+      return bodyAsm;
+   }
 
-    public String getSignature() {
-        return signature;
-    }
+   public boolean isFile() {
+      return file;
+   }
 
-    public String getBody() {
-        return body;
-    }
+   public AsmFragmentSynthesis getSynthesis() {
+      return synthesis;
+   }
 
-    public KickCParser.AsmLinesContext getBodyAsm() {
-        if (bodyAsm == null) {
-            bodyAsm = parseBody(body, signature);
-        }
-        return bodyAsm;
-    }
+   public AsmFragmentTemplate getSubFragment() {
+      return subFragment;
+   }
 
-    /**
-     * Parse an ASM fragment.
-     *
-     * @param fragmentBody The stream containing the fragment syntax
-     * @param fragmentFileName The filename (used in error messages)
-     * @return The parsed fragment ready for generating
-     */
-    private static KickCParser.AsmLinesContext parseBody(String fragmentBody, final String fragmentFileName) {
-        CodePointCharStream fragmentCharStream = CharStreams.fromString(fragmentBody);
-        KickCLexer kickCLexer = new KickCLexer(fragmentCharStream);
-        KickCParser kickCParser = new KickCParser(new CommonTokenStream(kickCLexer));
-        kickCParser.addErrorListener(new BaseErrorListener() {
-            @Override
-            public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
-                throw new RuntimeException("Error parsing fragment " + fragmentFileName + "\n - Line: " + line + "\n - Message: " + msg);
-            }
-        });
-        kickCParser.setBuildParseTree(true);
-        KickCParser.AsmFileContext asmFile = kickCParser.asmFile();
-        return asmFile.asmLines();
-    }
+   public String getName() {
+      StringBuilder name = new StringBuilder();
+      name.append(signature);
+      if(synthesis != null) {
+         name.append(" < ");
+         name.append(subFragment.getName());
+      }
+      return name.toString();
+   }
 
+   @Override
+   public boolean equals(Object o) {
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      AsmFragmentTemplate that = (AsmFragmentTemplate) o;
+      return getName().equals(that.getName());
+   }
 
-    public boolean isFile() {
-        return file;
-    }
-
-    public AsmFragmentSynthesis getSynthesis() {
-        return synthesis;
-    }
-
-    public AsmFragmentTemplate getSubFragment() {
-        return subFragment;
-    }
-
-    public String getName() {
-        StringBuilder name = new StringBuilder();
-        name.append(signature);
-        if (synthesis != null) {
-            name.append(" < ");
-            name.append(subFragment.getName());
-        }
-        return name.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        AsmFragmentTemplate that = (AsmFragmentTemplate) o;
-        return getName().equals(that.getName());
-    }
-
-    @Override
-    public int hashCode() {
-        return getName().hashCode();
-    }
+   @Override
+   public int hashCode() {
+      return getName().hashCode();
+   }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentUsages.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentUsages.java
index 582f7730c..3d980dce4 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentUsages.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentUsages.java
@@ -8,176 +8,176 @@ import java.util.*;
 /** Statistics for usage of the ASM fragments. Also contains a methos for identifying redundant/unused files. */
 public class AsmFragmentUsages {
 
-    /** Usage Statistics for fragment templates. */
-    private static Map<AsmFragmentTemplate, Integer> fragmentTemplateUsage = new HashMap<>();
+   /** Usage Statistics for fragment templates. */
+   private static Map<AsmFragmentTemplate, Integer> fragmentTemplateUsage = new HashMap<>();
 
-    /**
-     * Count one usage of ASM fragment templates - directly or through synthesis
-     *
-     * @param fragmentTemplate The template to increment usage of
-     */
-    static void incUsage(AsmFragmentTemplate fragmentTemplate) {
-        Integer usage = fragmentTemplateUsage.get(fragmentTemplate);
-        if (usage == null) {
-            usage = 0;
-        }
-        fragmentTemplateUsage.put(fragmentTemplate, usage + 1);
-        AsmFragmentTemplate subFragment = fragmentTemplate.getSubFragment();
-        if (subFragment != null) {
-            incUsage(subFragment);
-        }
-    }
+   /**
+    * Count one usage of ASM fragment templates - directly or through synthesis
+    *
+    * @param fragmentTemplate The template to increment usage of
+    */
+   static void incUsage(AsmFragmentTemplate fragmentTemplate) {
+      Integer usage = fragmentTemplateUsage.get(fragmentTemplate);
+      if(usage == null) {
+         usage = 0;
+      }
+      fragmentTemplateUsage.put(fragmentTemplate, usage + 1);
+      AsmFragmentTemplate subFragment = fragmentTemplate.getSubFragment();
+      if(subFragment != null) {
+         incUsage(subFragment);
+      }
+   }
 
-    /**
-     * Log the usage of all template fragemnts (both loaded and synthesized).
-     *
-     * @param log The compile log to add the output to
-     */
-    public static void logUsages(CompileLog log, boolean logRedundantFiles, boolean logUnusedFiles, boolean logFileDetails, boolean logAllDetails) {
+   /**
+    * Log the usage of all template fragemnts (both loaded and synthesized).
+    *
+    * @param log The compile log to add the output to
+    */
+   public static void logUsages(CompileLog log, boolean logRedundantFiles, boolean logUnusedFiles, boolean logFileDetails, boolean logAllDetails) {
 
-        Map<String, List<AsmFragmentTemplate>> fragmentTemplateCache = AsmFragmentManager.getFragmentTemplateCache();
-        ArrayList<String> signatures = new ArrayList<>(fragmentTemplateCache.keySet());
-        Collections.sort(signatures);
-        File[] files = AsmFragmentManager.allFragmentFiles();
+      Map<String, List<AsmFragmentTemplate>> fragmentTemplateCache = AsmFragmentManager.getFragmentTemplateCache();
+      ArrayList<String> signatures = new ArrayList<>(fragmentTemplateCache.keySet());
+      Collections.sort(signatures);
+      File[] files = AsmFragmentManager.allFragmentFiles();
 
-        if (logRedundantFiles) {
-            // Find all file fragments that were bested by a synthesized fragment
-            log.append("\nREDUNDANT ASM FRAGMENT FILE ANALYSIS (if found remove them from disk)");
-            for (String signature : signatures) {
-                List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
-                AsmFragmentTemplate fileTemplate = null;
-                int fileUsage = 0;
-                AsmFragmentTemplate maxTemplate = null;
-                int maxUsage = 0;
-                for (AsmFragmentTemplate template : templates) {
-                    Integer usage = fragmentTemplateUsage.get(template);
-                    if (usage == null) usage = 0;
-                    if (template.isFile()) {
-                        fileTemplate = template;
-                        fileUsage = usage;
-                    }
-                    if (usage > maxUsage) {
-                        maxUsage = usage;
-                        maxTemplate = template;
-                    }
-                }
-                if (fileTemplate != null && fileUsage == 0 && maxUsage > 0) {
-                    log.append("rm " + fileTemplate.getName() + ".asm #synthesized by " + maxTemplate.getName() + " - usages: " + maxUsage);
-                }
+      if(logRedundantFiles) {
+         // Find all file fragments that were bested by a synthesized fragment
+         log.append("\nREDUNDANT ASM FRAGMENT FILE ANALYSIS (if found remove them from disk)");
+         for(String signature : signatures) {
+            List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
+            AsmFragmentTemplate fileTemplate = null;
+            int fileUsage = 0;
+            AsmFragmentTemplate maxTemplate = null;
+            int maxUsage = 0;
+            for(AsmFragmentTemplate template : templates) {
+               Integer usage = fragmentTemplateUsage.get(template);
+               if(usage == null) usage = 0;
+               if(template.isFile()) {
+                  fileTemplate = template;
+                  fileUsage = usage;
+               }
+               if(usage > maxUsage) {
+                  maxUsage = usage;
+                  maxTemplate = template;
+               }
             }
-
-            Set<String> redundantSignatures = new LinkedHashSet<>();
-            for (File file : files) {
-                String fileName = file.getName();
-                String signature = fileName.substring(0, fileName.length() - 4);
-                // Try to synthesize the fragment - and check if the synthesis is as good as the file body
-                AsmFragmentManager.AsmFragmentTemplateSynthesizer synthesizer = new AsmFragmentManager.AsmFragmentTemplateSynthesizer(signature, log);
-                List<AsmFragmentTemplate> templates = synthesizer.loadOrSynthesizeFragment(signature, new AsmFragmentManager.AsmSynthesisPath());
-                AsmFragmentTemplate fileTemplate = null;
-                for (AsmFragmentTemplate template : templates) {
-                    if (template.isFile()) {
-                        fileTemplate = template;
-                    }
-                }
-                for (AsmFragmentTemplate template : templates) {
-                    if (!template.isFile() && template.getBody().equals(fileTemplate.getBody())) {
-                        // Check if the synthesis uses a file marked as redundant
-                        AsmFragmentTemplate sourceFileTemplate = template;
-                        while (!sourceFileTemplate.isFile()) {
-                            sourceFileTemplate = sourceFileTemplate.getSubFragment();
-                        }
-                        if (redundantSignatures.contains(sourceFileTemplate.getSignature())) {
-                            throw new RuntimeException("Problem in redundancy analysis! " + sourceFileTemplate.getSignature() + ".asm seems redundant but is needed for synthesis of " + signature);
-                        }
-                        log.append("rm " + fileTemplate.getName() + ".asm #synthesized same ASM by " + template.getName());
-                        redundantSignatures.add(signature);
-                        break;
-                    }
-                }
+            if(fileTemplate != null && fileUsage == 0 && maxUsage > 0) {
+               log.append("rm " + fileTemplate.getName() + ".asm #synthesized by " + maxTemplate.getName() + " - usages: " + maxUsage);
             }
-        }
+         }
 
-        if (logUnusedFiles) {
-            log.append("\nUNUSED ASM FRAGMENT FILES ANALYSIS (if found consider removing them from disk)");
-            for (File file : files) {
-                String fileName = file.getName();
-                String signature = fileName.substring(0, fileName.length() - 4);
-                List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
-                if (templates != null && templates.size() > 0) {
-                    // The template has been loaded / synthesized - is the usage count zero?
-                    boolean allZero = true;
-                    Integer fileUsage = null;
-                    for (AsmFragmentTemplate template : templates) {
-                        Integer usage = fragmentTemplateUsage.get(template);
-                        if (usage == null) usage = 0;
-                        if (usage > 0) {
-                            allZero = false;
-                        }
-                        if (template.isFile()) {
-                            fileUsage = usage;
-                        }
-                    }
-                    if (fileUsage == null) {
-                        throw new RuntimeException("Error! Template file never loaded according to usage stats " + fileName);
-                    }
-                    if (allZero) {
-                        log.append("git mv " + fileName + " unused # Loaded but never used");
-                    }
-                } else {
-                    // The template has never been loaded
-                    log.append("git mv " + fileName + " unused # Never loaded");
-                }
+         Set<String> redundantSignatures = new LinkedHashSet<>();
+         for(File file : files) {
+            String fileName = file.getName();
+            String signature = fileName.substring(0, fileName.length() - 4);
+            // Try to synthesize the fragment - and check if the synthesis is as good as the file body
+            AsmFragmentManager.AsmFragmentTemplateSynthesizer synthesizer = new AsmFragmentManager.AsmFragmentTemplateSynthesizer(signature, log);
+            List<AsmFragmentTemplate> templates = synthesizer.loadOrSynthesizeFragment(signature, new AsmFragmentManager.AsmSynthesisPath());
+            AsmFragmentTemplate fileTemplate = null;
+            for(AsmFragmentTemplate template : templates) {
+               if(template.isFile()) {
+                  fileTemplate = template;
+               }
             }
-        }
-
-        if (logFileDetails) {
-            log.append("\nDETAILED ASM FILE USAGES");
-            // Find all file templates
-            List<AsmFragmentTemplate> fileTemplates = new ArrayList<>();
-            for (String signature : signatures) {
-                List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
-                for (AsmFragmentTemplate template : templates) {
-                    if (template.isFile()) {
-                        fileTemplates.add(template);
-                    }
-                }
+            for(AsmFragmentTemplate template : templates) {
+               if(!template.isFile() && template.getBody().equals(fileTemplate.getBody())) {
+                  // Check if the synthesis uses a file marked as redundant
+                  AsmFragmentTemplate sourceFileTemplate = template;
+                  while(!sourceFileTemplate.isFile()) {
+                     sourceFileTemplate = sourceFileTemplate.getSubFragment();
+                  }
+                  if(redundantSignatures.contains(sourceFileTemplate.getSignature())) {
+                     throw new RuntimeException("Problem in redundancy analysis! " + sourceFileTemplate.getSignature() + ".asm seems redundant but is needed for synthesis of " + signature);
+                  }
+                  log.append("rm " + fileTemplate.getName() + ".asm #synthesized same ASM by " + template.getName());
+                  redundantSignatures.add(signature);
+                  break;
+               }
             }
-            logTemplatesByUsage(log, fileTemplates);
+         }
+      }
 
-        }
-
-        if (logAllDetails) {
-            log.append("\nDETAILED ASM FRAGMENT USAGES");
-            List<AsmFragmentTemplate> allTemplates = new ArrayList<>();
-            for (String signature : signatures) {
-                List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
-                for (AsmFragmentTemplate template : templates) {
-                    allTemplates.add(template);
-                }
+      if(logUnusedFiles) {
+         log.append("\nUNUSED ASM FRAGMENT FILES ANALYSIS (if found consider removing them from disk)");
+         for(File file : files) {
+            String fileName = file.getName();
+            String signature = fileName.substring(0, fileName.length() - 4);
+            List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
+            if(templates != null && templates.size() > 0) {
+               // The template has been loaded / synthesized - is the usage count zero?
+               boolean allZero = true;
+               Integer fileUsage = null;
+               for(AsmFragmentTemplate template : templates) {
+                  Integer usage = fragmentTemplateUsage.get(template);
+                  if(usage == null) usage = 0;
+                  if(usage > 0) {
+                     allZero = false;
+                  }
+                  if(template.isFile()) {
+                     fileUsage = usage;
+                  }
+               }
+               if(fileUsage == null) {
+                  throw new RuntimeException("Error! Template file never loaded according to usage stats " + fileName);
+               }
+               if(allZero) {
+                  log.append("git mv " + fileName + " unused # Loaded but never used");
+               }
+            } else {
+               // The template has never been loaded
+               log.append("git mv " + fileName + " unused # Never loaded");
             }
-            logTemplatesByUsage(log, allTemplates);
-        }
+         }
+      }
+
+      if(logFileDetails) {
+         log.append("\nDETAILED ASM FILE USAGES");
+         // Find all file templates
+         List<AsmFragmentTemplate> fileTemplates = new ArrayList<>();
+         for(String signature : signatures) {
+            List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
+            for(AsmFragmentTemplate template : templates) {
+               if(template.isFile()) {
+                  fileTemplates.add(template);
+               }
+            }
+         }
+         logTemplatesByUsage(log, fileTemplates);
+
+      }
+
+      if(logAllDetails) {
+         log.append("\nDETAILED ASM FRAGMENT USAGES");
+         List<AsmFragmentTemplate> allTemplates = new ArrayList<>();
+         for(String signature : signatures) {
+            List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
+            for(AsmFragmentTemplate template : templates) {
+               allTemplates.add(template);
+            }
+         }
+         logTemplatesByUsage(log, allTemplates);
+      }
 
 
-    }
+   }
 
-    private static void logTemplatesByUsage(CompileLog log, List<AsmFragmentTemplate> fileTemplates) {
-        // Sort by usage
-        Collections.sort(fileTemplates, (o1, o2) -> {
-                    Integer u1 = fragmentTemplateUsage.get(o1);
-                    Integer u2 = fragmentTemplateUsage.get(o2);
-                    if (u1 == null) u1 = 0;
-                    if (u2 == null) u2 = 0;
-                    return u2 - u1;
-                }
-        );
-        // Output
-        for (AsmFragmentTemplate template : fileTemplates) {
-            Integer usage = fragmentTemplateUsage.get(template);
-            if (usage == null) usage = 0;
-            log.append(String.format("%8d", usage) + "  " + (template.isFile()?"*":"")+template.getName());
-        }
-    }
+   private static void logTemplatesByUsage(CompileLog log, List<AsmFragmentTemplate> fileTemplates) {
+      // Sort by usage
+      Collections.sort(fileTemplates, (o1, o2) -> {
+               Integer u1 = fragmentTemplateUsage.get(o1);
+               Integer u2 = fragmentTemplateUsage.get(o2);
+               if(u1 == null) u1 = 0;
+               if(u2 == null) u2 = 0;
+               return u2 - u1;
+            }
+      );
+      // Output
+      for(AsmFragmentTemplate template : fileTemplates) {
+         Integer usage = fragmentTemplateUsage.get(template);
+         if(usage == null) usage = 0;
+         log.append(String.format("%8d", usage) + "  " + (template.isFile() ? "*" : "") + template.getName());
+      }
+   }
 
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/CallGraph.java b/src/main/java/dk/camelot64/kickc/model/CallGraph.java
index 2ae37e7af..219295d0d 100644
--- a/src/main/java/dk/camelot64/kickc/model/CallGraph.java
+++ b/src/main/java/dk/camelot64/kickc/model/CallGraph.java
@@ -25,7 +25,7 @@ public class CallGraph {
     */
    public CallBlock getOrCreateCallBlock(LabelRef scopeLabel) {
       CallBlock callBlock = getCallBlock(scopeLabel);
-      if (callBlock != null) {
+      if(callBlock != null) {
          return callBlock;
       }
       // Not found - create it
@@ -41,8 +41,8 @@ public class CallGraph {
     * @return The call block for the scope. Null if the call block does not exist (no calls are made from it).
     */
    private CallBlock getCallBlock(LabelRef scopeLabel) {
-      for (CallBlock callBlock : callBlocks) {
-         if (callBlock.getScopeLabel().equals(scopeLabel)) {
+      for(CallBlock callBlock : callBlocks) {
+         if(callBlock.getScopeLabel().equals(scopeLabel)) {
             return callBlock;
          }
       }
@@ -55,13 +55,14 @@ public class CallGraph {
 
    /**
     * Get sub call blocks called from a specific call block.
+    *
     * @param block The block to find subs for
     * @return The sub call blocks called from the passed block
     */
    public Collection<CallBlock> getCalledBlocks(CallBlock block) {
       Collection<LabelRef> calledLabels = block.getCalledBlocks();
       LinkedHashSet<CallBlock> called = new LinkedHashSet<>();
-      for (LabelRef calledLabel : calledLabels) {
+      for(LabelRef calledLabel : calledLabels) {
          called.add(getOrCreateCallBlock(calledLabel));
       }
       return called;
@@ -69,13 +70,14 @@ public class CallGraph {
 
    /**
     * Get all call blocks that call a specific call block
+    *
     * @param scopeLabel The label of scope (the call block)
     * @return The scope labels of call blocks that call the passed block
     */
    public Collection<LabelRef> getCallingBlocks(LabelRef scopeLabel) {
       ArrayList<LabelRef> callingBlocks = new ArrayList<>();
-      for (CallBlock callBlock : callBlocks) {
-         if (callBlock.getCalledBlocks().contains(scopeLabel)) {
+      for(CallBlock callBlock : callBlocks) {
+         if(callBlock.getCalledBlocks().contains(scopeLabel)) {
             callingBlocks.add(callBlock.getScopeLabel());
          }
       }
@@ -85,7 +87,7 @@ public class CallGraph {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (CallBlock callBlock : callBlocks) {
+      for(CallBlock callBlock : callBlocks) {
          out.append(callBlock.toString()).append("\n");
       }
       return out.toString();
@@ -93,14 +95,15 @@ public class CallGraph {
 
    /**
     * Get all calls of a specific procedure
+    *
     * @param label The label of the procedure
     * @return All calls
     */
    public Collection<CallBlock.Call> getCallers(LabelRef label) {
       Collection<CallBlock.Call> callers = new ArrayList<>();
-      for (CallBlock callBlock : callBlocks) {
-         for (CallBlock.Call call : callBlock.getCalls()) {
-            if (call.getProcedure().equals(label)) {
+      for(CallBlock callBlock : callBlocks) {
+         for(CallBlock.Call call : callBlock.getCalls()) {
+            if(call.getProcedure().equals(label)) {
                callers.add(call);
             }
          }
@@ -140,7 +143,7 @@ public class CallGraph {
        */
       public Collection<LabelRef> getCalledBlocks() {
          LinkedHashSet<LabelRef> called = new LinkedHashSet<>();
-         for (Call call : calls) {
+         for(Call call : calls) {
             called.add(call.getProcedure());
          }
          return called;
@@ -150,7 +153,7 @@ public class CallGraph {
       public String toString() {
          StringBuilder out = new StringBuilder();
          out.append("Calls in [").append(scopeLabel.toString()).append("] to ");
-         for (Call call : calls) {
+         for(Call call : calls) {
             out.append(call.toString()).append(" ");
          }
          return out.toString();
@@ -158,6 +161,7 @@ public class CallGraph {
 
       /**
        * Get all calls
+       *
        * @return The calls
        */
       public List<Call> getCalls() {
@@ -166,13 +170,14 @@ public class CallGraph {
 
       /**
        * Get all calls to a specific call block
+       *
        * @param scope The scope label of the block
        * @return All calls to the passed scope
        */
       public Collection<Call> getCalls(LabelRef scope) {
          ArrayList<Call> callsToScope = new ArrayList<>();
-         for (Call call : calls) {
-            if (call.getProcedure().equals(scope)) {
+         for(Call call : calls) {
+            if(call.getProcedure().equals(scope)) {
                callsToScope.add(call);
             }
          }
@@ -211,7 +216,7 @@ public class CallGraph {
          public String toString() {
             StringBuilder out = new StringBuilder();
             out.append(procedure);
-            if (callStatementIdx != null) {
+            if(callStatementIdx != null) {
                out.append(":").append(callStatementIdx);
             }
             return out.toString();
diff --git a/src/main/java/dk/camelot64/kickc/model/CompileError.java b/src/main/java/dk/camelot64/kickc/model/CompileError.java
index b9d5fa0c6..e75d69538 100644
--- a/src/main/java/dk/camelot64/kickc/model/CompileError.java
+++ b/src/main/java/dk/camelot64/kickc/model/CompileError.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/**  Signals some error in the code (or compilation) */
+/** Signals some error in the code (or compilation) */
 public class CompileError extends RuntimeException {
 
    public CompileError(String message) {
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantArrayList.java b/src/main/java/dk/camelot64/kickc/model/ConstantArrayList.java
index 84e2c5cc8..a1a657c06 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantArrayList.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantArrayList.java
@@ -39,8 +39,8 @@ public class ConstantArrayList implements ConstantValue {
       StringBuilder out = new StringBuilder();
       boolean first = true;
       out.append("{ ");
-      for (ConstantValue constantValue : list) {
-         if (!first) {
+      for(ConstantValue constantValue : list) {
+         if(!first) {
             out.append(", ");
          }
          first = false;
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantBinary.java b/src/main/java/dk/camelot64/kickc/model/ConstantBinary.java
index 06a34065f..65632e875 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantBinary.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantBinary.java
@@ -37,7 +37,7 @@ public class ConstantBinary implements ConstantValue {
 
    @Override
    public String toString(Program program) {
-      return left.toString(program)+operator.toString()+right.toString(program);
+      return left.toString(program) + operator.toString() + right.toString(program);
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantBool.java b/src/main/java/dk/camelot64/kickc/model/ConstantBool.java
index d90b5e6b0..619f66aca 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantBool.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantBool.java
@@ -23,9 +23,9 @@ public class ConstantBool implements ConstantValue {
 
    @Override
    public String toString(Program program) {
-      if(program ==null) {
+      if(program == null) {
          return Boolean.toString(value);
-      }  else {
+      } else {
          return //"("+SymbolTypeBasic.BOOLEAN.getTypeName()+") "+
                Boolean.toString(value);
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantChar.java b/src/main/java/dk/camelot64/kickc/model/ConstantChar.java
index db33fc0b4..168f98d5b 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantChar.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantChar.java
@@ -22,12 +22,12 @@ public class ConstantChar implements ConstantValue {
 
    @Override
    public String toString() {
-       return toString(null);
+      return toString(null);
    }
 
    @Override
    public String toString(Program program) {
-      if (program == null) {
+      if(program == null) {
          return "'" + value + "'";
       } else {
          return "(" + SymbolType.BYTE.getTypeName() + ") " + "'" + value + "'";
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantDouble.java b/src/main/java/dk/camelot64/kickc/model/ConstantDouble.java
index 2a91c3dd7..e3e8a6b51 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantDouble.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantDouble.java
@@ -27,9 +27,9 @@ public class ConstantDouble implements ConstantValue {
 
    @Override
    public String toString(Program program) {
-      if(program ==null) {
+      if(program == null) {
          return Double.toString(number);
-      }  else {
+      } else {
          return "(" + SymbolType.VOID.getTypeName() + ") " + Double.toString(number);
       }
    }
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantInteger.java b/src/main/java/dk/camelot64/kickc/model/ConstantInteger.java
index 551285c46..3b0bc373e 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantInteger.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantInteger.java
@@ -29,8 +29,8 @@ public class ConstantInteger implements ConstantValue {
    public SymbolType getType() {
       ArrayList<SymbolType> potentialTypes = new ArrayList<>();
       Integer number = getNumber();
-      for (SymbolTypeInteger typeInteger : SymbolType.getIntegerTypes()) {
-         if(number>=typeInteger.getMinValue() && number<= typeInteger.getMaxValue()) {
+      for(SymbolTypeInteger typeInteger : SymbolType.getIntegerTypes()) {
+         if(number >= typeInteger.getMinValue() && number <= typeInteger.getMaxValue()) {
             potentialTypes.add(typeInteger);
          }
       }
@@ -44,7 +44,7 @@ public class ConstantInteger implements ConstantValue {
 
    @Override
    public String toString(Program program) {
-      if (program == null) {
+      if(program == null) {
          return Integer.toString(number);
       } else {
          return "(" + getType(program.getScope()).getTypeName() + ") " + Integer.toString(number);
@@ -53,8 +53,8 @@ public class ConstantInteger implements ConstantValue {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
       ConstantInteger that = (ConstantInteger) o;
       return number != null ? number.equals(that.number) : that.number == null;
    }
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantString.java b/src/main/java/dk/camelot64/kickc/model/ConstantString.java
index 4dae792e6..a8c0485f6 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantString.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantString.java
@@ -22,12 +22,12 @@ public class ConstantString implements ConstantValue {
 
    @Override
    public String toString() {
-       return toString(null);
+      return toString(null);
    }
 
    @Override
    public String toString(Program program) {
-      if (program == null) {
+      if(program == null) {
          return "\"" + value + "\"";
       } else {
          return "(" + SymbolType.STRING.getTypeName() + ") " + "\"" + value + "\"";
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantUnary.java b/src/main/java/dk/camelot64/kickc/model/ConstantUnary.java
index 6e8775537..e00c4ec35 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantUnary.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantUnary.java
@@ -29,14 +29,14 @@ public class ConstantUnary implements ConstantValue {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
       ConstantUnary that = (ConstantUnary) o;
-      if (!operator.equals(that.operator)) {
+      if(!operator.equals(that.operator)) {
          return false;
       }
       return operand.equals(that.operand);
@@ -51,7 +51,7 @@ public class ConstantUnary implements ConstantValue {
 
    @Override
    public String toString(Program program) {
-      return operator.toString()+operand.toString(program);
+      return operator.toString() + operand.toString(program);
    }
 
    @Override
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantValueCalculator.java b/src/main/java/dk/camelot64/kickc/model/ConstantValueCalculator.java
index 3d6f14086..ac2253beb 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantValueCalculator.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantValueCalculator.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** Can calculate the exact value for constants (used for type inference).*/
+/** Can calculate the exact value for constants (used for type inference). */
 public class ConstantValueCalculator {
 
 
@@ -28,7 +28,7 @@ public class ConstantValueCalculator {
          // Cannot calculate value of inline array
          return null;
       } else {
-         throw new RuntimeException("Unknown constant value "+value);
+         throw new RuntimeException("Unknown constant value " + value);
       }
    }
 
@@ -52,28 +52,28 @@ public class ConstantValueCalculator {
 
    private static ConstantValue castWord(ConstantValue value) {
       if(value instanceof ConstantInteger) {
-         return new ConstantInteger(0xffff&((ConstantInteger) value).getNumber());
+         return new ConstantInteger(0xffff & ((ConstantInteger) value).getNumber());
       }
       return null;
    }
 
    private static ConstantValue castSWord(ConstantValue value) {
       if(value instanceof ConstantInteger) {
-         return new ConstantInteger(0xffff&((ConstantInteger) value).getNumber());
+         return new ConstantInteger(0xffff & ((ConstantInteger) value).getNumber());
       }
       return null;
    }
 
    private static ConstantValue castByte(ConstantValue value) {
       if(value instanceof ConstantInteger) {
-         return new ConstantInteger(0xff&((ConstantInteger) value).getNumber());
+         return new ConstantInteger(0xff & ((ConstantInteger) value).getNumber());
       }
       return null;
    }
 
    private static ConstantValue castSByte(ConstantValue value) {
       if(value instanceof ConstantInteger) {
-         return new ConstantInteger(0xff&((ConstantInteger) value).getNumber());
+         return new ConstantInteger(0xff & ((ConstantInteger) value).getNumber());
       }
       return null;
    }
@@ -83,7 +83,6 @@ public class ConstantValueCalculator {
    }
 
 
-
    public static ConstantValue calcValue(ProgramScope programScope, ConstantValue value1, Operator operator, ConstantValue value2) {
       if(operator.equals(Operator.MULTIPLY)) {
          return multiply(calcValue(programScope, value1), calcValue(programScope, value2));
@@ -113,21 +112,25 @@ public class ConstantValueCalculator {
 
    private static ConstantValue multiply(ConstantValue value1, ConstantValue value2) {
       if(value1 instanceof ConstantInteger && value2 instanceof ConstantInteger) {
-         return new ConstantInteger(((ConstantInteger) value1).getNumber()*((ConstantInteger) value2).getNumber());
+         return new ConstantInteger(((ConstantInteger) value1).getNumber() * ((ConstantInteger) value2).getNumber());
       }
       return null;
    }
 
    private static ConstantValue plus(ConstantValue value1, ConstantValue value2) {
       if(value1 instanceof ConstantInteger && value2 instanceof ConstantInteger) {
-         return new ConstantInteger(((ConstantInteger) value1).getNumber()+((ConstantInteger) value2).getNumber());
-      } if(value1 instanceof ConstantInteger && value2 instanceof ConstantChar) {
-         return new ConstantInteger(((ConstantInteger) value1).getNumber()+((ConstantChar) value2).getValue());
-      } if(value1 instanceof ConstantChar && value2 instanceof ConstantInteger) {
-         return new ConstantInteger(((ConstantChar) value1).getValue()+((ConstantInteger) value2).getNumber());
-      } if(value1 instanceof ConstantString && value2 instanceof ConstantString) {
+         return new ConstantInteger(((ConstantInteger) value1).getNumber() + ((ConstantInteger) value2).getNumber());
+      }
+      if(value1 instanceof ConstantInteger && value2 instanceof ConstantChar) {
+         return new ConstantInteger(((ConstantInteger) value1).getNumber() + ((ConstantChar) value2).getValue());
+      }
+      if(value1 instanceof ConstantChar && value2 instanceof ConstantInteger) {
+         return new ConstantInteger(((ConstantChar) value1).getValue() + ((ConstantInteger) value2).getNumber());
+      }
+      if(value1 instanceof ConstantString && value2 instanceof ConstantString) {
          return new ConstantString(((ConstantString) value1).getValue() + ((ConstantString) value2).getValue());
-      } if(value1 instanceof ConstantString && value2 instanceof ConstantChar) {
+      }
+      if(value1 instanceof ConstantString && value2 instanceof ConstantChar) {
          return new ConstantString(((ConstantString) value1).getValue() + ((ConstantChar) value2).getValue());
       }
       return null;
@@ -135,14 +138,14 @@ public class ConstantValueCalculator {
 
    private static ConstantValue minus(ConstantValue value1, ConstantValue value2) {
       if(value1 instanceof ConstantInteger && value2 instanceof ConstantInteger) {
-         return new ConstantInteger(((ConstantInteger) value1).getNumber()-((ConstantInteger) value2).getNumber());
+         return new ConstantInteger(((ConstantInteger) value1).getNumber() - ((ConstantInteger) value2).getNumber());
       }
       return null;
    }
 
    private static ConstantValue div(ConstantValue value1, ConstantValue value2) {
       if(value1 instanceof ConstantInteger && value2 instanceof ConstantInteger) {
-         return new ConstantInteger(((ConstantInteger) value1).getNumber()/((ConstantInteger) value2).getNumber());
+         return new ConstantInteger(((ConstantInteger) value1).getNumber() / ((ConstantInteger) value2).getNumber());
       }
       return null;
    }
diff --git a/src/main/java/dk/camelot64/kickc/model/ConstantVar.java b/src/main/java/dk/camelot64/kickc/model/ConstantVar.java
index c6cdfb08f..bf231595c 100644
--- a/src/main/java/dk/camelot64/kickc/model/ConstantVar.java
+++ b/src/main/java/dk/camelot64/kickc/model/ConstantVar.java
@@ -64,17 +64,17 @@ public class ConstantVar implements Symbol {
    }
 
    @Override
-   public int getScopeDepth() {
-      if(scope==null) {
-         return 0;
-      } else {
-         return scope.getScopeDepth()+1;
-      }
+   public void setScope(Scope scope) {
+      this.scope = scope;
    }
 
    @Override
-   public void setScope(Scope scope) {
-      this.scope = scope;
+   public int getScopeDepth() {
+      if(scope == null) {
+         return 0;
+      } else {
+         return scope.getScopeDepth() + 1;
+      }
    }
 
    public ConstantValue getValue() {
@@ -101,7 +101,7 @@ public class ConstantVar implements Symbol {
    public String toString(Program program) {
       String s = new StringBuilder()
             .append("(")
-            .append("const"+" ")
+            .append("const" + " ")
             .append(type.getTypeName())
             .append(") ")
             .append(getFullName()).toString();
@@ -115,22 +115,22 @@ public class ConstantVar implements Symbol {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
       ConstantVar that = (ConstantVar) o;
 
-      if (name != null ? !name.equals(that.name) : that.name != null) {
+      if(name != null ? !name.equals(that.name) : that.name != null) {
          return false;
       }
-      if (scope != null ? !scope.equals(that.scope) : that.scope != null) {
+      if(scope != null ? !scope.equals(that.scope) : that.scope != null) {
          return false;
       }
-      if (type != null ? !type.equals(that.type) : that.type != null) {
+      if(type != null ? !type.equals(that.type) : that.type != null) {
          return false;
       }
       return value != null ? value.equals(that.value) : that.value == null;
diff --git a/src/main/java/dk/camelot64/kickc/model/ControlFlowBlock.java b/src/main/java/dk/camelot64/kickc/model/ControlFlowBlock.java
index 0f7c6ad4b..f589d3e6b 100644
--- a/src/main/java/dk/camelot64/kickc/model/ControlFlowBlock.java
+++ b/src/main/java/dk/camelot64/kickc/model/ControlFlowBlock.java
@@ -9,9 +9,11 @@ import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
 
-/** A named/labelled sequence of SSA statements connected to other basic blocks.
+/**
+ * A named/labelled sequence of SSA statements connected to other basic blocks.
  * The connections defines the control flow of the program.
- * The block only knows its own successors. To find predecessor blocks access to the entire graph is needed.*/
+ * The block only knows its own successors. To find predecessor blocks access to the entire graph is needed.
+ */
 public class ControlFlowBlock {
 
    /** The label representing the block. */
@@ -70,14 +72,14 @@ public class ControlFlowBlock {
 
    /**
     * Add a statement just before the call statement.
-    *
+    * <p>
     * Fails if there is no call statement
     *
     * @param statement The statement to add.
     */
    public void addStatementBeforeCall(Statement newStatement) {
       ListIterator<Statement> listIterator = statements.listIterator();
-      while (listIterator.hasNext()) {
+      while(listIterator.hasNext()) {
          Statement statement = listIterator.next();
          if(statement instanceof StatementCall) {
             listIterator.previous();
@@ -85,17 +87,17 @@ public class ControlFlowBlock {
             return;
          }
       }
-      throw new RuntimeException("No call statement in block "+getLabel().getFullName());
-   }
-
-   public void setDefaultSuccessor(LabelRef defaultSuccessor) {
-      this.defaultSuccessor = defaultSuccessor;
+      throw new RuntimeException("No call statement in block " + getLabel().getFullName());
    }
 
    public LabelRef getDefaultSuccessor() {
       return defaultSuccessor;
    }
 
+   public void setDefaultSuccessor(LabelRef defaultSuccessor) {
+      this.defaultSuccessor = defaultSuccessor;
+   }
+
    public LabelRef getConditionalSuccessor() {
       return conditionalSuccessor;
    }
@@ -118,6 +120,7 @@ public class ControlFlowBlock {
 
    /**
     * Is the block the entry of a procedure, ie. the first block of the code of the procedure.
+    *
     * @return true if this is the entry of a procedure
     */
    public boolean isProcedureEntry(Program program) {
@@ -126,7 +129,8 @@ public class ControlFlowBlock {
    }
 
    /**
-    *  Is the block the exit of a procedure, ie. the last block of code of the the procedure
+    * Is the block the exit of a procedure, ie. the last block of code of the the procedure
+    *
     * @param program
     * @return true if this is the exit of a procedure
     */
@@ -139,12 +143,12 @@ public class ControlFlowBlock {
       ControlFlowGraph graph = program.getGraph();
       StringBuffer out = new StringBuffer();
       out.append(label.getFullName() + ":");
-      out.append(" scope:["+scope.getFullName()+"] ");
+      out.append(" scope:[" + scope.getFullName() + "] ");
       out.append(" from");
-      if (graph != null) {
+      if(graph != null) {
          List<ControlFlowBlock> predecessors = graph.getPredecessors(this);
-         if (predecessors.size() > 0) {
-            for (ControlFlowBlock predecessor : predecessors) {
+         if(predecessors.size() > 0) {
+            for(ControlFlowBlock predecessor : predecessors) {
                out.append(" " + predecessor.getLabel().getFullName());
             }
          }
@@ -152,10 +156,10 @@ public class ControlFlowBlock {
          out.append(" @UNKNOWN");
       }
       out.append("\n");
-      for (Statement statement : statements) {
+      for(Statement statement : statements) {
          out.append("  " + statement.toString(program, true) + "\n");
       }
-      if (defaultSuccessor != null) {
+      if(defaultSuccessor != null) {
          out.append("  to:");
          out.append(defaultSuccessor.getFullName());
          out.append("\n");
@@ -165,16 +169,16 @@ public class ControlFlowBlock {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       ControlFlowBlock that = (ControlFlowBlock) o;
 
-      if (!label.equals(that.label)) return false;
-      if (statements != null ? !statements.equals(that.statements) : that.statements != null) return false;
-      if (defaultSuccessor != null ? !defaultSuccessor.equals(that.defaultSuccessor) : that.defaultSuccessor != null)
+      if(!label.equals(that.label)) return false;
+      if(statements != null ? !statements.equals(that.statements) : that.statements != null) return false;
+      if(defaultSuccessor != null ? !defaultSuccessor.equals(that.defaultSuccessor) : that.defaultSuccessor != null)
          return false;
-      if (conditionalSuccessor != null ? !conditionalSuccessor.equals(that.conditionalSuccessor) : that.conditionalSuccessor != null)
+      if(conditionalSuccessor != null ? !conditionalSuccessor.equals(that.conditionalSuccessor) : that.conditionalSuccessor != null)
          return false;
       return callSuccessor != null ? callSuccessor.equals(that.callSuccessor) : that.callSuccessor == null;
    }
@@ -191,15 +195,16 @@ public class ControlFlowBlock {
 
    /**
     * Get the phi block for the block. If the phi block has not yet been created it is created.
+    *
     * @return
     */
    @JsonIgnore
    public StatementPhiBlock getPhiBlock() {
       StatementPhiBlock phiBlock = null;
-      if (statements.size() > 0 && statements.get(0) instanceof StatementPhiBlock) {
+      if(statements.size() > 0 && statements.get(0) instanceof StatementPhiBlock) {
          phiBlock = (StatementPhiBlock) statements.get(0);
       }
-      if (phiBlock == null) {
+      if(phiBlock == null) {
          phiBlock = new StatementPhiBlock();
          statements.add(0, phiBlock);
       }
@@ -207,8 +212,8 @@ public class ControlFlowBlock {
    }
 
    public boolean hasPhiBlock() {
-      if (statements.size() > 0) {
-         if (statements.get(0) instanceof StatementPhiBlock) {
+      if(statements.size() > 0) {
+         if(statements.get(0) instanceof StatementPhiBlock) {
             return true;
          }
       }
@@ -216,20 +221,21 @@ public class ControlFlowBlock {
    }
 
 
-   /** Get all successors of the block
+   /**
+    * Get all successors of the block
     *
     * @return All successors
     */
    @JsonIgnore
    public Collection<LabelRef> getSuccessors() {
       List<LabelRef> successors = new ArrayList<>();
-      if (defaultSuccessor != null) {
+      if(defaultSuccessor != null) {
          successors.add(defaultSuccessor);
       }
-      if (conditionalSuccessor != null) {
+      if(conditionalSuccessor != null) {
          successors.add(conditionalSuccessor);
       }
-      if (callSuccessor != null) {
+      if(callSuccessor != null) {
          successors.add(callSuccessor);
       }
       return successors;
diff --git a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
index 8e851c313..978d17f1e 100644
--- a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
+++ b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
@@ -50,9 +50,9 @@ public class ControlFlowGraph {
 
    @JsonIgnore
    public Collection<ControlFlowBlock> getAllBlocks() {
-      if (sequence != null) {
+      if(sequence != null) {
          ArrayList<ControlFlowBlock> blocks = new ArrayList<>();
-         for (LabelRef labelRef : sequence) {
+         for(LabelRef labelRef : sequence) {
             blocks.add(getBlock(labelRef));
          }
          return blocks;
@@ -72,11 +72,11 @@ public class ControlFlowGraph {
     * @return The assignment. null if the variable is not assigned. The variable is assigned by a Phi-statement instead.
     */
    public StatementAssignment getAssignment(VariableRef variable) {
-      for (ControlFlowBlock block : getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementAssignment) {
+      for(ControlFlowBlock block : getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
-               if (assignment.getlValue().equals(variable)) {
+               if(assignment.getlValue().equals(variable)) {
                   return assignment;
                }
             }
@@ -92,15 +92,15 @@ public class ControlFlowGraph {
     * @return The block containing the assignment. null if the variable is not assigned.
     */
    public ControlFlowBlock getAssignmentBlock(VariableRef variable) {
-      for (ControlFlowBlock block : getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementAssignment) {
+      for(ControlFlowBlock block : getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
-               if (assignment.getlValue().equals(variable)) {
+               if(assignment.getlValue().equals(variable)) {
                   return block;
                }
             } else if(statement instanceof StatementPhiBlock) {
-               for (StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
+               for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
                   if(phiVariable.getVariable().equals(variable)) {
                      return block;
                   }
@@ -113,7 +113,7 @@ public class ControlFlowGraph {
 
 
    public ControlFlowBlock getDefaultSuccessor(ControlFlowBlock block) {
-      if (block.getDefaultSuccessor() != null) {
+      if(block.getDefaultSuccessor() != null) {
          return blocks.get(block.getDefaultSuccessor());
       } else {
          return null;
@@ -121,7 +121,7 @@ public class ControlFlowGraph {
    }
 
    public ControlFlowBlock getCallSuccessor(ControlFlowBlock block) {
-      if (block.getCallSuccessor() != null) {
+      if(block.getCallSuccessor() != null) {
          return blocks.get(block.getCallSuccessor());
       } else {
          return null;
@@ -129,7 +129,7 @@ public class ControlFlowGraph {
    }
 
    public ControlFlowBlock getConditionalSuccessor(ControlFlowBlock block) {
-      if (block.getConditionalSuccessor() != null) {
+      if(block.getConditionalSuccessor() != null) {
          return blocks.get(block.getConditionalSuccessor());
       } else {
          return null;
@@ -139,14 +139,14 @@ public class ControlFlowGraph {
 
    public List<ControlFlowBlock> getPredecessors(ControlFlowBlock block) {
       ArrayList<ControlFlowBlock> predecessorBlocks = new ArrayList<>();
-      for (ControlFlowBlock other : getAllBlocks()) {
-         if (block.getLabel().equals(other.getDefaultSuccessor())) {
+      for(ControlFlowBlock other : getAllBlocks()) {
+         if(block.getLabel().equals(other.getDefaultSuccessor())) {
             predecessorBlocks.add(other);
          }
-         if (block.getLabel().equals(other.getConditionalSuccessor())) {
+         if(block.getLabel().equals(other.getConditionalSuccessor())) {
             predecessorBlocks.add(other);
          }
-         if (block.getLabel().equals(other.getCallSuccessor())) {
+         if(block.getLabel().equals(other.getCallSuccessor())) {
             predecessorBlocks.add(other);
          }
       }
@@ -164,9 +164,9 @@ public class ControlFlowGraph {
 
    @JsonIgnore
    public ControlFlowBlock getMainBlock() {
-      for (ControlFlowBlock block : getAllBlocks()) {
+      for(ControlFlowBlock block : getAllBlocks()) {
          LabelRef label = block.getLabel();
-         if (label.getFullName().equals("main")) {
+         if(label.getFullName().equals("main")) {
             return block;
          }
       }
@@ -180,7 +180,7 @@ public class ControlFlowGraph {
 
    public String toString(Program program) {
       StringBuffer out = new StringBuffer();
-      for (ControlFlowBlock block : getAllBlocks()) {
+      for(ControlFlowBlock block : getAllBlocks()) {
          out.append(block.toString(program));
       }
       return out.toString();
@@ -188,13 +188,13 @@ public class ControlFlowGraph {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       ControlFlowGraph that = (ControlFlowGraph) o;
 
-      if (!blocks.equals(that.blocks)) return false;
-      if (!firstBlockRef.equals(that.firstBlockRef)) return false;
+      if(!blocks.equals(that.blocks)) return false;
+      if(!firstBlockRef.equals(that.firstBlockRef)) return false;
       return sequence != null ? sequence.equals(that.sequence) : that.sequence == null;
    }
 
@@ -213,9 +213,9 @@ public class ControlFlowGraph {
     * @return The statement
     */
    public Statement getStatementByIndex(int statementIdx) {
-      for (ControlFlowBlock block : getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statementIdx == statement.getIndex()) {
+      for(ControlFlowBlock block : getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statementIdx == statement.getIndex()) {
                return statement;
             }
          }
@@ -231,8 +231,8 @@ public class ControlFlowGraph {
     */
    public List<ControlFlowBlock> getScopeBlocks(ScopeRef scope) {
       ArrayList<ControlFlowBlock> scopeBlocks = new ArrayList<>();
-      for (ControlFlowBlock block : getAllBlocks()) {
-         if (block.getScope().equals(scope)) {
+      for(ControlFlowBlock block : getAllBlocks()) {
+         if(block.getScope().equals(scope)) {
             scopeBlocks.add(block);
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphBaseVisitor.java b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphBaseVisitor.java
index 3e813a3b6..66935f3eb 100644
--- a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphBaseVisitor.java
+++ b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphBaseVisitor.java
@@ -7,14 +7,14 @@ public class ControlFlowGraphBaseVisitor<T> {
 
    public T visitGraph(ControlFlowGraph graph) {
       Collection<ControlFlowBlock> blocks = graph.getAllBlocks();
-      for (ControlFlowBlock block : blocks) {
+      for(ControlFlowBlock block : blocks) {
          this.visitBlock(block);
       }
       return null;
    }
 
    public T visitBlock(ControlFlowBlock block) {
-      for (Statement statement : block.getStatements()) {
+      for(Statement statement : block.getStatements()) {
          this.visitStatement(statement);
       }
       return null;
@@ -42,7 +42,7 @@ public class ControlFlowGraphBaseVisitor<T> {
       } else if(statement instanceof StatementAsm) {
          return visitAsm((StatementAsm) statement);
       } else {
-         throw new RuntimeException("Unhandled statement type "+statement);
+         throw new RuntimeException("Unhandled statement type " + statement);
       }
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphCopyVisitor.java b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphCopyVisitor.java
index ece1c5a69..a4a958019 100644
--- a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphCopyVisitor.java
+++ b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraphCopyVisitor.java
@@ -33,9 +33,9 @@ public class ControlFlowGraphCopyVisitor extends ControlFlowGraphBaseVisitor<Obj
       this.origGraph = origGraph;
       // Copy all blocks
       this.copyBlockMap = new LinkedHashMap<>();
-      for (ControlFlowBlock origBlock : origGraph.getAllBlocks()) {
+      for(ControlFlowBlock origBlock : origGraph.getAllBlocks()) {
          ControlFlowBlock copyBlock = visitBlock(origBlock);
-         if (copyBlock != null) {
+         if(copyBlock != null) {
             copyBlockMap.put(copyBlock.getLabel(), copyBlock);
          }
       }
@@ -52,20 +52,20 @@ public class ControlFlowGraphCopyVisitor extends ControlFlowGraphBaseVisitor<Obj
       this.copyBlock = copyBlock;
       // Handle statements
       List<Statement> origBlockStatements = origBlock.getStatements();
-      for (Statement origStatement : origBlockStatements) {
+      for(Statement origStatement : origBlockStatements) {
          Statement copyStatement = visitStatement(origStatement);
-         if (copyStatement != null) {
+         if(copyStatement != null) {
             this.copyBlock.addStatement(copyStatement);
          }
       }
       // Handle successors
-      if (origBlock.getDefaultSuccessor() != null) {
+      if(origBlock.getDefaultSuccessor() != null) {
          this.copyBlock.setDefaultSuccessor(origBlock.getDefaultSuccessor());
       }
-      if (origBlock.getConditionalSuccessor() != null) {
+      if(origBlock.getConditionalSuccessor() != null) {
          this.copyBlock.setConditionalSuccessor(origBlock.getConditionalSuccessor());
       }
-      if (origBlock.getCallSuccessor() != null) {
+      if(origBlock.getCallSuccessor() != null) {
          this.copyBlock.setCallSuccessor(origBlock.getCallSuccessor());
       }
       ControlFlowBlock result = this.copyBlock;
@@ -120,10 +120,10 @@ public class ControlFlowGraphCopyVisitor extends ControlFlowGraphBaseVisitor<Obj
    @Override
    public StatementPhiBlock visitPhiBlock(StatementPhiBlock phi) {
       StatementPhiBlock copyPhi = new StatementPhiBlock();
-      for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+      for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
          VariableRef variable = phiVariable.getVariable();
          StatementPhiBlock.PhiVariable copyVar = copyPhi.addPhiVariable(variable);
-         for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+         for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
             copyVar.setrValue(phiRValue.getPredecessor(), phiRValue.getrValue());
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/DominatorsBlock.java b/src/main/java/dk/camelot64/kickc/model/DominatorsBlock.java
index 187b0b484..e25a54b36 100644
--- a/src/main/java/dk/camelot64/kickc/model/DominatorsBlock.java
+++ b/src/main/java/dk/camelot64/kickc/model/DominatorsBlock.java
@@ -5,12 +5,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-/** The Dominators for a specific block.
+/**
+ * The Dominators for a specific block.
  * <p>
  * Definition: Block d dominates block i if all paths from entry to block i includes block d
  * <p>
  * See http://www.cs.colostate.edu/~cs553/ClassNotes/lecture09-control-dominators.ppt.pdf
- * */
+ */
 public class DominatorsBlock {
 
    /**
@@ -37,7 +38,7 @@ public class DominatorsBlock {
     * @param dominators The dominators to add
     */
    public void addAll(Collection<LabelRef> dominators) {
-      for (LabelRef dominator : dominators) {
+      for(LabelRef dominator : dominators) {
          add(dominator);
       }
 
@@ -51,9 +52,9 @@ public class DominatorsBlock {
     */
    public void intersect(DominatorsBlock other) {
       Iterator<LabelRef> iterator = dominators.iterator();
-      while (iterator.hasNext()) {
+      while(iterator.hasNext()) {
          LabelRef dominator = iterator.next();
-         if (!other.contains(dominator)) {
+         if(!other.contains(dominator)) {
             iterator.remove();
          }
       }
@@ -75,8 +76,8 @@ public class DominatorsBlock {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       DominatorsBlock that = (DominatorsBlock) o;
 
@@ -91,7 +92,7 @@ public class DominatorsBlock {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (LabelRef dominator : dominators) {
+      for(LabelRef dominator : dominators) {
          out.append(dominator);
          out.append(" ");
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/DominatorsGraph.java b/src/main/java/dk/camelot64/kickc/model/DominatorsGraph.java
index 654cfca39..2130fb9c9 100644
--- a/src/main/java/dk/camelot64/kickc/model/DominatorsGraph.java
+++ b/src/main/java/dk/camelot64/kickc/model/DominatorsGraph.java
@@ -3,13 +3,13 @@ package dk.camelot64.kickc.model;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-/** Dominators for a control flow graph.
+/**
+ * Dominators for a control flow graph.
  * <p>
  * Definition: Block d dominates block i if all paths from entry to block i includes block d
  * <p>
  * See http://www.cs.colostate.edu/~cs553/ClassNotes/lecture09-control-dominators.ppt.pdf
- *
- * */
+ */
 public class DominatorsGraph {
 
    /**
@@ -47,7 +47,7 @@ public class DominatorsGraph {
    /**
     * Set the dominators for a specific block
     *
-    * @param block      The block
+    * @param block The block
     * @param dominators The new dominators
     */
    public void setDominators(LabelRef block, DominatorsBlock dominators) {
@@ -57,7 +57,7 @@ public class DominatorsGraph {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (LabelRef block : blockDominators.keySet()) {
+      for(LabelRef block : blockDominators.keySet()) {
          DominatorsBlock dominators = getDominators(block);
          out.append(block);
          out.append(" dominated by  ");
diff --git a/src/main/java/dk/camelot64/kickc/model/LValue.java b/src/main/java/dk/camelot64/kickc/model/LValue.java
index a98c937e9..37b2f53b2 100644
--- a/src/main/java/dk/camelot64/kickc/model/LValue.java
+++ b/src/main/java/dk/camelot64/kickc/model/LValue.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** Assignable value (capable of being on the left part of an assignment)*/
+/** Assignable value (capable of being on the left part of an assignment) */
 public interface LValue extends RValue {
 
    /**
diff --git a/src/main/java/dk/camelot64/kickc/model/Label.java b/src/main/java/dk/camelot64/kickc/model/Label.java
index 29756c032..20d3d6ffd 100644
--- a/src/main/java/dk/camelot64/kickc/model/Label.java
+++ b/src/main/java/dk/camelot64/kickc/model/Label.java
@@ -47,10 +47,10 @@ public class Label implements Symbol {
 
    @Override
    public int getScopeDepth() {
-      if(scope==null) {
+      if(scope == null) {
          return 0;
       } else {
-         return scope.getScopeDepth()+1;
+         return scope.getScopeDepth() + 1;
       }
    }
 
@@ -70,13 +70,13 @@ public class Label implements Symbol {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       Label label = (Label) o;
 
-      if (intermediate != label.intermediate) return false;
-      if (!name.equals(label.name)) return false;
+      if(intermediate != label.intermediate) return false;
+      if(!name.equals(label.name)) return false;
       return getFullName().equals(label.getFullName());
    }
 
@@ -94,10 +94,10 @@ public class Label implements Symbol {
 
    @Override
    public String toString(Program program) {
-      if(program ==null) {
+      if(program == null) {
          return getFullName();
-      }  else {
-         return "("+getType().getTypeName() + ") "+getFullName();
+      } else {
+         return "(" + getType().getTypeName() + ") " + getFullName();
       }
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/LabelRef.java b/src/main/java/dk/camelot64/kickc/model/LabelRef.java
index 32b00b9c2..7b2b5d83c 100644
--- a/src/main/java/dk/camelot64/kickc/model/LabelRef.java
+++ b/src/main/java/dk/camelot64/kickc/model/LabelRef.java
@@ -3,7 +3,7 @@ package dk.camelot64.kickc.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/**  A reference to a label */
+/** A reference to a label */
 public class LabelRef extends SymbolRef {
 
    @JsonCreator
diff --git a/src/main/java/dk/camelot64/kickc/model/LiveRange.java b/src/main/java/dk/camelot64/kickc/model/LiveRange.java
index 154c38746..cb69cfe17 100644
--- a/src/main/java/dk/camelot64/kickc/model/LiveRange.java
+++ b/src/main/java/dk/camelot64/kickc/model/LiveRange.java
@@ -16,6 +16,154 @@ public class LiveRange {
     */
    private List<LiveInterval> intervals;
 
+   public LiveRange() {
+      this.intervals = new ArrayList<>();
+   }
+
+   /**
+    * Add a statement to the live range
+    *
+    * @param statement The statement to add
+    * @return true if the live range was modified by the addition. false otherwise
+    */
+   public boolean add(Statement statement) {
+      return add(getIndex(statement));
+   }
+
+   private Integer getIndex(Statement statement) {
+      Integer index = statement.getIndex();
+      if(index == null) {
+         throw new RuntimeException("Statement index not defined! Live Ranges only work after defining statement indexes (Pass3LiveRangesAnalysis.generateStatementIndices).");
+      }
+      return index;
+   }
+
+   /**
+    * Get the number of statements in the live range.
+    *
+    * @return The number of statements in the live range.
+    */
+   public int size() {
+      int s = 0;
+      for(LiveInterval interval : intervals) {
+         s += interval.size();
+      }
+      return s;
+   }
+
+   /**
+    * Add an index to the live range
+    *
+    * @param index The index to add
+    * @return true if the live range was modified. false otherwise
+    */
+   public boolean add(int index) {
+      for(int i = 0; i < intervals.size(); i++) {
+         LiveInterval interval = intervals.get(i);
+         if(index < interval.firstStatementIdx - 1) {
+            // Add new interval before the current interval
+            intervals.add(i, new LiveInterval(index, index));
+            return true;
+         } else if(index == interval.firstStatementIdx - 1) {
+            // Extend the current interval downward
+            interval.firstStatementIdx = index;
+            return true;
+         } else if(index <= interval.lastStatementIdx) {
+            // Already inside the interval
+            return false;
+         } else if(index == interval.lastStatementIdx + 1) {
+            // Extend current interval upward - and check if next interval should be merged
+            interval.lastStatementIdx = index;
+            if(i < intervals.size() - 1) {
+               LiveInterval nextInterval = intervals.get(i + 1);
+               if(nextInterval.firstStatementIdx == index + 1) {
+                  // Merge intervals
+                  interval.lastStatementIdx = nextInterval.lastStatementIdx;
+                  intervals.remove(i + 1);
+               }
+            }
+            return true;
+         }
+      }
+      // Not added yet - add a new interval at the end
+      intervals.add(new LiveInterval(index, index));
+      return true;
+   }
+
+   /**
+    * Determines if this live range overlaps another live range
+    *
+    * @param other The other live range
+    * @return true if there is an overlap
+    */
+   public boolean overlaps(LiveRange other) {
+      if(this.getMaxIndex() == -1 || other.getMaxIndex() == -1) {
+         return false;
+      }
+      int maxIdx = getMaxIndex();
+      for(int i = 0; i <= maxIdx; i++) {
+         if(contains(i) && other.contains(i)) {
+            return true;
+         }
+      }
+      return false;
+   }
+
+   /**
+    * Adds another live range to this one - extending this live range to include the other one.
+    *
+    * @param other The live range to add
+    */
+   public void add(LiveRange other) {
+      int otherMaxIndex = other.getMaxIndex();
+      for(int i = 0; i <= otherMaxIndex; i++) {
+         if(other.contains(i)) {
+            add(i);
+         }
+      }
+   }
+
+   /**
+    * Determines if the live range contains a statement
+    *
+    * @param statement The statement to examine
+    * @return true if the live range contains the statement
+    */
+   public boolean contains(Statement statement) {
+      return contains(getIndex(statement));
+   }
+
+   /**
+    * Determines if the live range contains an index
+    *
+    * @param index
+    * @return true if the live range contains the index
+    */
+   private boolean contains(int index) {
+      for(LiveInterval interval : intervals) {
+         if(interval.lastStatementIdx >= index) {
+            if(interval.firstStatementIdx <= index) {
+               return true;
+            } else {
+               return false;
+            }
+         }
+      }
+      return false;
+   }
+
+   /**
+    * Get the maximal index contained in the live range
+    *
+    * @return The max index. -1 if the range is empty.
+    */
+   int getMaxIndex() {
+      if(intervals.isEmpty()) {
+         return -1;
+      }
+      return intervals.get(intervals.size() - 1).lastStatementIdx;
+   }
+
    public static class LiveInterval {
 
       /**
@@ -48,157 +196,16 @@ public class LiveRange {
          return lastStatementIdx;
       }
 
-      /** Get the number of statements in the live interval.
+      /**
+       * Get the number of statements in the live interval.
        *
        * @return The number of statements in the live interval.
        */
       public int size() {
-         return lastStatementIdx-firstStatementIdx+1;
+         return lastStatementIdx - firstStatementIdx + 1;
       }
 
    }
 
-   public LiveRange() {
-      this.intervals = new ArrayList<>();
-   }
-
-   /**
-    * Add a statement to the live range
-    *
-    * @param statement The statement to add
-    * @return true if the live range was modified by the addition. false otherwise
-    */
-   public boolean add(Statement statement) {
-      return add(getIndex(statement));
-   }
-
-   private Integer getIndex(Statement statement) {
-      Integer index = statement.getIndex();
-      if (index == null) {
-         throw new RuntimeException("Statement index not defined! Live Ranges only work after defining statement indexes (Pass3LiveRangesAnalysis.generateStatementIndices).");
-      }
-      return index;
-   }
-
-   /** Get the number of statements in the live range.
-    *
-    * @return The number of statements in the live range.
-    */
-   public int size() {
-      int s = 0;
-      for (LiveInterval interval : intervals) {
-         s += interval.size();
-      }
-      return s;
-   }
-
-
-   /**
-    * Add an index to the live range
-    * @param index The index to add
-    * @return true if the live range was modified. false otherwise
-    */
-   public boolean add(int index) {
-      for (int i = 0; i < intervals.size(); i++) {
-         LiveInterval interval = intervals.get(i);
-         if (index < interval.firstStatementIdx - 1) {
-            // Add new interval before the current interval
-            intervals.add(i, new LiveInterval(index, index));
-            return true;
-         } else if(index == interval.firstStatementIdx - 1) {
-            // Extend the current interval downward
-            interval.firstStatementIdx = index;
-            return true;
-         } else if(index <= interval.lastStatementIdx) {
-            // Already inside the interval
-            return false;
-         } else if(index == interval.lastStatementIdx+1) {
-            // Extend current interval upward - and check if next interval should be merged
-            interval.lastStatementIdx = index;
-            if(i<intervals.size()-1) {
-               LiveInterval nextInterval = intervals.get(i + 1);
-               if(nextInterval.firstStatementIdx==index+1) {
-                  // Merge intervals
-                  interval.lastStatementIdx = nextInterval.lastStatementIdx;
-                  intervals.remove(i+1);
-               }
-            }
-            return true;
-         }
-      }
-      // Not added yet - add a new interval at the end
-      intervals.add(new LiveInterval(index, index));
-      return true;
-   }
-
-   /**
-    * Determines if this live range overlaps another live range
-    * @param other The other live range
-    * @return true if there is an overlap
-    */
-   public boolean overlaps(LiveRange other) {
-      if(this.getMaxIndex()==-1 || other.getMaxIndex()==-1) {
-         return false;
-      }
-      int maxIdx = getMaxIndex();
-      for(int i=0;i<=maxIdx; i++) {
-         if(contains(i) && other.contains(i)) {
-            return true;
-         }
-      }
-      return false;
-   }
-
-   /**
-    * Adds another live range to this one - extending this live range to include the other one.
-    * @param other The live range to add
-    */
-   public void add(LiveRange other) {
-      int otherMaxIndex = other.getMaxIndex();
-      for(int i=0;i<=otherMaxIndex; i++) {
-         if(other.contains(i)) {
-            add(i);
-         }
-      }
-   }
-
-   /**
-    * Determines if the live range contains a statement
-    * @param statement The statement to examine
-    * @return true if the live range contains the statement
-    */
-   public boolean contains(Statement statement) {
-      return contains(getIndex(statement));
-   }
-
-   /**
-    * Determines if the live range contains an index
-    * @param index
-    * @return true if the live range contains the index
-    */
-   private boolean contains(int index) {
-      for (LiveInterval interval : intervals) {
-         if(interval.lastStatementIdx>=index) {
-            if(interval.firstStatementIdx<=index) {
-               return true;
-            } else {
-               return false;
-            }
-         }
-      }
-      return false;
-   }
-
-   /**
-    * Get the maximal index contained in the live range
-    * @return The max index. -1 if the range is empty.
-    */
-   int getMaxIndex() {
-      if(intervals.isEmpty()) {
-         return -1;
-      }
-      return intervals.get(intervals.size()-1).lastStatementIdx;
-   }
-
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClass.java b/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClass.java
index a33a370b2..0efb9f633 100644
--- a/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClass.java
+++ b/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClass.java
@@ -46,7 +46,7 @@ public class LiveRangeEquivalenceClass {
       }
       LiveRangeVariables liveRanges = set.getProgram().getLiveRangeVariables();
       LiveRange varLiveRange = liveRanges.getLiveRange(variable);
-      if (liveRange.overlaps(varLiveRange)) {
+      if(liveRange.overlaps(varLiveRange)) {
          throw new RuntimeException("Compilation error! Variable live range overlaps live range equivalence class live range. " + variable);
       }
       liveRange.add(varLiveRange);
@@ -75,15 +75,15 @@ public class LiveRangeEquivalenceClass {
    public void addAll(LiveRangeEquivalenceClass other) {
       liveRange.add(other.liveRange);
       variables.addAll(other.variables);
-      for (VariableRef variable : other.variables) {
+      for(VariableRef variable : other.variables) {
          set.setVarClass(variable, this);
       }
    }
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
       LiveRangeEquivalenceClass that = (LiveRangeEquivalenceClass) o;
       return variables.equals(that.variables);
    }
@@ -100,11 +100,11 @@ public class LiveRangeEquivalenceClass {
 
    public String toString(boolean includeRegister) {
       StringBuilder s = new StringBuilder();
-      if(includeRegister && register!=null) {
+      if(includeRegister && register != null) {
          s.append(register.toString()).append(" ");
       }
       s.append("[ ");
-      for (VariableRef variable : variables) {
+      for(VariableRef variable : variables) {
          s.append(variable.toString());
          s.append(" ");
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClassSet.java b/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClassSet.java
index f2edbae16..bc681f999 100644
--- a/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClassSet.java
+++ b/src/main/java/dk/camelot64/kickc/model/LiveRangeEquivalenceClassSet.java
@@ -10,21 +10,19 @@ import java.util.Map;
  */
 public class LiveRangeEquivalenceClassSet {
 
+   /**
+    * Maps variables to their containing class.
+    */
+   Map<VariableRef, LiveRangeEquivalenceClass> varClass;
    /**
     * The containing program.
     */
    private Program program;
-
    /**
     * The equivalence classes of the set.
     */
    private List<LiveRangeEquivalenceClass> equivalenceClasses;
 
-   /**
-    * Maps variables to their containing class.
-    */
-   Map<VariableRef, LiveRangeEquivalenceClass> varClass;
-
    public LiveRangeEquivalenceClassSet(Program program) {
       this.program = program;
       this.equivalenceClasses = new ArrayList<>();
@@ -49,7 +47,7 @@ public class LiveRangeEquivalenceClassSet {
     */
    public LiveRangeEquivalenceClass getOrCreateEquivalenceClass(VariableRef variable) {
       LiveRangeEquivalenceClass equivalenceClass = getEquivalenceClass(variable);
-      if (equivalenceClass != null) {
+      if(equivalenceClass != null) {
          return equivalenceClass;
       }
       // Not found - create it
@@ -62,6 +60,7 @@ public class LiveRangeEquivalenceClassSet {
    /**
     * Consolidates two live range equivalence calsses into one.
     * All variables and live ranges from the other class is added to the first one - and the other one is deleted.
+    *
     * @param equivalenceClass The first live range equivalence class.
     * @param otherEquivalenceClass The other live range equivalence class, that is added to the first and deleted.
     */
@@ -73,7 +72,7 @@ public class LiveRangeEquivalenceClassSet {
    /**
     * Informs the set that class of a variable has ben set - called by add/remove methods inside LiveRangeEquivalenceClass
     *
-    * @param variable         The variable
+    * @param variable The variable
     * @param equivalenceClass The class
     */
    void setVarClass(VariableRef variable, LiveRangeEquivalenceClass equivalenceClass) {
@@ -102,9 +101,9 @@ public class LiveRangeEquivalenceClassSet {
     * Store the register allocation of the live range equivalence classes into the variables in the symbol table (program scope).
     */
    public void storeRegisterAllocation() {
-      for (LiveRangeEquivalenceClass equivalenceClass : getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : getEquivalenceClasses()) {
          Registers.Register register = equivalenceClass.getRegister();
-         for (VariableRef variable : equivalenceClass.getVariables()) {
+         for(VariableRef variable : equivalenceClass.getVariables()) {
             Variable var = program.getSymbolInfos().getVariable(variable);
             var.setAllocation(register);
          }
diff --git a/src/main/java/dk/camelot64/kickc/model/LiveRangeVariables.java b/src/main/java/dk/camelot64/kickc/model/LiveRangeVariables.java
index 6088d1538..8d3329566 100644
--- a/src/main/java/dk/camelot64/kickc/model/LiveRangeVariables.java
+++ b/src/main/java/dk/camelot64/kickc/model/LiveRangeVariables.java
@@ -1,8 +1,11 @@
 package dk.camelot64.kickc.model;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 
-/** Live ranges for all variables.
+/**
+ * Live ranges for all variables.
  * Created by {@link dk.camelot64.kickc.passes.Pass3CallGraphAnalysis}
  */
 public class LiveRangeVariables {
@@ -16,7 +19,8 @@ public class LiveRangeVariables {
       this.program = program;
    }
 
-   /** Add a single statement to the live range of a variable.
+   /**
+    * Add a single statement to the live range of a variable.
     *
     * @param variable The variable
     * @param statement The statement to add
@@ -24,7 +28,7 @@ public class LiveRangeVariables {
     */
    public boolean addAlive(VariableRef variable, Statement statement) {
       LiveRange liveRange = liveRanges.get(variable);
-      if (liveRange == null) {
+      if(liveRange == null) {
          liveRange = new LiveRange();
          liveRanges.put(variable, liveRange);
       }
@@ -33,11 +37,12 @@ public class LiveRangeVariables {
 
    /**
     * Add an empty alive range for a variable
+    *
     * @param variable The variable
     */
    public void addEmptyAlive(VariableRef variable) {
       LiveRange liveRange = liveRanges.get(variable);
-      if (liveRange == null) {
+      if(liveRange == null) {
          liveRange = new LiveRange();
          liveRanges.put(variable, liveRange);
       }
@@ -45,12 +50,13 @@ public class LiveRangeVariables {
 
    /**
     * Get all variables alive at a specific statement
+    *
     * @param statement The statement
     * @return List of all live variables.
     */
    public List<VariableRef> getAlive(Statement statement) {
       ArrayList<VariableRef> aliveVars = new ArrayList<>();
-      for (VariableRef variable : liveRanges.keySet()) {
+      for(VariableRef variable : liveRanges.keySet()) {
          LiveRange liveRange = liveRanges.get(variable);
          if(liveRange.contains(statement)) {
             aliveVars.add(variable);
@@ -61,6 +67,7 @@ public class LiveRangeVariables {
 
    /**
     * Get the alive range of a variable
+    *
     * @param variable The variable reference
     * @return The alive range for the variable
     */
diff --git a/src/main/java/dk/camelot64/kickc/model/LiveRangeVariablesEffective.java b/src/main/java/dk/camelot64/kickc/model/LiveRangeVariablesEffective.java
index d7094027f..f845ece9b 100644
--- a/src/main/java/dk/camelot64/kickc/model/LiveRangeVariablesEffective.java
+++ b/src/main/java/dk/camelot64/kickc/model/LiveRangeVariablesEffective.java
@@ -34,13 +34,84 @@ public class LiveRangeVariablesEffective {
       this.procedureCallPaths = procedureCallPaths;
       this.referenceInfo = referenceInfo;
       this.statementsLiveVariables = new LinkedHashMap<>();
-      for (ControlFlowBlock block : program.getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             statementsLiveVariables.put(statement.getIndex(), liveRangeVariables.getAlive(statement));
          }
       }
    }
 
+   /**
+    * Get all variables potentially alive at a statement.
+    * If the statement is inside a method this also includes all variables alive at the exit of any call.
+    * </p>
+    *
+    * @param statement The statement to examine
+    * @return All variables potentially alive at the statement
+    */
+   public Collection<VariableRef> getAliveEffective(Statement statement) {
+      Set<VariableRef> effectiveAliveTotal = new LinkedHashSet<>();
+      AliveCombinations aliveCombinations = getAliveCombinations(statement);
+      for(CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
+         Collection<VariableRef> alive = aliveCombinations.getEffectiveAliveAtStmt(callPath);
+         effectiveAliveTotal.addAll(alive);
+      }
+      return effectiveAliveTotal;
+   }
+
+   /**
+    * Get all combinations of variables alive at a statement.
+    * If the statement is inside a method the different combinations in the result arises from different calls of the method
+    * (recursively up til the main()-method.)
+    * Each combination includes all variables alive at the exit of any surrounding call.
+    * Also includes variable aliases that are part of the parameter assignments to the calls on the path.
+    * </p>
+    *
+    * @param statement The statement to examine
+    * @return All combinations of variables alive at the statement
+    */
+   public AliveCombinations getAliveCombinations(Statement statement) {
+      Collection<VariableRef> aliveAtStmt = statementsLiveVariables.get(statement.getIndex());
+      CallPaths callPaths;
+      Collection<VariableRef> referencedInProcedure;
+      ControlFlowBlock block = program.getStatementInfos().getBlock(statement);
+      ScopeRef scopeRef = block.getScope();
+      Scope scope = program.getScope().getScope(scopeRef);
+      if(scope instanceof Procedure) {
+         Procedure procedure = (Procedure) scope;
+         callPaths = procedureCallPaths.get(procedure.getRef());
+         referencedInProcedure = referenceInfo.getReferencedVars(procedure.getRef().getLabelRef());
+      } else {
+         callPaths = new CallPaths(Procedure.ROOT);
+         referencedInProcedure = new ArrayList<>();
+      }
+      Pass2AliasElimination.Aliases callAliases = null;
+      // Examine if the statement is a parameter assignment before a call
+      LabelRef callSuccessor = block.getCallSuccessor();
+      if(callSuccessor != null) {
+         ProcedureRef calledRef = new ProcedureRef(callSuccessor.getFullName());
+         CallPaths calledRefs = procedureCallPaths.get(calledRef);
+         for(CallPath calledPath : calledRefs.getCallPaths()) {
+            List<CallGraph.CallBlock.Call> path = calledPath.getPath();
+            CallGraph.CallBlock.Call lastCall = path.get(path.size() - 1);
+            Integer lastCallStatementIdx = lastCall.getCallStatementIdx();
+            LabelRef lastCallBlockRef = program.getStatementInfos().getBlockRef(lastCallStatementIdx);
+            if(lastCallBlockRef.equals(block.getLabel())) {
+               if(callAliases == null) {
+                  // Found a matching call!
+                  callAliases = calledPath.getInnerAliases();
+               } else {
+                  // Found another matching call!
+                  callAliases = new Pass2AliasElimination.Aliases(callAliases);
+                  callAliases.addAll(calledPath.getInnerAliases());
+               }
+            }
+         }
+      }
+
+      return new AliveCombinations(callPaths, referencedInProcedure, aliveAtStmt, callAliases);
+   }
+
    /**
     * All call-paths leading into a specific procedure.
     */
@@ -104,6 +175,7 @@ public class LiveRangeVariablesEffective {
 
       /**
        * The path from main() to the procedure. First element is the call to main(), last element is the call to the procedure.
+       *
        * @return Tha call path
        */
       public List<CallGraph.CallBlock.Call> getPath() {
@@ -112,6 +184,7 @@ public class LiveRangeVariablesEffective {
 
       /**
        * Alive variables on the call-path. Based on alive vars at each call in the path.
+       *
        * @return The alive variables
        */
       public Collection<VariableRef> getAlive() {
@@ -120,6 +193,7 @@ public class LiveRangeVariablesEffective {
 
       /**
        * Alias variables from the entire call-path. Any variables alias-assigned as part of a call on the path (in parameter assignment or phi block).
+       *
        * @return The aliases
        */
       public Pass2AliasElimination.Aliases getPathAliases() {
@@ -128,6 +202,7 @@ public class LiveRangeVariablesEffective {
 
       /**
        * Alias variables for the innermost call. Variables alias-assigned as part of the innermost call on the path (in parameter assignment or phi block).
+       *
        * @return The aliases
        */
       public Pass2AliasElimination.Aliases getInnerAliases() {
@@ -135,78 +210,6 @@ public class LiveRangeVariablesEffective {
       }
    }
 
-
-   /**
-    * Get all variables potentially alive at a statement.
-    * If the statement is inside a method this also includes all variables alive at the exit of any call.
-    * </p>
-    *
-    * @param statement The statement to examine
-    * @return All variables potentially alive at the statement
-    */
-   public Collection<VariableRef> getAliveEffective(Statement statement) {
-      Set<VariableRef> effectiveAliveTotal = new LinkedHashSet<>();
-      AliveCombinations aliveCombinations = getAliveCombinations(statement);
-      for (CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
-         Collection<VariableRef> alive = aliveCombinations.getEffectiveAliveAtStmt(callPath);
-         effectiveAliveTotal.addAll(alive);
-      }
-      return effectiveAliveTotal;
-   }
-
-   /**
-    * Get all combinations of variables alive at a statement.
-    * If the statement is inside a method the different combinations in the result arises from different calls of the method
-    * (recursively up til the main()-method.)
-    * Each combination includes all variables alive at the exit of any surrounding call.
-    * Also includes variable aliases that are part of the parameter assignments to the calls on the path.
-    * </p>
-    *
-    * @param statement The statement to examine
-    * @return All combinations of variables alive at the statement
-    */
-   public AliveCombinations getAliveCombinations(Statement statement) {
-      Collection<VariableRef> aliveAtStmt = statementsLiveVariables.get(statement.getIndex());
-      CallPaths callPaths;
-      Collection<VariableRef> referencedInProcedure;
-      ControlFlowBlock block = program.getStatementInfos().getBlock(statement);
-      ScopeRef scopeRef = block.getScope();
-      Scope scope = program.getScope().getScope(scopeRef);
-      if (scope instanceof Procedure) {
-         Procedure procedure = (Procedure) scope;
-         callPaths = procedureCallPaths.get(procedure.getRef());
-         referencedInProcedure = referenceInfo.getReferencedVars(procedure.getRef().getLabelRef());
-      } else {
-         callPaths = new CallPaths(Procedure.ROOT);
-         referencedInProcedure = new ArrayList<>();
-      }
-      Pass2AliasElimination.Aliases callAliases = null;
-      // Examine if the statement is a parameter assignment before a call
-      LabelRef callSuccessor = block.getCallSuccessor();
-      if(callSuccessor !=null) {
-         ProcedureRef calledRef = new ProcedureRef(callSuccessor.getFullName());
-         CallPaths calledRefs = procedureCallPaths.get(calledRef);
-         for (CallPath calledPath : calledRefs.getCallPaths()) {
-            List<CallGraph.CallBlock.Call> path = calledPath.getPath();
-            CallGraph.CallBlock.Call lastCall = path.get(path.size() - 1);
-            Integer lastCallStatementIdx = lastCall.getCallStatementIdx();
-            LabelRef lastCallBlockRef = program.getStatementInfos().getBlockRef(lastCallStatementIdx);
-            if(lastCallBlockRef.equals(block.getLabel())) {
-               if (callAliases == null) {
-                  // Found a matching call!
-                  callAliases = calledPath.getInnerAliases();
-               } else {
-                  // Found another matching call!
-                  callAliases = new Pass2AliasElimination.Aliases(callAliases);
-                  callAliases.addAll(calledPath.getInnerAliases());
-               }
-            }
-         }
-      }
-
-      return new AliveCombinations(callPaths, referencedInProcedure, aliveAtStmt, callAliases);
-   }
-
    /**
     * Combinations of variables effectively alive at a specific statement.
     * If the statement is inside a method the combinations are the live variables inside the method combined with each calling statements alive vars.
@@ -244,6 +247,7 @@ public class LiveRangeVariablesEffective {
 
       /**
        * Get all variables effective alive at the statement for a specific call path.
+       *
        * @param callPath The call path (returned from getCallPaths)
        * @return All variables effectively alive at the statement on the call-path
        */
@@ -259,7 +263,7 @@ public class LiveRangeVariablesEffective {
       }
 
       public Pass2AliasElimination.Aliases getEffectiveAliasesAtStmt(CallPath callPath) {
-         if(callAliases==null) {
+         if(callAliases == null) {
             return callPath.getPathAliases();
          } else {
             Pass2AliasElimination.Aliases aliases = new Pass2AliasElimination.Aliases();
diff --git a/src/main/java/dk/camelot64/kickc/model/LvalueIntermediate.java b/src/main/java/dk/camelot64/kickc/model/LvalueIntermediate.java
index 65051c5ca..a7c4932df 100644
--- a/src/main/java/dk/camelot64/kickc/model/LvalueIntermediate.java
+++ b/src/main/java/dk/camelot64/kickc/model/LvalueIntermediate.java
@@ -15,13 +15,13 @@ public class LvalueIntermediate implements LValue {
       return variable;
    }
 
+   public void setVariable(VariableRef variable) {
+      this.variable = variable;
+   }
+
    @Override
    public String toString(Program program) {
       return "lval" + "(" + variable.toString(program) + ")";
    }
 
-   public void setVariable(VariableRef variable) {
-      this.variable = variable;
-   }
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/NaturalLoop.java b/src/main/java/dk/camelot64/kickc/model/NaturalLoop.java
index b9639bce9..7a9a1e27f 100644
--- a/src/main/java/dk/camelot64/kickc/model/NaturalLoop.java
+++ b/src/main/java/dk/camelot64/kickc/model/NaturalLoop.java
@@ -64,19 +64,19 @@ public class NaturalLoop {
       out.append("Loop head: ")
             .append(head)
             .append(" tails: ");
-      for (LabelRef tail : tails) {
+      for(LabelRef tail : tails) {
          out.append(tail).append(" ");
       }
       out.append("blocks: ");
-      if (blocks != null) {
-         for (LabelRef block : blocks) {
+      if(blocks != null) {
+         for(LabelRef block : blocks) {
             out.append(block.toString()).append(" ");
          }
       } else {
          out.append("null");
       }
-      if(depth!=null) {
-         out.append(" depth: "+depth);
+      if(depth != null) {
+         out.append(" depth: " + depth);
       }
       return out.toString();
    }
@@ -88,8 +88,8 @@ public class NaturalLoop {
     * @return true if this loop contains the other loop
     */
    public boolean nests(NaturalLoop other) {
-      for (LabelRef otherBlock : other.getBlocks()) {
-         if (!blocks.contains(otherBlock)) {
+      for(LabelRef otherBlock : other.getBlocks()) {
+         if(!blocks.contains(otherBlock)) {
             return false;
          }
       }
@@ -98,6 +98,7 @@ public class NaturalLoop {
 
    /**
     * Add more tails to the loop
+    *
     * @param tails The tails to add
     */
    public void addTails(Set<LabelRef> tails) {
@@ -106,6 +107,7 @@ public class NaturalLoop {
 
    /**
     * Add more blocks to the loop
+    *
     * @param blocks The blocks to add
     */
    public void addBlocks(Set<LabelRef> blocks) {
@@ -122,13 +124,13 @@ public class NaturalLoop {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       NaturalLoop that = (NaturalLoop) o;
 
-      if (head != null ? !head.equals(that.head) : that.head != null) return false;
-      if (tails != null ? !tails.equals(that.tails) : that.tails != null) return false;
+      if(head != null ? !head.equals(that.head) : that.head != null) return false;
+      if(tails != null ? !tails.equals(that.tails) : that.tails != null) return false;
       return blocks != null ? blocks.equals(that.blocks) : that.blocks == null;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/NaturalLoopSet.java b/src/main/java/dk/camelot64/kickc/model/NaturalLoopSet.java
index c84a3ab12..191d9115c 100644
--- a/src/main/java/dk/camelot64/kickc/model/NaturalLoopSet.java
+++ b/src/main/java/dk/camelot64/kickc/model/NaturalLoopSet.java
@@ -2,10 +2,11 @@ package dk.camelot64.kickc.model;
 
 import java.util.*;
 
-/** A set of natural loops in a control flow graph.
+/**
+ * A set of natural loops in a control flow graph.
  * <p>For definitions and more see http://www.cs.colostate.edu/~cs553/ClassNotes/lecture09-control-dominators.ppt.pdf
  * <p>Created by {@link dk.camelot64.kickc.passes.Pass3LoopAnalysis}
- * */
+ */
 public class NaturalLoopSet {
 
    private List<NaturalLoop> loops;
@@ -25,6 +26,7 @@ public class NaturalLoopSet {
 
    /**
     * Get all the loops
+    *
     * @return The loops
     */
    public List<NaturalLoop> getLoops() {
@@ -34,7 +36,7 @@ public class NaturalLoopSet {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (NaturalLoop loop : loops) {
+      for(NaturalLoop loop : loops) {
          out.append(loop.toString());
          out.append("\n");
       }
@@ -43,11 +45,12 @@ public class NaturalLoopSet {
 
    /**
     * Get all blocks that are heads of a loop
+    *
     * @return The labels for all blocks that are head of a loop.
     */
    public Set<LabelRef> getLoopHeads() {
       LinkedHashSet<LabelRef> heads = new LinkedHashSet<>();
-      for (NaturalLoop loop : loops) {
+      for(NaturalLoop loop : loops) {
          heads.add(loop.getHead());
       }
       return heads;
@@ -55,12 +58,13 @@ public class NaturalLoopSet {
 
    /**
     * Get all loops with a given loop head
+    *
     * @param loopHead The loop head
     * @return Set with all loops that have the given head
     */
    public Set<NaturalLoop> getLoopsFromHead(LabelRef loopHead) {
       LinkedHashSet<NaturalLoop> result = new LinkedHashSet<>();
-      for (NaturalLoop loop : loops) {
+      for(NaturalLoop loop : loops) {
          if(loopHead.equals(loop.getHead())) {
             result.add(loop);
          }
@@ -76,8 +80,8 @@ public class NaturalLoopSet {
     */
    public Collection<NaturalLoop> getLoopsContainingBlock(LabelRef block) {
       ArrayList<NaturalLoop> containing = new ArrayList<>();
-      for (NaturalLoop loop : loops) {
-         for (LabelRef loopBlock : loop.getBlocks()) {
+      for(NaturalLoop loop : loops) {
+         for(LabelRef loopBlock : loop.getBlocks()) {
             if(block.equals(loopBlock)) {
                containing.add(loop);
                break;
@@ -90,6 +94,7 @@ public class NaturalLoopSet {
 
    /**
     * Remove a loop from the set
+    *
     * @param loop The loop to remove
     */
    public void remove(NaturalLoop loop) {
@@ -98,8 +103,8 @@ public class NaturalLoopSet {
 
    public int getMaxLoopDepth(LabelRef block) {
       int maxDepth = 0;
-      for (NaturalLoop loop : getLoopsContainingBlock(block)) {
-         if(loop.getDepth()>maxDepth) {
+      for(NaturalLoop loop : getLoopsContainingBlock(block)) {
+         if(loop.getDepth() > maxDepth) {
             maxDepth = loop.getDepth();
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/Operator.java b/src/main/java/dk/camelot64/kickc/model/Operator.java
index 1ab1646e8..188a0a406 100644
--- a/src/main/java/dk/camelot64/kickc/model/Operator.java
+++ b/src/main/java/dk/camelot64/kickc/model/Operator.java
@@ -5,14 +5,45 @@ package dk.camelot64.kickc.model;
  */
 public class Operator {
 
+   public static final Operator INCREMENT = new Operator("++", "_inc_", Type.UNARY, 1);
+   public static final Operator DECREMENT = new Operator("--", "_dec_", Type.UNARY, 1);
+   public static final Operator POS = new Operator("+", "_pos_", Type.UNARY, 2);
+   public static final Operator NEG = new Operator("-", "_neg_", Type.UNARY, 2);
+   public static final Operator BOOL_NOT = new Operator("~", "_not_", Type.UNARY, 2);
+   public static final Operator NOT = new Operator("!", "_not_", Type.UNARY, 2);
+   public static final Operator DEREF = new Operator("*", "_deref_", Type.UNARY, 2);
+   public static final Operator WORD = new Operator("w=", "_word_", Type.BINARY, 2);
+   public static final Operator DEREF_IDX = new Operator("*idx", "_derefidx_", Type.BINARY, 2);
+   public static final Operator SET_LOWBYTE = new Operator("lo=", "_setlo_", Type.BINARY, 2);
+   public static final Operator SET_HIBYTE = new Operator("hi=", "_sethi_", Type.BINARY, 2);
+   public static final Operator CAST_BYTE = new Operator("((byte))", "_byte_", Type.UNARY, 2);
+   public static final Operator CAST_SBYTE = new Operator("((signed byte))", "_sbyte_", Type.UNARY, 2);
+   public static final Operator CAST_WORD = new Operator("((word))", "_word_", Type.UNARY, 2);
+   public static final Operator CAST_SWORD = new Operator("((signed word))", "_sword_", Type.UNARY, 2);
+   public static final Operator CAST_PTRBY = new Operator("((byte*))", "_ptrby_", Type.UNARY, 2);
+   public static final Operator MULTIPLY = new Operator("*", "_mul_", Type.BINARY, 3);
+   public static final Operator DIVIDE = new Operator("/", "_div_", Type.BINARY, 3);
+   public static final Operator PLUS = new Operator("+", "_plus_", Type.BINARY, 4);
+   public static final Operator MINUS = new Operator("-", "_minus_", Type.BINARY, 4);
+   public static final Operator SHIFT_LEFT = new Operator("<<", "_rol_", Type.BINARY, 5);
+   public static final Operator SHIFT_RIGHT = new Operator(">>", "_ror_", Type.BINARY, 5);
+   public static final Operator LOWBYTE = new Operator("<", "_lo_", Type.UNARY, 6);
+   public static final Operator HIBYTE = new Operator(">", "_hi_", Type.UNARY, 6);
+   public static final Operator LT = new Operator("<", "_lt_", Type.BINARY, 7);
+   public static final Operator LE = new Operator("<=", "_le_", Type.BINARY, 7);
+   public static final Operator GT = new Operator(">", "_gt_", Type.BINARY, 7);
+   public static final Operator GE = new Operator(">=", "_ge_", Type.BINARY, 7);
+   public static final Operator EQ = new Operator("==", "_eq_", Type.BINARY, 8);
+   public static final Operator NEQ = new Operator("!=", "_neq_", Type.BINARY, 8);
+   public static final Operator BOOL_AND = new Operator("&", "_band_", Type.BINARY, 9);
+   public static final Operator BOOL_XOR = new Operator("^", "_bxor_", Type.BINARY, 10);
+   public static final Operator BOOL_OR = new Operator("|", "_bor_", Type.BINARY, 11);
+   public static final Operator LOGIC_AND = new Operator("&&", "_and_", Type.BINARY, 12);
+   public static final Operator LOGIC_OR = new Operator("||", "_or_", Type.BINARY, 13);
    private String operator;
-
    private int precedence;
-
    private Type type;
-
    private String asmOperator;
-
    public Operator(String operator, String asmOperator, Type type, int precedence) {
       this.operator = operator;
       this.precedence = precedence;
@@ -21,7 +52,7 @@ public class Operator {
    }
 
    public static Operator getBinary(String op) {
-      switch (op) {
+      switch(op) {
          case "+":
             return PLUS;
          case "-":
@@ -68,7 +99,7 @@ public class Operator {
    }
 
    public static Operator getUnary(String op) {
-      switch (op) {
+      switch(op) {
          case "+":
             return POS;
          case "-":
@@ -93,15 +124,15 @@ public class Operator {
    }
 
    public static Operator getCastUnary(SymbolType castType) {
-      if (SymbolType.BYTE.equals(castType)) {
+      if(SymbolType.BYTE.equals(castType)) {
          return CAST_BYTE;
-      } else if (SymbolType.SBYTE.equals(castType)) {
+      } else if(SymbolType.SBYTE.equals(castType)) {
          return CAST_SBYTE;
-      } else if (SymbolType.WORD.equals(castType)) {
+      } else if(SymbolType.WORD.equals(castType)) {
          return CAST_WORD;
-      } else if (SymbolType.SWORD.equals(castType)) {
+      } else if(SymbolType.SWORD.equals(castType)) {
          return CAST_SWORD;
-      } else if (castType instanceof SymbolTypePointer && SymbolType.BYTE.equals(((SymbolTypePointer) castType).getElementType())) {
+      } else if(castType instanceof SymbolTypePointer && SymbolType.BYTE.equals(((SymbolTypePointer) castType).getElementType())) {
          return CAST_PTRBY;
       } else {
          throw new RuntimeException("Unknown cast type " + castType);
@@ -109,46 +140,6 @@ public class Operator {
       }
    }
 
-   public enum Type {
-      UNARY, BINARY
-   }
-
-   public static final Operator INCREMENT = new Operator("++", "_inc_", Type.UNARY, 1);
-   public static final Operator DECREMENT = new Operator("--", "_dec_", Type.UNARY, 1);
-   public static final Operator POS = new Operator("+", "_pos_", Type.UNARY, 2);
-   public static final Operator NEG = new Operator("-", "_neg_", Type.UNARY, 2);
-   public static final Operator BOOL_NOT = new Operator("~", "_not_", Type.UNARY, 2);
-   public static final Operator NOT = new Operator("!", "_not_", Type.UNARY, 2);
-   public static final Operator DEREF = new Operator("*", "_deref_", Type.UNARY, 2);
-   public static final Operator WORD = new Operator("w=", "_word_", Type.BINARY, 2);
-   public static final Operator DEREF_IDX = new Operator("*idx", "_derefidx_", Type.BINARY, 2);
-   public static final Operator SET_LOWBYTE = new Operator("lo=", "_setlo_", Type.BINARY, 2);
-   public static final Operator SET_HIBYTE = new Operator("hi=", "_sethi_", Type.BINARY, 2);
-   public static final Operator CAST_BYTE = new Operator("((byte))", "_byte_", Type.UNARY, 2);
-   public static final Operator CAST_SBYTE = new Operator("((signed byte))", "_sbyte_", Type.UNARY, 2);
-   public static final Operator CAST_WORD = new Operator("((word))", "_word_", Type.UNARY, 2);
-   public static final Operator CAST_SWORD = new Operator("((signed word))", "_sword_", Type.UNARY, 2);
-   public static final Operator CAST_PTRBY = new Operator("((byte*))", "_ptrby_", Type.UNARY, 2);
-   public static final Operator MULTIPLY = new Operator("*", "_mul_", Type.BINARY, 3);
-   public static final Operator DIVIDE = new Operator("/", "_div_", Type.BINARY, 3);
-   public static final Operator PLUS = new Operator("+", "_plus_", Type.BINARY, 4);
-   public static final Operator MINUS = new Operator("-", "_minus_", Type.BINARY, 4);
-   public static final Operator SHIFT_LEFT = new Operator("<<", "_rol_", Type.BINARY, 5);
-   public static final Operator SHIFT_RIGHT = new Operator(">>", "_ror_", Type.BINARY, 5);
-   public static final Operator LOWBYTE = new Operator("<", "_lo_", Type.UNARY, 6);
-   public static final Operator HIBYTE = new Operator(">", "_hi_", Type.UNARY, 6);
-   public static final Operator LT = new Operator("<", "_lt_", Type.BINARY, 7);
-   public static final Operator LE = new Operator("<=", "_le_", Type.BINARY, 7);
-   public static final Operator GT = new Operator(">", "_gt_", Type.BINARY, 7);
-   public static final Operator GE = new Operator(">=", "_ge_", Type.BINARY, 7);
-   public static final Operator EQ = new Operator("==", "_eq_", Type.BINARY, 8);
-   public static final Operator NEQ = new Operator("!=", "_neq_", Type.BINARY, 8);
-   public static final Operator BOOL_AND = new Operator("&", "_band_", Type.BINARY, 9);
-   public static final Operator BOOL_XOR = new Operator("^", "_bxor_", Type.BINARY, 10);
-   public static final Operator BOOL_OR = new Operator("|", "_bor_", Type.BINARY, 11);
-   public static final Operator LOGIC_AND = new Operator("&&", "_and_", Type.BINARY, 12);
-   public static final Operator LOGIC_OR = new Operator("||", "_or_", Type.BINARY, 13);
-
    public String getOperator() {
       return operator;
    }
@@ -172,11 +163,11 @@ public class Operator {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
       Operator operator1 = (Operator) o;
-      if (precedence != operator1.precedence) return false;
-      if (!operator.equals(operator1.operator)) return false;
+      if(precedence != operator1.precedence) return false;
+      if(!operator.equals(operator1.operator)) return false;
       return type == operator1.type;
    }
 
@@ -188,4 +179,8 @@ public class Operator {
       return result;
    }
 
+   public enum Type {
+      UNARY, BINARY
+   }
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/PhiTransitions.java b/src/main/java/dk/camelot64/kickc/model/PhiTransitions.java
index b6c447fe8..58446e8cc 100644
--- a/src/main/java/dk/camelot64/kickc/model/PhiTransitions.java
+++ b/src/main/java/dk/camelot64/kickc/model/PhiTransitions.java
@@ -25,7 +25,7 @@ public class PhiTransitions {
       this.program = program;
       this.toBlock = toBlock;
       this.transitions = new LinkedHashMap<>();
-      if (toBlock.hasPhiBlock()) {
+      if(toBlock.hasPhiBlock()) {
          this.phiBlock = toBlock.getPhiBlock();
          List<ControlFlowBlock> predecessors = new ArrayList<>(program.getGraph().getPredecessors(toBlock));
          Collections.sort(predecessors, new Comparator<ControlFlowBlock>() {
@@ -34,7 +34,7 @@ public class PhiTransitions {
                return o1.getLabel().getFullName().compareTo(o2.getLabel().getFullName());
             }
          });
-         for (ControlFlowBlock predecessor : predecessors) {
+         for(ControlFlowBlock predecessor : predecessors) {
             PhiTransition transition = findTransition(predecessor);
             transitions.put(predecessor, transition);
          }
@@ -51,10 +51,10 @@ public class PhiTransitions {
    private PhiTransition findTransition(ControlFlowBlock fromBlock) {
       PhiTransition transition = new PhiTransition(fromBlock);
       boolean isCallTransition = toBlock.getLabel().equals(fromBlock.getCallSuccessor());
-      if (!isCallTransition) {
+      if(!isCallTransition) {
          // If the transition is not a call - then attempt to join with other equal transition(s)
-         for (PhiTransition candidate : transitions.values()) {
-            if (candidate.equalAssignments(transition)) {
+         for(PhiTransition candidate : transitions.values()) {
+            if(candidate.equalAssignments(transition)) {
                candidate.addFromBlock(fromBlock);
                return candidate;
             }
@@ -80,11 +80,12 @@ public class PhiTransitions {
 
    /**
     * Get a phi transition from it's phi transition ID.
+    *
     * @param transitionId The ID to look for
     * @return The transition with the given ID, or nulll if not found.
     */
    public PhiTransition getTransition(String transitionId) {
-      for (PhiTransition phiTransition : transitions.values()) {
+      for(PhiTransition phiTransition : transitions.values()) {
          if(transitionId.equals(phiTransition.getTransitionId())) {
             return phiTransition;
          }
@@ -117,10 +118,10 @@ public class PhiTransitions {
 
       private void initAssignments(ControlFlowBlock fromBlock) {
          this.assignments = new ArrayList<>();
-         if (phiBlock != null) {
+         if(phiBlock != null) {
             List<StatementPhiBlock.PhiVariable> phiVariables = new ArrayList<>(phiBlock.getPhiVariables());
             Collections.reverse(phiVariables);
-            for (StatementPhiBlock.PhiVariable phiVariable : phiVariables) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phiVariables) {
                List<StatementPhiBlock.PhiRValue> phiRValues = new ArrayList<>(phiVariable.getValues());
                Collections.sort(phiRValues, new Comparator<StatementPhiBlock.PhiRValue>() {
                   @Override
@@ -128,8 +129,8 @@ public class PhiTransitions {
                      return o1.getPredecessor().getFullName().compareTo(o2.getPredecessor().getFullName());
                   }
                });
-               for (StatementPhiBlock.PhiRValue phiRValue : phiRValues) {
-                  if (phiRValue.getPredecessor().equals(fromBlock.getLabel())) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiRValues) {
+                  if(phiRValue.getPredecessor().equals(fromBlock.getLabel())) {
                      this.assignments.add(new PhiTransition.PhiAssignment(phiVariable, phiRValue, nextIdx++));
                   }
                }
@@ -139,13 +140,14 @@ public class PhiTransitions {
 
       /**
        * Get a string ID uniquely identifying the PHI transition within the program
+       *
        * @return Transition ID
        */
       public String getTransitionId() {
          StringBuilder id = new StringBuilder();
          id.append("phi:");
          boolean first = true;
-         for (ControlFlowBlock fromBlock : fromBlocks) {
+         for(ControlFlowBlock fromBlock : fromBlocks) {
             if(!first) {
                id.append("/");
             }
@@ -180,28 +182,28 @@ public class PhiTransitions {
        */
       public boolean equalAssignments(PhiTransition other) {
          List<PhiTransition.PhiAssignment> otherAssignments = other.getAssignments();
-         if (assignments.size() != otherAssignments.size()) {
+         if(assignments.size() != otherAssignments.size()) {
             return false;
          }
-         for (int i = 0; i < assignments.size(); i++) {
+         for(int i = 0; i < assignments.size(); i++) {
             PhiTransition.PhiAssignment assignment = assignments.get(i);
             PhiTransition.PhiAssignment otherAssignment = otherAssignments.get(i);
-            if (assignment.getVariable() != null && otherAssignment.getVariable() != null) {
+            if(assignment.getVariable() != null && otherAssignment.getVariable() != null) {
                Variable var = program.getSymbolInfos().getVariable(assignment.getVariable());
                Variable otherVar = program.getSymbolInfos().getVariable(otherAssignment.getVariable());
-               if (!var.getAllocation().equals(otherVar.getAllocation())) {
+               if(!var.getAllocation().equals(otherVar.getAllocation())) {
                   return false;
                }
-            } else if (!assignment.getVariable().equals(otherAssignment.getVariable())) {
+            } else if(!assignment.getVariable().equals(otherAssignment.getVariable())) {
                return false;
             }
-            if (assignment.getrValue() instanceof VariableRef && otherAssignment.getrValue() instanceof VariableRef) {
+            if(assignment.getrValue() instanceof VariableRef && otherAssignment.getrValue() instanceof VariableRef) {
                Variable var = program.getSymbolInfos().getVariable((VariableRef) assignment.getrValue());
                Variable otherVar = program.getSymbolInfos().getVariable((VariableRef) otherAssignment.getrValue());
-               if (!var.getAllocation().equals(otherVar.getAllocation())) {
+               if(!var.getAllocation().equals(otherVar.getAllocation())) {
                   return false;
                }
-            } else if (!assignment.getrValue().equals(otherAssignment.getrValue())) {
+            } else if(!assignment.getrValue().equals(otherAssignment.getrValue())) {
                return false;
             }
          }
diff --git a/src/main/java/dk/camelot64/kickc/model/PointerDereferenceIndexed.java b/src/main/java/dk/camelot64/kickc/model/PointerDereferenceIndexed.java
index caded679f..967782625 100644
--- a/src/main/java/dk/camelot64/kickc/model/PointerDereferenceIndexed.java
+++ b/src/main/java/dk/camelot64/kickc/model/PointerDereferenceIndexed.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** A dereferenced variable pointer plus an index (used for array writes)*/
+/** A dereferenced variable pointer plus an index (used for array writes) */
 public class PointerDereferenceIndexed implements PointerDereference {
 
    private RValue pointer;
@@ -35,7 +35,7 @@ public class PointerDereferenceIndexed implements PointerDereference {
 
    @Override
    public String toString(Program program) {
-      return "*(" + pointer.toString(program) + " + " +index.toString(program) + ')';
+      return "*(" + pointer.toString(program) + " + " + index.toString(program) + ')';
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/PointerDereferenceSimple.java b/src/main/java/dk/camelot64/kickc/model/PointerDereferenceSimple.java
index 5acfa6bee..9f22bb9f8 100644
--- a/src/main/java/dk/camelot64/kickc/model/PointerDereferenceSimple.java
+++ b/src/main/java/dk/camelot64/kickc/model/PointerDereferenceSimple.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** A dereferenced pointer (based on a variable or a constant pointer)*/
+/** A dereferenced pointer (based on a variable or a constant pointer) */
 public class PointerDereferenceSimple implements PointerDereference {
 
    private RValue pointer;
diff --git a/src/main/java/dk/camelot64/kickc/model/Procedure.java b/src/main/java/dk/camelot64/kickc/model/Procedure.java
index 033669eb8..914fb5faa 100644
--- a/src/main/java/dk/camelot64/kickc/model/Procedure.java
+++ b/src/main/java/dk/camelot64/kickc/model/Procedure.java
@@ -11,11 +11,10 @@ import java.util.List;
 /** Symbol describing a procedure/function */
 public class Procedure extends Scope {
 
+   public static final ProcedureRef ROOT = new ProcedureRef("");
    private final SymbolType returnType;
    private List<String> parameterNames;
 
-   public static final ProcedureRef ROOT = new ProcedureRef("");
-
    public Procedure(String name, SymbolType returnType, Scope parentScope) {
       super(name, parentScope);
       this.returnType = returnType;
@@ -42,14 +41,6 @@ public class Procedure extends Scope {
       this.parameterNames = parameterNames;
    }
 
-   public void setParameters(List<Variable> parameters) {
-      this.parameterNames = new ArrayList<>();
-      for (Variable parameter : parameters) {
-         add(parameter);
-         parameterNames.add(parameter.getLocalName());
-      }
-   }
-
    @JsonIgnore
    public Label getLabel() {
       return new Label(getFullName(), getScope(), false);
@@ -62,12 +53,20 @@ public class Procedure extends Scope {
    @JsonIgnore
    public List<Variable> getParameters() {
       ArrayList<Variable> parameters = new ArrayList<>();
-      for (String name : parameterNames) {
+      for(String name : parameterNames) {
          parameters.add(this.getVariable(name));
       }
       return parameters;
    }
 
+   public void setParameters(List<Variable> parameters) {
+      this.parameterNames = new ArrayList<>();
+      for(Variable parameter : parameters) {
+         add(parameter);
+         parameterNames.add(parameter.getLocalName());
+      }
+   }
+
    @Override
    public String getFullName() {
       return super.getFullName();
@@ -94,13 +93,13 @@ public class Procedure extends Scope {
    @Override
    public String toString(Program program) {
       StringBuilder res = new StringBuilder();
-      res.append("("+getType().getTypeName() + ") ");
+      res.append("(" + getType().getTypeName() + ") ");
       res.append(getFullName());
       res.append("(");
       boolean first = true;
-      if(parameterNames !=null) {
-         for (Variable parameter : getParameters()) {
-            if (!first) res.append(" , ");
+      if(parameterNames != null) {
+         for(Variable parameter : getParameters()) {
+            if(!first) res.append(" , ");
             first = false;
             res.append(parameter.toString(program));
          }
@@ -116,13 +115,13 @@ public class Procedure extends Scope {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       Procedure procedure = (Procedure) o;
 
-      if (returnType != null ? !returnType.equals(procedure.returnType) : procedure.returnType != null) return false;
+      if(returnType != null ? !returnType.equals(procedure.returnType) : procedure.returnType != null) return false;
       return parameterNames != null ? parameterNames.equals(procedure.parameterNames) : procedure.parameterNames == null;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/ProcedureModifiedVars.java b/src/main/java/dk/camelot64/kickc/model/ProcedureModifiedVars.java
index c053a3a08..1370d0820 100644
--- a/src/main/java/dk/camelot64/kickc/model/ProcedureModifiedVars.java
+++ b/src/main/java/dk/camelot64/kickc/model/ProcedureModifiedVars.java
@@ -1,6 +1,7 @@
 package dk.camelot64.kickc.model;
 
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Contains all variables modified inside procedures. Contain the unversioned VariableRefs.
@@ -20,9 +21,9 @@ public class ProcedureModifiedVars {
 
    public String toString(Program program) {
       StringBuilder out = new StringBuilder();
-      for (ProcedureRef procedureRef : modified.keySet()) {
-         for (VariableRef variableRef : getModifiedVars(procedureRef)) {
-            out.append(procedureRef.getFullName()).append(" modifies "+variableRef.getFullName()).append("\n");
+      for(ProcedureRef procedureRef : modified.keySet()) {
+         for(VariableRef variableRef : getModifiedVars(procedureRef)) {
+            out.append(procedureRef.getFullName()).append(" modifies " + variableRef.getFullName()).append("\n");
          }
       }
       return out.toString();
diff --git a/src/main/java/dk/camelot64/kickc/model/ProcedureRef.java b/src/main/java/dk/camelot64/kickc/model/ProcedureRef.java
index 4b8350dba..a402695bc 100644
--- a/src/main/java/dk/camelot64/kickc/model/ProcedureRef.java
+++ b/src/main/java/dk/camelot64/kickc/model/ProcedureRef.java
@@ -8,12 +8,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class ProcedureRef extends ScopeRef {
 
    @JsonCreator
-   public ProcedureRef( @JsonProperty("fullName") String fullName) {
+   public ProcedureRef(@JsonProperty("fullName") String fullName) {
       super(fullName);
    }
 
    /**
     * Get the label of the block where the procedure code starts
+    *
     * @return The label of the code block
     */
    @JsonIgnore
@@ -23,10 +24,11 @@ public class ProcedureRef extends ScopeRef {
 
    /**
     * Get the label of the block containing the final procedure return
+    *
     * @return The label of the code block
     */
    @JsonIgnore
    public LabelRef getReturnBlock() {
-      return new LabelRef(getFullName()+"::"+SymbolRef.PROCEXIT_BLOCK_NAME);
+      return new LabelRef(getFullName() + "::" + SymbolRef.PROCEXIT_BLOCK_NAME);
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/Program.java b/src/main/java/dk/camelot64/kickc/model/Program.java
index 6469f084d..f2e191d53 100644
--- a/src/main/java/dk/camelot64/kickc/model/Program.java
+++ b/src/main/java/dk/camelot64/kickc/model/Program.java
@@ -29,14 +29,14 @@ public class Program {
    private ProcedureModifiedVars procedureModifiedVars;
    /** Information about calls. */
    private CallGraph callGraph;
-   /** Information about dominators of all blocks*/
+   /** Information about dominators of all blocks */
    private DominatorsGraph dominators;
    /** Information about loops. */
    private NaturalLoopSet loopSet;
 
    /** Which block is each statement a part of. */
    private StatementInfos statementInfos;
-   /** Cached information about symbols. Contains a symbol table cache for fast access.*/
+   /** Cached information about symbols. Contains a symbol table cache for fast access. */
    private SymbolInfos symbolInfos;
    /** The variables referenced by blocks/statements. */
    private VariableReferenceInfos variableReferenceInfos;
@@ -92,14 +92,14 @@ public class Program {
       this.graph = graph;
    }
 
-   public void setProcedureModifiedVars(ProcedureModifiedVars procedureModifiedVars) {
-      this.procedureModifiedVars = procedureModifiedVars;
-   }
-
    public ProcedureModifiedVars getProcedureModifiedVars() {
       return procedureModifiedVars;
    }
 
+   public void setProcedureModifiedVars(ProcedureModifiedVars procedureModifiedVars) {
+      this.procedureModifiedVars = procedureModifiedVars;
+   }
+
    public AsmProgram getAsm() {
       return asm;
    }
@@ -116,22 +116,22 @@ public class Program {
       this.callGraph = callGraph;
    }
 
-   public void setDominators(DominatorsGraph dominators) {
-      this.dominators = dominators;
-   }
-
    public DominatorsGraph getDominators() {
       return dominators;
    }
 
-   public void setLoopSet(NaturalLoopSet loopSet) {
-      this.loopSet = loopSet;
+   public void setDominators(DominatorsGraph dominators) {
+      this.dominators = dominators;
    }
 
    public NaturalLoopSet getLoopSet() {
       return loopSet;
    }
 
+   public void setLoopSet(NaturalLoopSet loopSet) {
+      this.loopSet = loopSet;
+   }
+
    public VariableReferenceInfos getVariableReferenceInfos() {
       return variableReferenceInfos;
    }
@@ -156,14 +156,14 @@ public class Program {
       this.symbolInfos = symbolInfos;
    }
 
-   public void setLiveRangeVariables(LiveRangeVariables liveRangeVariables) {
-      this.liveRangeVariables = liveRangeVariables;
-   }
-
    public LiveRangeVariables getLiveRangeVariables() {
       return liveRangeVariables;
    }
 
+   public void setLiveRangeVariables(LiveRangeVariables liveRangeVariables) {
+      this.liveRangeVariables = liveRangeVariables;
+   }
+
    public LiveRangeVariablesEffective getLiveRangeVariablesEffective() {
       return liveRangeVariablesEffective;
    }
@@ -172,38 +172,38 @@ public class Program {
       this.liveRangeVariablesEffective = liveRangeVariablesEffective;
    }
 
-   public void setLiveRangeEquivalenceClassSet(LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet) {
-      this.liveRangeEquivalenceClassSet = liveRangeEquivalenceClassSet;
-   }
-
    public LiveRangeEquivalenceClassSet getLiveRangeEquivalenceClassSet() {
       return liveRangeEquivalenceClassSet;
    }
 
-   public void setVariableRegisterWeights(VariableRegisterWeights variableRegisterWeights) {
-      this.variableRegisterWeights = variableRegisterWeights;
+   public void setLiveRangeEquivalenceClassSet(LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet) {
+      this.liveRangeEquivalenceClassSet = liveRangeEquivalenceClassSet;
    }
 
    public VariableRegisterWeights getVariableRegisterWeights() {
       return variableRegisterWeights;
    }
 
-   public void setRegisterPotentials(RegisterPotentials registerPotentials) {
-      this.registerPotentials = registerPotentials;
+   public void setVariableRegisterWeights(VariableRegisterWeights variableRegisterWeights) {
+      this.variableRegisterWeights = variableRegisterWeights;
    }
 
    public RegisterPotentials getRegisterPotentials() {
       return registerPotentials;
    }
 
-   public void setRegisterUpliftProgram(RegisterUpliftProgram registerUpliftProgram) {
-      this.registerUpliftProgram = registerUpliftProgram;
+   public void setRegisterPotentials(RegisterPotentials registerPotentials) {
+      this.registerPotentials = registerPotentials;
    }
 
    public RegisterUpliftProgram getRegisterUpliftProgram() {
       return registerUpliftProgram;
    }
 
+   public void setRegisterUpliftProgram(RegisterUpliftProgram registerUpliftProgram) {
+      this.registerUpliftProgram = registerUpliftProgram;
+   }
+
    public CompileLog getLog() {
       return log;
    }
@@ -215,13 +215,13 @@ public class Program {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
 
       Program program = (Program) o;
 
-      if (scope != null ? !scope.equals(program.scope) : program.scope != null) return false;
-      if (graph != null ? !graph.equals(program.graph) : program.graph != null) return false;
+      if(scope != null ? !scope.equals(program.scope) : program.scope != null) return false;
+      if(graph != null ? !graph.equals(program.graph) : program.graph != null) return false;
       return asm != null ? asm.equals(program.asm) : program.asm == null;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/ProgramScope.java b/src/main/java/dk/camelot64/kickc/model/ProgramScope.java
index 4572b8c25..a2c7234bb 100644
--- a/src/main/java/dk/camelot64/kickc/model/ProgramScope.java
+++ b/src/main/java/dk/camelot64/kickc/model/ProgramScope.java
@@ -38,9 +38,9 @@ public class ProgramScope extends Scope {
       LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet = program.getLiveRangeEquivalenceClassSet();
       StringBuilder out = new StringBuilder();
       out.append(super.toString(program, symbolClass));
-      if(liveRangeEquivalenceClassSet!=null) {
+      if(liveRangeEquivalenceClassSet != null) {
          out.append("\n");
-         for (LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+         for(LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
             out.append(liveRangeEquivalenceClass);
             out.append("\n");
          }
diff --git a/src/main/java/dk/camelot64/kickc/model/RValue.java b/src/main/java/dk/camelot64/kickc/model/RValue.java
index e34477b7c..81f9d8481 100644
--- a/src/main/java/dk/camelot64/kickc/model/RValue.java
+++ b/src/main/java/dk/camelot64/kickc/model/RValue.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** A value usable as part of a calculation (ib the right side of an assignment)*/
+/** A value usable as part of a calculation (ib the right side of an assignment) */
 public interface RValue extends Value {
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/RegisterCombination.java b/src/main/java/dk/camelot64/kickc/model/RegisterCombination.java
index 543b976e1..dfb63713c 100644
--- a/src/main/java/dk/camelot64/kickc/model/RegisterCombination.java
+++ b/src/main/java/dk/camelot64/kickc/model/RegisterCombination.java
@@ -3,7 +3,7 @@ package dk.camelot64.kickc.model;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-/** A combination of register/ZP assignments for a set of equivalence classes  */
+/** A combination of register/ZP assignments for a set of equivalence classes */
 public class RegisterCombination {
 
    /** The registers allocated to each equivalence class. */
@@ -26,9 +26,9 @@ public class RegisterCombination {
     * (does not update the allocation in the equivalence classes).
     */
    public void allocate(Program program) {
-      for (LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
          Registers.Register register = allocation.get(equivalenceClass);
-         for (VariableRef variable : equivalenceClass.getVariables()) {
+         for(VariableRef variable : equivalenceClass.getVariables()) {
             Variable var = program.getSymbolInfos().getVariable(variable);
             var.setAllocation(register);
          }
@@ -39,7 +39,7 @@ public class RegisterCombination {
     * Store the combination in the equivalence classes.
     */
    public void store(LiveRangeEquivalenceClassSet equivalenceClassSet) {
-      for (LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
          VariableRef variable = equivalenceClass.getVariables().get(0);
          LiveRangeEquivalenceClass globalEquivalenceClass = equivalenceClassSet.getEquivalenceClass(variable);
          Registers.Register register = allocation.get(equivalenceClass);
@@ -50,7 +50,7 @@ public class RegisterCombination {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : allocation.keySet()) {
          Registers.Register register = allocation.get(equivalenceClass);
          out.append(register.toString()).append(" ").append(equivalenceClass.toString(false)).append(" ");
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/RegisterCombinationIterator.java b/src/main/java/dk/camelot64/kickc/model/RegisterCombinationIterator.java
index 5cf84bc6f..d3d3e9b68 100644
--- a/src/main/java/dk/camelot64/kickc/model/RegisterCombinationIterator.java
+++ b/src/main/java/dk/camelot64/kickc/model/RegisterCombinationIterator.java
@@ -30,7 +30,7 @@ public class RegisterCombinationIterator implements Iterator<RegisterCombination
 
    public int getNumIterations() {
       int numIterations = 1;
-      for (LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
+      for(LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
          List<Registers.Register> registers = registerPotentials.getPotentialRegisters(equivalenceClass);
          numIterations = numIterations * registers.size();
       }
@@ -41,7 +41,7 @@ public class RegisterCombinationIterator implements Iterator<RegisterCombination
    public RegisterCombination next() {
       RegisterCombination combination = new RegisterCombination();
       int combinationIdRest = nextIterationId;
-      for (LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
+      for(LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
          List<Registers.Register> potentials = registerPotentials.getPotentialRegisters(equivalenceClass);
          int registerIdx = (combinationIdRest % potentials.size());
          Registers.Register register = potentials.get(registerIdx);
diff --git a/src/main/java/dk/camelot64/kickc/model/RegisterPotentials.java b/src/main/java/dk/camelot64/kickc/model/RegisterPotentials.java
index 0bf27b661..d607e5dda 100644
--- a/src/main/java/dk/camelot64/kickc/model/RegisterPotentials.java
+++ b/src/main/java/dk/camelot64/kickc/model/RegisterPotentials.java
@@ -33,12 +33,12 @@ public class RegisterPotentials {
    @Override
    public String toString() {
       StringBuilder out = new StringBuilder();
-      for (LiveRangeEquivalenceClass liveRangeEquivalenceClass : potentials.keySet()) {
+      for(LiveRangeEquivalenceClass liveRangeEquivalenceClass : potentials.keySet()) {
          out.append("Potential registers ");
          out.append(liveRangeEquivalenceClass.toString());
          out.append(" : ");
          List<Registers.Register> registers = potentials.get(liveRangeEquivalenceClass);
-         for (Registers.Register register : registers) {
+         for(Registers.Register register : registers) {
             out.append(register.toString());
             out.append(" , ");
          }
@@ -49,11 +49,11 @@ public class RegisterPotentials {
 
    public void addPotentialRegister(LiveRangeEquivalenceClass equivalenceClass, Registers.Register register) {
       List<Registers.Register> registers = potentials.get(equivalenceClass);
-      if(registers==null) {
-         registers= new ArrayList<>();
+      if(registers == null) {
+         registers = new ArrayList<>();
          potentials.put(equivalenceClass, registers);
       }
-      if (!registers.contains(register)) {
+      if(!registers.contains(register)) {
          registers.add(register);
       }
    }
diff --git a/src/main/java/dk/camelot64/kickc/model/RegisterUpliftProgram.java b/src/main/java/dk/camelot64/kickc/model/RegisterUpliftProgram.java
index bca41314c..cfe3ceaf5 100644
--- a/src/main/java/dk/camelot64/kickc/model/RegisterUpliftProgram.java
+++ b/src/main/java/dk/camelot64/kickc/model/RegisterUpliftProgram.java
@@ -30,7 +30,7 @@ public class RegisterUpliftProgram {
 
    public String toString(VariableRegisterWeights variableRegisterWeights) {
       StringBuilder out = new StringBuilder();
-      for (RegisterUpliftScope upliftScope : registerUpliftScopes) {
+      for(RegisterUpliftScope upliftScope : registerUpliftScopes) {
          out.append(upliftScope.toString(variableRegisterWeights)).append("\n");
       }
       return out.toString();
diff --git a/src/main/java/dk/camelot64/kickc/model/RegisterUpliftScope.java b/src/main/java/dk/camelot64/kickc/model/RegisterUpliftScope.java
index 2f798a4a4..fcbe6c638 100644
--- a/src/main/java/dk/camelot64/kickc/model/RegisterUpliftScope.java
+++ b/src/main/java/dk/camelot64/kickc/model/RegisterUpliftScope.java
@@ -2,7 +2,10 @@ package dk.camelot64.kickc.model;
 
 import com.ibm.icu.text.NumberFormat;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
 
 /** Register Uplift information for a single scope. */
 public class RegisterUpliftScope {
@@ -20,10 +23,6 @@ public class RegisterUpliftScope {
       this.equivalenceClasses = new ArrayList<>();
    }
 
-   public void setEquivalenceClasses(List<LiveRangeEquivalenceClass> equivalenceClasses) {
-      this.equivalenceClasses = equivalenceClasses;
-   }
-
    public ScopeRef getScopeRef() {
       return scopeRef;
    }
@@ -32,11 +31,15 @@ public class RegisterUpliftScope {
       return equivalenceClasses;
    }
 
+   public void setEquivalenceClasses(List<LiveRangeEquivalenceClass> equivalenceClasses) {
+      this.equivalenceClasses = equivalenceClasses;
+   }
+
    public String toString(VariableRegisterWeights weights) {
       StringBuilder out = new StringBuilder();
       out.append("Uplift Scope [" + scopeRef.toString() + "] ");
-      for (LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
-         if (weights != null) {
+      for(LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
+         if(weights != null) {
             NumberFormat fmt = NumberFormat.getInstance(Locale.ENGLISH);
             fmt.setMaximumFractionDigits(2);
             out.append(fmt.format(weights.getTotalWeight(equivalenceClass)) + ": ");
@@ -53,6 +56,7 @@ public class RegisterUpliftScope {
 
    /**
     * Get all register allocation combinations using the passed potential registers
+    *
     * @param registerPotentials The potential registers to use for each live range equivalence class
     * @return Iterator of all combinations
     */
diff --git a/src/main/java/dk/camelot64/kickc/model/Registers.java b/src/main/java/dk/camelot64/kickc/model/Registers.java
index 202e88c0c..670ad439d 100644
--- a/src/main/java/dk/camelot64/kickc/model/Registers.java
+++ b/src/main/java/dk/camelot64/kickc/model/Registers.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** The different registers available for a program  */
+/** The different registers available for a program */
 public class Registers {
 
 
@@ -71,10 +71,10 @@ public class Registers {
 
       @Override
       public boolean equals(Object o) {
-         if (this == o) {
+         if(this == o) {
             return true;
          }
-         if (o == null || getClass() != o.getClass()) {
+         if(o == null || getClass() != o.getClass()) {
             return false;
          }
 
@@ -150,10 +150,10 @@ public class Registers {
 
       @Override
       public boolean equals(Object obj) {
-         if (this == obj) {
+         if(this == obj) {
             return true;
          }
-         if (obj == null || getClass() != obj.getClass()) {
+         if(obj == null || getClass() != obj.getClass()) {
             return false;
          }
          return true;
@@ -253,7 +253,7 @@ public class Registers {
 
       @Override
       public String toString(Program program) {
-         return "const "+constantValue.toString(program);
+         return "const " + constantValue.toString(program);
       }
 
       @Override
@@ -263,8 +263,8 @@ public class Registers {
 
       @Override
       public boolean equals(Object o) {
-         if (this == o) return true;
-         if (o == null || getClass() != o.getClass()) return false;
+         if(this == o) return true;
+         if(o == null || getClass() != o.getClass()) return false;
          RegisterConstant that = (RegisterConstant) o;
          return constantValue != null ? constantValue.equals(that.constantValue) : that.constantValue == null;
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/Scope.java b/src/main/java/dk/camelot64/kickc/model/Scope.java
index eb20833ad..4280069ae 100644
--- a/src/main/java/dk/camelot64/kickc/model/Scope.java
+++ b/src/main/java/dk/camelot64/kickc/model/Scope.java
@@ -34,7 +34,7 @@ public abstract class Scope implements Symbol {
       this.symbols = symbols;
       this.intermediateVarCount = intermediateVarCount;
       this.intermediateLabelCount = intermediateLabelCount;
-      for (Symbol symbol : symbols.values()) {
+      for(Symbol symbol : symbols.values()) {
          symbol.setScope(this);
       }
    }
@@ -45,6 +45,16 @@ public abstract class Scope implements Symbol {
       this.symbols = new LinkedHashMap<>();
    }
 
+   public static String getFullName(Symbol symbol) {
+      if(symbol.getScope() != null) {
+         String scopeName = symbol.getScope().getFullName();
+         if(scopeName.length() > 0) {
+            return scopeName + "::" + symbol.getLocalName();
+         }
+      }
+      return symbol.getLocalName();
+   }
+
    public HashMap<String, Symbol> getSymbols() {
       return symbols;
    }
@@ -59,16 +69,6 @@ public abstract class Scope implements Symbol {
       return getFullName(this);
    }
 
-   public static String getFullName(Symbol symbol) {
-      if (symbol.getScope() != null) {
-         String scopeName = symbol.getScope().getFullName();
-         if (scopeName.length() > 0) {
-            return scopeName + "::" + symbol.getLocalName();
-         }
-      }
-      return symbol.getLocalName();
-   }
-
    public ScopeRef getRef() {
       return new ScopeRef(this);
    }
@@ -79,6 +79,11 @@ public abstract class Scope implements Symbol {
       return parentScope;
    }
 
+   @Override
+   public void setScope(Scope scope) {
+      this.parentScope = scope;
+   }
+
    @Override
    @JsonIgnore
    public abstract SymbolType getType();
@@ -86,7 +91,7 @@ public abstract class Scope implements Symbol {
    @Override
    @JsonIgnore
    public int getScopeDepth() {
-      if (parentScope == null) {
+      if(parentScope == null) {
          return 0;
       } else {
          return parentScope.getScopeDepth() + 1;
@@ -94,7 +99,7 @@ public abstract class Scope implements Symbol {
    }
 
    public Symbol add(Symbol symbol) {
-      if (symbols.get(symbol.getLocalName()) != null) {
+      if(symbols.get(symbol.getLocalName()) != null) {
          throw new RuntimeException("Symbol already declared " + symbol.getLocalName());
       }
       symbols.put(symbol.getLocalName(), symbol);
@@ -120,12 +125,13 @@ public abstract class Scope implements Symbol {
 
    /**
     * Get all versions of an unversioned variable
+    *
     * @param unversioned The unversioned variable
     * @return All versions of the variable
     */
    public Collection<VariableVersion> getVersions(VariableUnversioned unversioned) {
       LinkedHashSet<VariableVersion> versions = new LinkedHashSet<>();
-      for (Symbol symbol : symbols.values()) {
+      for(Symbol symbol : symbols.values()) {
          if(symbol instanceof VariableVersion) {
             if(((VariableVersion) symbol).isVersioned()) {
                if(((VariableVersion) symbol).getVersionOf().equals(unversioned)) {
@@ -137,7 +143,6 @@ public abstract class Scope implements Symbol {
       return versions;
    }
 
-
    public String allocateIntermediateVariableName() {
       return "$" + intermediateVarCount++;
    }
@@ -148,11 +153,11 @@ public abstract class Scope implements Symbol {
 
    public Symbol getSymbol(String name) {
       int pos = name.indexOf("::");
-      if (pos >= 0) {
+      if(pos >= 0) {
          String scopeName = name.substring(0, pos);
          String rest = name.substring(pos + 2);
          Symbol scopeSym = getSymbol(scopeName);
-         if (scopeSym instanceof Scope) {
+         if(scopeSym instanceof Scope) {
             return ((Scope) scopeSym).getSymbol(rest);
          } else {
             return null;
@@ -160,8 +165,8 @@ public abstract class Scope implements Symbol {
          }
       } else {
          Symbol symbol = symbols.get(name);
-         if (symbol == null) {
-            if (parentScope != null) {
+         if(symbol == null) {
+            if(parentScope != null) {
                symbol = parentScope.getSymbol(name);
             }
          }
@@ -188,11 +193,11 @@ public abstract class Scope implements Symbol {
    @JsonIgnore
    public Collection<Variable> getAllVariables(boolean includeSubScopes) {
       Collection<Variable> vars = new ArrayList<>();
-      for (Symbol symbol : symbols.values()) {
-         if (symbol instanceof Variable) {
+      for(Symbol symbol : symbols.values()) {
+         if(symbol instanceof Variable) {
             vars.add((Variable) symbol);
          }
-         if (includeSubScopes && symbol instanceof Scope) {
+         if(includeSubScopes && symbol instanceof Scope) {
             Scope subScope = (Scope) symbol;
             vars.addAll(subScope.getAllVariables(true));
          }
@@ -203,11 +208,11 @@ public abstract class Scope implements Symbol {
 
    public Collection<ConstantVar> getAllConstants(boolean includeSubScopes) {
       Collection<ConstantVar> vars = new ArrayList<>();
-      for (Symbol symbol : symbols.values()) {
-         if (symbol instanceof ConstantVar) {
+      for(Symbol symbol : symbols.values()) {
+         if(symbol instanceof ConstantVar) {
             vars.add((ConstantVar) symbol);
          }
-         if (includeSubScopes && symbol instanceof Scope) {
+         if(includeSubScopes && symbol instanceof Scope) {
             Scope subScope = (Scope) symbol;
             vars.addAll(subScope.getAllConstants(true));
          }
@@ -216,19 +221,19 @@ public abstract class Scope implements Symbol {
       return vars;
    }
 
-
    /**
     * Get all scopes contained in the scope. This does not include this scope itself.
+    *
     * @param includeSubScopes Include sub-scopes og sub-scopes
     * @return The scopes
     */
    @JsonIgnore
    public Collection<Scope> getAllScopes(boolean includeSubScopes) {
       Collection<Scope> scopes = new ArrayList<>();
-      for (Symbol symbol : symbols.values()) {
-         if (symbol instanceof Scope) {
+      for(Symbol symbol : symbols.values()) {
+         if(symbol instanceof Scope) {
             scopes.add((Scope) symbol);
-            if (includeSubScopes) {
+            if(includeSubScopes) {
                Scope subScope = (Scope) symbol;
                scopes.addAll(subScope.getAllScopes(true));
             }
@@ -239,15 +244,14 @@ public abstract class Scope implements Symbol {
 
    public Collection<Procedure> getAllProcedures(boolean includeSubScopes) {
       Collection<Procedure> procedures = new ArrayList<>();
-      for (Scope scope : getAllScopes(includeSubScopes)) {
-         if (scope instanceof Procedure) {
+      for(Scope scope : getAllScopes(includeSubScopes)) {
+         if(scope instanceof Procedure) {
             procedures.add((Procedure) scope);
          }
       }
       return procedures;
    }
 
-
    public Label addLabel(String name) {
       Label symbol = new Label(name, this, false);
       add(symbol);
@@ -271,7 +275,7 @@ public abstract class Scope implements Symbol {
 
    public Procedure addProcedure(String name, SymbolType type) {
       Symbol symbol = symbols.get(name);
-      if (symbol != null) {
+      if(symbol != null) {
          throw new RuntimeException("Error! Symbol already defined " + symbol);
       }
       Procedure procedure = new Procedure(name, type, this);
@@ -281,7 +285,7 @@ public abstract class Scope implements Symbol {
 
    public Procedure getProcedure(String name) {
       Symbol symbol = getSymbol(name);
-      if (symbol != null && symbol instanceof Procedure) {
+      if(symbol != null && symbol instanceof Procedure) {
          return (Procedure) symbol;
       } else {
          return null;
@@ -289,19 +293,18 @@ public abstract class Scope implements Symbol {
    }
 
    public Scope getScope(ScopeRef scopeRef) {
-      if (scopeRef.getFullName().equals("") && this instanceof ProgramScope) {
+      if(scopeRef.getFullName().equals("") && this instanceof ProgramScope) {
          // Special case for the outer program scope
          return this;
       }
       Symbol symbol = getSymbol(scopeRef);
-      if (symbol instanceof Scope) {
+      if(symbol instanceof Scope) {
          return (Scope) symbol;
       } else {
          return null;
       }
    }
 
-
    public Procedure getProcedure(ProcedureRef ref) {
       return (Procedure) getSymbol(ref);
    }
@@ -313,35 +316,35 @@ public abstract class Scope implements Symbol {
       Set<String> names = symbols.keySet();
       List<String> sortedNames = new ArrayList<>(names);
       Collections.sort(sortedNames);
-      for (String name : sortedNames) {
+      for(String name : sortedNames) {
          Symbol symbol = symbols.get(name);
-         if (symbol instanceof Scope) {
+         if(symbol instanceof Scope) {
             res.append(((Scope) symbol).toString(program, symbolClass));
          } else {
-            if (symbolClass == null || symbolClass.isInstance(symbol)) {
+            if(symbolClass == null || symbolClass.isInstance(symbol)) {
                res.append(symbol.toString(program));
-               if (symbol instanceof Variable) {
+               if(symbol instanceof Variable) {
                   Variable var = (Variable) symbol;
                   String asmName = var.getAsmName();
-                  if (asmName != null) {
+                  if(asmName != null) {
                      res.append(" " + asmName);
                   }
                   Registers.Register register = var.getAllocation();
-                  if (register != null) {
+                  if(register != null) {
                      res.append(" " + register);
                   }
                }
-               if (symbol instanceof Variable && registerWeights != null) {
+               if(symbol instanceof Variable && registerWeights != null) {
                   Variable var = (Variable) symbol;
                   Double weight = registerWeights.getWeight(var.getRef());
-                  if (weight != null) {
+                  if(weight != null) {
                      res.append(" " + weight);
                   }
                }
-               if (symbol instanceof ConstantVar) {
+               if(symbol instanceof ConstantVar) {
                   ConstantVar constantVar = (ConstantVar) symbol;
                   String asmName = constantVar.getAsmName();
-                  if (asmName != null) {
+                  if(asmName != null) {
                      res.append(" " + asmName);
                   }
                   res.append(" = " + constantVar.getValue().toString(program));
@@ -358,32 +361,27 @@ public abstract class Scope implements Symbol {
       return symbols.values();
    }
 
-   @Override
-   public void setScope(Scope scope) {
-      this.parentScope = scope;
-   }
-
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
       Scope scope = (Scope) o;
 
-      if (intermediateVarCount != scope.intermediateVarCount) {
+      if(intermediateVarCount != scope.intermediateVarCount) {
          return false;
       }
-      if (intermediateLabelCount != scope.intermediateLabelCount) {
+      if(intermediateLabelCount != scope.intermediateLabelCount) {
          return false;
       }
-      if (!name.equals(scope.name)) {
+      if(!name.equals(scope.name)) {
          return false;
       }
-      if (!symbols.equals(scope.symbols)) {
+      if(!symbols.equals(scope.symbols)) {
          return false;
       }
       return true;
diff --git a/src/main/java/dk/camelot64/kickc/model/ScopeRef.java b/src/main/java/dk/camelot64/kickc/model/ScopeRef.java
index 738797510..b9bb3419b 100644
--- a/src/main/java/dk/camelot64/kickc/model/ScopeRef.java
+++ b/src/main/java/dk/camelot64/kickc/model/ScopeRef.java
@@ -3,7 +3,7 @@ package dk.camelot64.kickc.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/**  A reference to a scope */
+/** A reference to a scope */
 public class ScopeRef extends SymbolRef {
 
    /** The ROOT scope of the program. */
diff --git a/src/main/java/dk/camelot64/kickc/model/Statement.java b/src/main/java/dk/camelot64/kickc/model/Statement.java
index 36d3ed65b..85ff16dbf 100644
--- a/src/main/java/dk/camelot64/kickc/model/Statement.java
+++ b/src/main/java/dk/camelot64/kickc/model/Statement.java
@@ -23,9 +23,9 @@ public interface Statement {
 
    String toString(Program program, boolean aliveInfo);
 
-   /** Set the index of the statement. Indexes are used during live range analysis. */
-   void setIndex(Integer idx);
-
    /** Get the index of the statement. Indexes are used during live range analysis. */
    Integer getIndex();
+
+   /** Set the index of the statement. Indexes are used during live range analysis. */
+   void setIndex(Integer idx);
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementAssignment.java b/src/main/java/dk/camelot64/kickc/model/StatementAssignment.java
index aa4030b01..91f666d70 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementAssignment.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementAssignment.java
@@ -97,24 +97,24 @@ public class StatementAssignment extends StatementBase implements StatementLValu
    public String toString(Program program, boolean aliveInfo) {
       return
             super.idxString() +
-            lValue.toString(program) + " ← " +
-                  (rValue1==null?"":rValue1.toString(program)+" ") +
-                  (operator==null?"":operator+" ") +
+                  lValue.toString(program) + " ← " +
+                  (rValue1 == null ? "" : rValue1.toString(program) + " ") +
+                  (operator == null ? "" : operator + " ") +
                   rValue2.toString(program) +
-                  (aliveInfo?super.aliveString(program):"");
+                  (aliveInfo ? super.aliveString(program) : "");
    }
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       StatementAssignment that = (StatementAssignment) o;
 
-      if (!lValue.equals(that.lValue)) return false;
-      if (rValue1 != null ? !rValue1.equals(that.rValue1) : that.rValue1 != null) return false;
-      if (operator != null ? !operator.equals(that.operator) : that.operator != null) return false;
+      if(!lValue.equals(that.lValue)) return false;
+      if(rValue1 != null ? !rValue1.equals(that.rValue1) : that.rValue1 != null) return false;
+      if(operator != null ? !operator.equals(that.operator) : that.operator != null) return false;
       return rValue2 != null ? rValue2.equals(that.rValue2) : that.rValue2 == null;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementBase.java b/src/main/java/dk/camelot64/kickc/model/StatementBase.java
index 6b4baa2eb..dbcbb641e 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementBase.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementBase.java
@@ -3,7 +3,7 @@ package dk.camelot64.kickc.model;
 import java.util.Collection;
 import java.util.List;
 
-/** Statement base class implementing shared properties and logic  */
+/** Statement base class implementing shared properties and logic */
 public abstract class StatementBase implements Statement {
 
    private Integer index;
@@ -24,8 +24,8 @@ public abstract class StatementBase implements Statement {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
       StatementBase that = (StatementBase) o;
       return index != null ? index.equals(that.index) : that.index == null;
    }
@@ -36,7 +36,7 @@ public abstract class StatementBase implements Statement {
    }
 
    public String idxString() {
-      return index==null?"":("["+index+"] ");
+      return index == null ? "" : ("[" + index + "] ");
    }
 
    @Override
@@ -45,17 +45,17 @@ public abstract class StatementBase implements Statement {
    }
 
    public String aliveString(Program program) {
-      if(program==null || program.getLiveRangeVariables()==null) {
+      if(program == null || program.getLiveRangeVariables() == null) {
          return "";
       }
       LiveRangeVariables liveRanges = program.getLiveRangeVariables();
       StringBuilder alive = new StringBuilder();
       alive.append(getAliveString(liveRanges.getAlive(this)));
       LiveRangeVariablesEffective liveRangeVariablesEffective = program.getLiveRangeVariablesEffective();
-      if(liveRangeVariablesEffective!=null) {
+      if(liveRangeVariablesEffective != null) {
          LiveRangeVariablesEffective.AliveCombinations aliveCombinations = liveRangeVariablesEffective.getAliveCombinations(this);
          alive.append(" ( ");
-         for (LiveRangeVariablesEffective.CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
+         for(LiveRangeVariablesEffective.CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
             alive.append(getCallPathString(callPath.getPath()));
             alive.append(getAliveString(aliveCombinations.getEffectiveAliveAtStmt(callPath)));
             alive.append(" ");
@@ -68,7 +68,7 @@ public abstract class StatementBase implements Statement {
    private String getCallPathString(List<CallGraph.CallBlock.Call> path) {
       StringBuilder out = new StringBuilder();
       boolean first = true;
-      for (CallGraph.CallBlock.Call call : path) {
+      for(CallGraph.CallBlock.Call call : path) {
          if(!first) {
             out.append("::");
          }
@@ -81,7 +81,7 @@ public abstract class StatementBase implements Statement {
    private String getAliveString(Collection<VariableRef> alive) {
       StringBuilder str = new StringBuilder();
       str.append(" [ ");
-      for (VariableRef variableRef : alive) {
+      for(VariableRef variableRef : alive) {
          str.append(variableRef.getFullName());
          str.append(" ");
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementCall.java b/src/main/java/dk/camelot64/kickc/model/StatementCall.java
index a03a0630f..44db887ad 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementCall.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementCall.java
@@ -100,22 +100,22 @@ public class StatementCall extends StatementBase implements StatementLValue {
    public String toString(Program program, boolean aliveInfo) {
       StringBuilder res = new StringBuilder();
       res.append(super.idxString());
-      if (lValue != null) {
+      if(lValue != null) {
          res.append(lValue.toString(program));
          res.append(" ← ");
       }
       res.append("call ");
-      if (procedure != null) {
+      if(procedure != null) {
          res.append(procedure.getFullName() + " ");
       } else {
          res.append(procedureName + " ");
       }
-      if (parameters != null) {
-         for (RValue parameter : parameters) {
+      if(parameters != null) {
+         for(RValue parameter : parameters) {
             res.append(parameter.toString(program) + " ");
          }
       }
-      if (parametersByAssignment) {
+      if(parametersByAssignment) {
          res.append("param-assignment");
       }
       if(aliveInfo) {
@@ -126,16 +126,16 @@ public class StatementCall extends StatementBase implements StatementLValue {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       StatementCall that = (StatementCall) o;
 
-      if (parametersByAssignment != that.parametersByAssignment) return false;
-      if (lValue != null ? !lValue.equals(that.lValue) : that.lValue != null) return false;
-      if (!procedureName.equals(that.procedureName)) return false;
-      if (procedure != null ? !procedure.equals(that.procedure) : that.procedure != null) return false;
+      if(parametersByAssignment != that.parametersByAssignment) return false;
+      if(lValue != null ? !lValue.equals(that.lValue) : that.lValue != null) return false;
+      if(!procedureName.equals(that.procedureName)) return false;
+      if(procedure != null ? !procedure.equals(that.procedure) : that.procedure != null) return false;
       return parameters != null ? parameters.equals(that.parameters) : that.parameters == null;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementConditionalJump.java b/src/main/java/dk/camelot64/kickc/model/StatementConditionalJump.java
index 65a85ce79..d60abb87e 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementConditionalJump.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementConditionalJump.java
@@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * <i> if ( Y<sub>j</sub> ) goto XX </i>
  * <br>
  * The condition may be a single boolean variable, or a comparison between two variables (==, &lt;&gt;, &lt;, &gt;, &lt;=, &gt;= )
- *
  */
 public class StatementConditionalJump extends StatementBase {
 
@@ -53,30 +52,30 @@ public class StatementConditionalJump extends StatementBase {
       return rValue1;
    }
 
-   public Operator getOperator() {
-      return operator;
-   }
-
-   public RValue getrValue2() {
-      return rValue2;
-   }
-
-   public LabelRef getDestination() {
-      return destination;
-   }
-
    public void setrValue1(RValue rValue1) {
       this.rValue1 = rValue1;
    }
 
+   public Operator getOperator() {
+      return operator;
+   }
+
    public void setOperator(Operator operator) {
       this.operator = operator;
    }
 
+   public RValue getrValue2() {
+      return rValue2;
+   }
+
    public void setrValue2(RValue rValue2) {
       this.rValue2 = rValue2;
    }
 
+   public LabelRef getDestination() {
+      return destination;
+   }
+
    public void setDestination(LabelRef destination) {
       this.destination = destination;
    }
@@ -86,7 +85,7 @@ public class StatementConditionalJump extends StatementBase {
       StringBuilder out = new StringBuilder();
       out.append(super.idxString());
       out.append("if(");
-      if(rValue1!=null) {
+      if(rValue1 != null) {
          out.append(rValue1.toString(program));
          out.append(operator.getOperator());
       }
@@ -101,15 +100,15 @@ public class StatementConditionalJump extends StatementBase {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       StatementConditionalJump that = (StatementConditionalJump) o;
 
-      if (rValue1 != null ? !rValue1.equals(that.rValue1) : that.rValue1 != null) return false;
-      if (operator != null ? !operator.equals(that.operator) : that.operator != null) return false;
-      if (rValue2 != null ? !rValue2.equals(that.rValue2) : that.rValue2 != null) return false;
+      if(rValue1 != null ? !rValue1.equals(that.rValue1) : that.rValue1 != null) return false;
+      if(operator != null ? !operator.equals(that.operator) : that.operator != null) return false;
+      if(rValue2 != null ? !rValue2.equals(that.rValue2) : that.rValue2 != null) return false;
       return destination.equals(that.destination);
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementInfos.java b/src/main/java/dk/camelot64/kickc/model/StatementInfos.java
index 331ddddf0..5ca6c38b0 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementInfos.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementInfos.java
@@ -22,6 +22,7 @@ public class StatementInfos {
 
    /**
     * Get the label of the block containing a statement
+    *
     * @param stmtIdx The statement index
     * @return The block label
     */
@@ -31,6 +32,7 @@ public class StatementInfos {
 
    /**
     * Get the label of the block containing a statement
+    *
     * @param stmt The statement
     * @return The block label
     */
@@ -40,6 +42,7 @@ public class StatementInfos {
 
    /**
     * Get the block containing a statement
+    *
     * @param stmt The statement
     * @return The containing block
     */
@@ -49,6 +52,7 @@ public class StatementInfos {
 
    /**
     * Get the block containing a statement
+    *
     * @param stmtIdx The statement index
     * @return The containing block
     */
@@ -58,6 +62,7 @@ public class StatementInfos {
 
    /**
     * Get statement from index
+    *
     * @param Statement index
     * @return The statement with the passed index
     */
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementJump.java b/src/main/java/dk/camelot64/kickc/model/StatementJump.java
index 5874bdb66..f64ee7dd0 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementJump.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementJump.java
@@ -25,7 +25,7 @@ public class StatementJump extends StatementBase {
 
    @Override
    public String toString(Program program, boolean aliveInfo) {
-      return super.idxString() + "goto " + destination.getFullName()+ (aliveInfo?super.aliveString(program):"");
+      return super.idxString() + "goto " + destination.getFullName() + (aliveInfo ? super.aliveString(program) : "");
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementLabel.java b/src/main/java/dk/camelot64/kickc/model/StatementLabel.java
index a681430c2..e4f73bbc0 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementLabel.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementLabel.java
@@ -18,7 +18,7 @@ public class StatementLabel extends StatementBase {
 
    @Override
    public String toString(Program program, boolean aliveInfo) {
-      return super.idxString() + label.getFullName() + ":"+(aliveInfo?super.aliveString(program):"");
+      return super.idxString() + label.getFullName() + ":" + (aliveInfo ? super.aliveString(program) : "");
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementPhiBlock.java b/src/main/java/dk/camelot64/kickc/model/StatementPhiBlock.java
index 13537d04d..c0873465b 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementPhiBlock.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementPhiBlock.java
@@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * The Phi Block initializing the necessary SSA-variables of a predecessor.
@@ -38,7 +40,7 @@ public class StatementPhiBlock extends StatementBase {
    @JsonIgnore
    public List<VariableRef> getVariables() {
       ArrayList<VariableRef> vars = new ArrayList<>();
-      for (PhiVariable phiVariable : phiVariables) {
+      for(PhiVariable phiVariable : phiVariables) {
          vars.add(phiVariable.getVariable());
       }
       return vars;
@@ -46,8 +48,8 @@ public class StatementPhiBlock extends StatementBase {
    }
 
    public PhiVariable getPhiVariable(VariableRef variable) {
-      for (PhiVariable phiVariable : phiVariables) {
-         if (phiVariable.getVariable().equals(variable)) {
+      for(PhiVariable phiVariable : phiVariables) {
+         if(phiVariable.getVariable().equals(variable)) {
             return phiVariable;
          }
       }
@@ -67,7 +69,7 @@ public class StatementPhiBlock extends StatementBase {
       StringBuilder s = new StringBuilder();
       List<PhiVariable> variables = new ArrayList<>(phiVariables);
       Collections.reverse(variables);
-      if(phiVariables.size()==0) {
+      if(phiVariables.size() == 0) {
          s.append(super.idxString());
          s.append("phi()");
          if(aliveInfo) {
@@ -75,16 +77,16 @@ public class StatementPhiBlock extends StatementBase {
          }
          s.append("\n  ");
       }
-      for (PhiVariable phiVariable : variables) {
+      for(PhiVariable phiVariable : variables) {
          s.append(super.idxString());
          s.append(phiVariable.getVariable().toString(program));
          s.append(" ← phi(");
-         for (PhiRValue phiRValue : phiVariable.getValues()) {
+         for(PhiRValue phiRValue : phiVariable.getValues()) {
             s.append(" ");
             s.append(phiRValue.getPredecessor().toString(null));
             s.append("/");
             RValue rValue = phiRValue.getrValue();
-            s.append(rValue==null?"null":rValue.toString(program));
+            s.append(rValue == null ? "null" : rValue.toString(program));
          }
          s.append(" )");
          if(aliveInfo) {
@@ -92,7 +94,7 @@ public class StatementPhiBlock extends StatementBase {
          }
          s.append("\n  ");
       }
-      if(s.length()>0) {
+      if(s.length() > 0) {
          return s.toString().substring(0, s.length() - 3);
       } else {
          return s.toString();
@@ -112,9 +114,9 @@ public class StatementPhiBlock extends StatementBase {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       StatementPhiBlock phiBlock = (StatementPhiBlock) o;
 
@@ -167,18 +169,17 @@ public class StatementPhiBlock extends StatementBase {
          this.variable = variable;
       }
 
-      public void setValues(List<PhiRValue> values) {
-         this.values = values;
-      }
-
       public List<PhiRValue> getValues() {
          return values;
       }
 
+      public void setValues(List<PhiRValue> values) {
+         this.values = values;
+      }
 
       public RValue getrValue(LabelRef predecessor) {
-         for (PhiRValue phiRValue : values) {
-            if (phiRValue.getPredecessor().equals(predecessor)) {
+         for(PhiRValue phiRValue : values) {
+            if(phiRValue.getPredecessor().equals(predecessor)) {
                return phiRValue.getrValue();
             }
          }
@@ -193,8 +194,8 @@ public class StatementPhiBlock extends StatementBase {
        * @return The rValue assigned to the phi variable when entering from the passed block.
        */
       public PhiRValue getPhirValue(LabelRef predecessor) {
-         for (PhiRValue phiRValue : values) {
-            if (phiRValue.getPredecessor().equals(predecessor)) {
+         for(PhiRValue phiRValue : values) {
+            if(phiRValue.getPredecessor().equals(predecessor)) {
                return phiRValue;
             }
          }
@@ -215,12 +216,12 @@ public class StatementPhiBlock extends StatementBase {
 
       @Override
       public boolean equals(Object o) {
-         if (this == o) return true;
-         if (o == null || getClass() != o.getClass()) return false;
+         if(this == o) return true;
+         if(o == null || getClass() != o.getClass()) return false;
 
          PhiVariable that = (PhiVariable) o;
 
-         if (!variable.equals(that.variable)) return false;
+         if(!variable.equals(that.variable)) return false;
          return values.equals(that.values);
       }
 
@@ -263,6 +264,10 @@ public class StatementPhiBlock extends StatementBase {
          return predecessor;
       }
 
+      public void setPredecessor(LabelRef predecessor) {
+         this.predecessor = predecessor;
+      }
+
       public RValue getrValue() {
          return rValue;
       }
@@ -271,18 +276,14 @@ public class StatementPhiBlock extends StatementBase {
          this.rValue = rValue;
       }
 
-      public void setPredecessor(LabelRef predecessor) {
-         this.predecessor = predecessor;
-      }
-
       @Override
       public boolean equals(Object o) {
-         if (this == o) return true;
-         if (o == null || getClass() != o.getClass()) return false;
+         if(this == o) return true;
+         if(o == null || getClass() != o.getClass()) return false;
 
          PhiRValue phiRValue = (PhiRValue) o;
 
-         if (!predecessor.equals(phiRValue.predecessor)) return false;
+         if(!predecessor.equals(phiRValue.predecessor)) return false;
          return rValue != null ? rValue.equals(phiRValue.rValue) : phiRValue.rValue == null;
       }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementProcedureBegin.java b/src/main/java/dk/camelot64/kickc/model/StatementProcedureBegin.java
index f6d4c5650..a172922c8 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementProcedureBegin.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementProcedureBegin.java
@@ -7,11 +7,6 @@ public class StatementProcedureBegin extends StatementBase {
 
    private Strategy strategy;
 
-   public static enum Strategy {
-      PASS_BY_REGISTER,
-      INLINE
-   }
-
    public StatementProcedureBegin(ProcedureRef procedure) {
       super(null);
       this.procedure = procedure;
@@ -31,7 +26,12 @@ public class StatementProcedureBegin extends StatementBase {
 
    @Override
    public String toString(Program program, boolean aliveInfo) {
-      return super.idxString() + "proc " + procedure.toString(program) + (aliveInfo?super.aliveString(program):"");
+      return super.idxString() + "proc " + procedure.toString(program) + (aliveInfo ? super.aliveString(program) : "");
+   }
+
+   public static enum Strategy {
+      PASS_BY_REGISTER,
+      INLINE
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementProcedureEnd.java b/src/main/java/dk/camelot64/kickc/model/StatementProcedureEnd.java
index a7bcdb3af..f61520dbb 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementProcedureEnd.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementProcedureEnd.java
@@ -18,6 +18,6 @@ public class StatementProcedureEnd extends StatementBase {
 
    @Override
    public String toString(Program program, boolean aliveInfo) {
-      return super.idxString() + "endproc // " + procedure.getFullName() + "()"+(aliveInfo?super.aliveString(program):"");
+      return super.idxString() + "endproc // " + procedure.getFullName() + "()" + (aliveInfo ? super.aliveString(program) : "");
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementReturn.java b/src/main/java/dk/camelot64/kickc/model/StatementReturn.java
index f18c684f2..e39bb5f51 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementReturn.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementReturn.java
@@ -36,14 +36,14 @@ public class StatementReturn extends StatementBase {
 
    @Override
    public String toString(Program program, boolean aliveInfo) {
-      return super.idxString() + "return " + (value == null ? "" : value.toString(program)) + (aliveInfo?super.aliveString(program):"");
+      return super.idxString() + "return " + (value == null ? "" : value.toString(program)) + (aliveInfo ? super.aliveString(program) : "");
    }
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      if (!super.equals(o)) return false;
+      if(this == o) return true;
+      if(o == null || getClass() != o.getClass()) return false;
+      if(!super.equals(o)) return false;
 
       StatementReturn that = (StatementReturn) o;
 
diff --git a/src/main/java/dk/camelot64/kickc/model/StatementSequence.java b/src/main/java/dk/camelot64/kickc/model/StatementSequence.java
index 57e7f0691..a93cded01 100644
--- a/src/main/java/dk/camelot64/kickc/model/StatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/model/StatementSequence.java
@@ -22,11 +22,11 @@ public class StatementSequence {
 
    public String toString(Program program) {
       StringBuffer out = new StringBuffer();
-      for (Statement statement : statements) {
+      for(Statement statement : statements) {
          if(!(statement instanceof StatementLabel) && !(statement instanceof StatementProcedureBegin) && !(statement instanceof StatementProcedureEnd)) {
             out.append("  ");
          }
-         out.append(statement.toString(program, true)+"\n");
+         out.append(statement.toString(program, true) + "\n");
       }
       return out.toString();
    }
diff --git a/src/main/java/dk/camelot64/kickc/model/Symbol.java b/src/main/java/dk/camelot64/kickc/model/Symbol.java
index 03081bc6d..2ca755057 100644
--- a/src/main/java/dk/camelot64/kickc/model/Symbol.java
+++ b/src/main/java/dk/camelot64/kickc/model/Symbol.java
@@ -16,10 +16,10 @@ public interface Symbol extends Value {
    @JsonIgnore
    Scope getScope();
 
+   void setScope(Scope scope);
+
    @JsonIgnore
    int getScopeDepth();
 
-   void setScope(Scope scope);
-
    SymbolRef getRef();
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolRef.java b/src/main/java/dk/camelot64/kickc/model/SymbolRef.java
index f3557a913..108d058e8 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolRef.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolRef.java
@@ -26,10 +26,10 @@ public class SymbolRef implements Value {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
@@ -45,12 +45,12 @@ public class SymbolRef implements Value {
 
    @Override
    public String toString(Program program) {
-      if (program == null) {
+      if(program == null) {
          return fullName;
       } else {
          try {
             return program.getScope().getSymbol(fullName).toString(program);
-         } catch (NullPointerException e) {
+         } catch(NullPointerException e) {
             throw e;
          }
       }
@@ -60,10 +60,10 @@ public class SymbolRef implements Value {
    public int getScopeDepth() {
       int depth = 0;
       char[] chars = fullName.toCharArray();
-      for (char c : chars) {
-         if(c==':') depth++;
+      for(char c : chars) {
+         if(c == ':') depth++;
       }
-      return depth/2;
+      return depth / 2;
    }
 
    @JsonIgnore
@@ -75,7 +75,7 @@ public class SymbolRef implements Value {
    public boolean isIntermediate() {
       if(
             fullName.contains(BEGIN_BLOCK_NAME) ||
-                  fullName.contains(END_BLOCK_NAME) ) return false;
+                  fullName.contains(END_BLOCK_NAME)) return false;
       return fullName.contains("$") || fullName.contains("@");
    }
 
@@ -87,17 +87,17 @@ public class SymbolRef implements Value {
    @JsonIgnore
    public String getLocalName() {
       int lastScopeIdx = fullName.lastIndexOf("::");
-      if(lastScopeIdx==-1) {
+      if(lastScopeIdx == -1) {
          return fullName;
       } else {
-         return fullName.substring(lastScopeIdx+2);
+         return fullName.substring(lastScopeIdx + 2);
       }
    }
 
    @JsonIgnore
    public String getScopeNames() {
       int lastScopeIdx = fullName.lastIndexOf("::");
-      if(lastScopeIdx==-1) {
+      if(lastScopeIdx == -1) {
          return "";
       } else {
          return fullName.substring(0, lastScopeIdx);
@@ -112,7 +112,7 @@ public class SymbolRef implements Value {
    public String getFullNameUnversioned() {
       if(isVersion()) {
          return fullName.substring(0, fullName.indexOf("#"));
-      }  else {
+      } else {
          return fullName;
       }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolType.java b/src/main/java/dk/camelot64/kickc/model/SymbolType.java
index 0c887062d..c08020ff6 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolType.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolType.java
@@ -10,8 +10,8 @@ public interface SymbolType {
    SymbolTypeInteger BYTE = new SymbolTypeInteger("byte", 0, 255);
    /** Signed byte (8 bits). */
    SymbolTypeInteger SBYTE = new SymbolTypeInteger("signed byte", -128, 127);
-    /** Unsigned word (2 bytes, 16 bits). */
-   SymbolTypeInteger WORD = new SymbolTypeInteger("word", 0, 	65_535);
+   /** Unsigned word (2 bytes, 16 bits). */
+   SymbolTypeInteger WORD = new SymbolTypeInteger("word", 0, 65_535);
    /** Signed word (2 bytes, 16 bits). */
    SymbolTypeInteger SWORD = new SymbolTypeInteger("signed word", -32_768, 32_767);
    /** String value (treated like byte* ). */
@@ -27,32 +27,35 @@ public interface SymbolType {
    /** An unresolved type. Will be infered later. */
    SymbolTypeBasic VAR = new SymbolTypeBasic("var");
 
-   /**
-    * Get the name of the type
-    * @return The type name
-    */
-   String getTypeName();
-
    /**
     * Get a simple symbol type from the type name.
+    *
     * @param name The type name.
     * @return The simple symbol type
     */
    static SymbolType get(String name) {
-      switch (name) {
-         case "byte": return BYTE;
-         case "signed byte": return SBYTE;
-         case "word": return WORD;
-         case "signed word": return SWORD;
-         case "string": return STRING;
-         case "boolean": return BOOLEAN;
-         case "void": return VOID;
+      switch(name) {
+         case "byte":
+            return BYTE;
+         case "signed byte":
+            return SBYTE;
+         case "word":
+            return WORD;
+         case "signed word":
+            return SWORD;
+         case "string":
+            return STRING;
+         case "boolean":
+            return BOOLEAN;
+         case "void":
+            return VOID;
       }
       return null;
    }
 
    /**
     * Get all integer types.
+    *
     * @return All integeer types
     */
    static Collection<SymbolTypeInteger> getIntegerTypes() {
@@ -66,6 +69,7 @@ public interface SymbolType {
 
    /**
     * Is the type {@link #BYTE} or compatible {@link SymbolTypeInline}
+    *
     * @param type The type to examine
     * @return true if the type is BYTE compatible
     */
@@ -81,6 +85,7 @@ public interface SymbolType {
 
    /**
     * Is the type {@link #SBYTE} or compatible {@link SymbolTypeInline}
+    *
     * @param type The type to examine
     * @return true if the type is SBYTE compatible
     */
@@ -96,6 +101,7 @@ public interface SymbolType {
 
    /**
     * Is the type {@link #WORD} or compatible {@link SymbolTypeInline}
+    *
     * @param type The type to examine
     * @return true if the type is WORD compatible
     */
@@ -111,6 +117,7 @@ public interface SymbolType {
 
    /**
     * Is the type {@link #SWORD} or compatible {@link SymbolTypeInline}
+    *
     * @param type The type to examine
     * @return true if the type is SWORD compatible
     */
@@ -124,4 +131,11 @@ public interface SymbolType {
       }
    }
 
+   /**
+    * Get the name of the type
+    *
+    * @return The type name
+    */
+   String getTypeName();
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeBasic.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeBasic.java
index c31d4245d..fcd9a6f60 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeBasic.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeBasic.java
@@ -15,10 +15,10 @@ public class SymbolTypeBasic implements SymbolType {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInference.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInference.java
index a10fdcaea..42b6b1600 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInference.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInference.java
@@ -14,8 +14,8 @@ public class SymbolTypeInference {
     * Infer the type of a unary operator on a value
     *
     * @param programScope The program scope usable for accessing the symbol table
-    * @param operator     The unary operator
-    * @param rValue       The value
+    * @param operator The unary operator
+    * @param rValue The value
     * @return The type of the resulting value
     */
    public static SymbolType inferType(ProgramScope programScope, Operator operator, RValue rValue) {
@@ -179,7 +179,7 @@ public class SymbolTypeInference {
          return SymbolType.STRING;
       } else if(type1.equals(SymbolType.STRING) && type2 instanceof SymbolTypeArray && SymbolType.isByte(((SymbolTypeArray) type2).getElementType())) {
          return SymbolType.STRING;
-      } else if(type1 instanceof SymbolTypeArray && SymbolType.isByte(((SymbolTypeArray) type1).getElementType()) && type2.equals(SymbolType.STRING) ) {
+      } else if(type1 instanceof SymbolTypeArray && SymbolType.isByte(((SymbolTypeArray) type1).getElementType()) && type2.equals(SymbolType.STRING)) {
          return SymbolType.STRING;
       } else if(type1 instanceof SymbolTypeArray && type2 instanceof SymbolTypeArray) {
          SymbolType elemType1 = ((SymbolTypeArray) type1).getElementType();
@@ -287,7 +287,7 @@ public class SymbolTypeInference {
          type = inferTypeList(symbols, (ValueList) rValue);
       } else if(rValue instanceof PointerDereference) {
          SymbolType pointerType = inferType(symbols, ((PointerDereference) rValue).getPointer());
-         if(pointerType instanceof SymbolTypePointer ) {
+         if(pointerType instanceof SymbolTypePointer) {
             return ((SymbolTypePointer) pointerType).getElementType();
          } else if(pointerType.equals(SymbolType.STRING)) {
             return SymbolType.BYTE;
@@ -380,7 +380,7 @@ public class SymbolTypeInference {
          if(SymbolType.isByte(((SymbolTypePointer) lValueType).getElementType())) {
             return true;
          }
-      } else if(SymbolType.STRING.equals(lValueType) && rValueType instanceof SymbolTypePointer ) {
+      } else if(SymbolType.STRING.equals(lValueType) && rValueType instanceof SymbolTypePointer) {
          if(SymbolType.isByte(((SymbolTypePointer) rValueType).getElementType())) {
             return true;
          }
@@ -401,7 +401,7 @@ public class SymbolTypeInference {
     * Determine is a list of potential inferred types contains a match for another type
     *
     * @param lValueType The type (rValue) we want to find a match for in the list
-    * @param rTypes     The list of inferred potential types
+    * @param rTypes The list of inferred potential types
     * @return true if the list has a match
     */
    private static boolean typeContainsMatch(SymbolType lValueType, Collection<SymbolType> rTypes) {
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInline.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInline.java
index e0651c983..b4fe607e9 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInline.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInline.java
@@ -9,6 +9,8 @@ import java.util.Collection;
  */
 public class SymbolTypeInline implements SymbolType {
 
+   /** All numeric types. */
+   public static final SymbolTypeInline NUMERIC = new SymbolTypeInline(Arrays.asList(BYTE, SBYTE, WORD, SWORD));
    /**
     * All potential types for the inline constant.
     */
@@ -22,15 +24,12 @@ public class SymbolTypeInline implements SymbolType {
       return types;
    }
 
-   /** All numeric types. */
-   public static final SymbolTypeInline NUMERIC = new SymbolTypeInline(Arrays.asList(BYTE, SBYTE, WORD, SWORD) );
-
    @Override
    public String getTypeName() {
       StringBuilder name = new StringBuilder();
       boolean first = true;
-      for (SymbolType type : types) {
-         if (first) {
+      for(SymbolType type : types) {
+         if(first) {
             first = false;
          } else {
             name.append("/");
@@ -42,10 +41,10 @@ public class SymbolTypeInline implements SymbolType {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
       SymbolTypeInline that = (SymbolTypeInline) o;
@@ -64,6 +63,7 @@ public class SymbolTypeInline implements SymbolType {
 
    /**
     * Is unsigned byte one of the potential types
+    *
     * @return true if unsigned byte is a potential type
     */
    public boolean isByte() {
@@ -72,6 +72,7 @@ public class SymbolTypeInline implements SymbolType {
 
    /**
     * Is signed byte one of the potential types
+    *
     * @return true if signed byte is a potential type
     */
    public boolean isSByte() {
@@ -80,6 +81,7 @@ public class SymbolTypeInline implements SymbolType {
 
    /**
     * Is unsigned word one of the potential types
+    *
     * @return true if unsigned word is a potential type
     */
    public boolean isWord() {
@@ -88,6 +90,7 @@ public class SymbolTypeInline implements SymbolType {
 
    /**
     * Is signed word one of the potential types
+    *
     * @return true if signed word is a potential type
     */
    public boolean isSWord() {
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInteger.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInteger.java
index 34abe30fb..5af7057fb 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeInteger.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeInteger.java
@@ -1,6 +1,6 @@
 package dk.camelot64.kickc.model;
 
-/** Integer symbol types (byte, signed byte, word, ...).  */
+/** Integer symbol types (byte, signed byte, word, ...). */
 public class SymbolTypeInteger implements SymbolType {
 
    private final String typeName;
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypePointer.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypePointer.java
index bfbf48dda..883bf4d4b 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypePointer.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypePointer.java
@@ -26,15 +26,15 @@ public class SymbolTypePointer implements SymbolType {
    @Override
    @JsonIgnore
    public String getTypeName() {
-      return elementType.getTypeName()+"*";
+      return elementType.getTypeName() + "*";
    }
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeProcedure.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeProcedure.java
index e40bdf9ca..785e13c73 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeProcedure.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeProcedure.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/**  A function returning another type */
+/** A function returning another type */
 public class SymbolTypeProcedure implements SymbolType {
 
    private SymbolType returnType;
diff --git a/src/main/java/dk/camelot64/kickc/model/SymbolTypeProgram.java b/src/main/java/dk/camelot64/kickc/model/SymbolTypeProgram.java
index 7190f805d..54d94fcda 100644
--- a/src/main/java/dk/camelot64/kickc/model/SymbolTypeProgram.java
+++ b/src/main/java/dk/camelot64/kickc/model/SymbolTypeProgram.java
@@ -2,7 +2,7 @@ package dk.camelot64.kickc.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-/**  A program */
+/** A program */
 public class SymbolTypeProgram implements SymbolType {
 
    public SymbolTypeProgram() {
diff --git a/src/main/java/dk/camelot64/kickc/model/Value.java b/src/main/java/dk/camelot64/kickc/model/Value.java
index 159f9c8ad..0601c78d2 100644
--- a/src/main/java/dk/camelot64/kickc/model/Value.java
+++ b/src/main/java/dk/camelot64/kickc/model/Value.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
       @JsonSubTypes.Type(value = PointerDereferenceSimple.class, name = "pointer_simple"),
       @JsonSubTypes.Type(value = ProgramScope.class, name = "program"),
       @JsonSubTypes.Type(value = Procedure.class, name = "procedure")
-      })
+})
 public interface Value {
 
-      String toString(Program program);
+   String toString(Program program);
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/ValueList.java b/src/main/java/dk/camelot64/kickc/model/ValueList.java
index 5e54a3bff..c286a1931 100644
--- a/src/main/java/dk/camelot64/kickc/model/ValueList.java
+++ b/src/main/java/dk/camelot64/kickc/model/ValueList.java
@@ -2,10 +2,12 @@ package dk.camelot64.kickc.model;
 
 import java.util.List;
 
-/** A list of sub-values. Used for array variable initializers and word from byte constructors
+/**
+ * A list of sub-values. Used for array variable initializers and word from byte constructors
  * (in the future also usable for dword from byte, dword from double etc.).
  * Compilation execution will resolve into a constant array,
- * constant word or word constructor operator before ASM-generation. */
+ * constant word or word constructor operator before ASM-generation.
+ */
 public class ValueList implements RValue {
 
    private List<RValue> list;
@@ -23,8 +25,8 @@ public class ValueList implements RValue {
       StringBuilder out = new StringBuilder();
       boolean first = true;
       out.append("{ ");
-      for (RValue constantValue : list) {
-         if (!first) {
+      for(RValue constantValue : list) {
+         if(!first) {
             out.append(", ");
          }
          first = false;
diff --git a/src/main/java/dk/camelot64/kickc/model/Variable.java b/src/main/java/dk/camelot64/kickc/model/Variable.java
index d16829599..c4cde7572 100644
--- a/src/main/java/dk/camelot64/kickc/model/Variable.java
+++ b/src/main/java/dk/camelot64/kickc/model/Variable.java
@@ -51,6 +51,10 @@ public abstract class Variable implements Symbol {
       return type;
    }
 
+   public void setType(SymbolType type) {
+      this.type = type;
+   }
+
    public void setTypeInferred(SymbolType type) {
       this.type = type;
       this.inferredType = true;
@@ -64,22 +68,14 @@ public abstract class Variable implements Symbol {
       this.inferredType = inferredType;
    }
 
-   public void setScope(Scope scope) {
-      this.scope = scope;
-   }
-
-   public void setType(SymbolType type) {
-      this.type = type;
+   public String getName() {
+      return name;
    }
 
    public void setName(String name) {
       this.name = name;
    }
 
-   public String getName() {
-      return name;
-   }
-
    public Registers.Register getAllocation() {
       return allocation;
    }
@@ -102,17 +98,20 @@ public abstract class Variable implements Symbol {
    @JsonIgnore
    public abstract boolean isIntermediate();
 
-
    public Scope getScope() {
       return scope;
    }
 
+   public void setScope(Scope scope) {
+      this.scope = scope;
+   }
+
    @Override
    public int getScopeDepth() {
-      if(scope==null) {
+      if(scope == null) {
          return 0;
       } else {
-         return scope.getScopeDepth()+1;
+         return scope.getScopeDepth() + 1;
       }
    }
 
@@ -155,28 +154,28 @@ public abstract class Variable implements Symbol {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
 
       Variable variable = (Variable) o;
 
-      if (inferredType != variable.inferredType) {
+      if(inferredType != variable.inferredType) {
          return false;
       }
-      if (name != null ? !name.equals(variable.name) : variable.name != null) {
+      if(name != null ? !name.equals(variable.name) : variable.name != null) {
          return false;
       }
-      if (scope != null ? !scope.equals(variable.scope) : variable.scope != null) {
+      if(scope != null ? !scope.equals(variable.scope) : variable.scope != null) {
          return false;
       }
-      if (type != null ? !type.equals(variable.type) : variable.type != null) {
+      if(type != null ? !type.equals(variable.type) : variable.type != null) {
          return false;
       }
-      if (allocation != null ? !allocation.equals(variable.allocation) : variable.allocation != null) {
+      if(allocation != null ? !allocation.equals(variable.allocation) : variable.allocation != null) {
          return false;
       }
       return asmName != null ? asmName.equals(variable.asmName) : variable.asmName == null;
diff --git a/src/main/java/dk/camelot64/kickc/model/VariableReferenceInfos.java b/src/main/java/dk/camelot64/kickc/model/VariableReferenceInfos.java
index 13e6ee9c0..124006449 100644
--- a/src/main/java/dk/camelot64/kickc/model/VariableReferenceInfos.java
+++ b/src/main/java/dk/camelot64/kickc/model/VariableReferenceInfos.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-/**  Cached information about which variables are defined/referenced/used in statements / blocks. */
+/** Cached information about which variables are defined/referenced/used in statements / blocks. */
 public class VariableReferenceInfos {
 
    /** The congtaining program. */
@@ -33,7 +33,7 @@ public class VariableReferenceInfos {
    /** All statements referencing each constant. */
    private Map<ConstantRef, Collection<Integer>> constRefStmts;
 
-   /** All constants referencing another constant. (maps from a constant to all constants using it in their value)*/
+   /** All constants referencing another constant. (maps from a constant to all constants using it in their value) */
    private Map<ConstantRef, Collection<ConstantRef>> constRefConsts;
 
    public VariableReferenceInfos(
@@ -57,8 +57,19 @@ public class VariableReferenceInfos {
       this.constRefConsts = constRefConsts;
    }
 
+   /**
+    * Get all variables referenced in an rValue
+    *
+    * @param rValue The rValue
+    * @return All referenced variables
+    */
+   public static Collection<VariableRef> getReferencedVars(RValue rValue) {
+      return PassNVariableReferenceInfos.getReferencedVars(rValue);
+   }
+
    /**
     * Get all variables used or defined inside a block and its successors (including any called method)
+    *
     * @param labelRef The block to examine
     * @return All used variables
     */
@@ -68,6 +79,7 @@ public class VariableReferenceInfos {
 
    /**
     * Get all variables used inside a block and its successors (including any called method)
+    *
     * @param labelRef The block to examine
     * @return All used variables
     */
@@ -77,6 +89,7 @@ public class VariableReferenceInfos {
 
    /**
     * Get the variables defined by a statement
+    *
     * @param stmt The statement
     * @return Variables defined by the statement
     */
@@ -86,6 +99,7 @@ public class VariableReferenceInfos {
 
    /**
     * Get the variables referenced (used or defined) in a statement
+    *
     * @param statement The statement to examine
     * @return The referenced variables
     */
@@ -95,6 +109,7 @@ public class VariableReferenceInfos {
 
    /**
     * Get the variables used, but not defined, in a statement
+    *
     * @param statement The statement to examine
     * @return The used variables (not including defined variables)
     */
@@ -105,27 +120,20 @@ public class VariableReferenceInfos {
       return used;
    }
 
-   /**
-    * Get all variables referenced in an rValue
-    * @param rValue The rValue
-    * @return All referenced variables
-    */
-   public static Collection<VariableRef> getReferencedVars(RValue rValue) {
-      return PassNVariableReferenceInfos.getReferencedVars(rValue);
-   }
-
    /**
     * Determines if a variable is unused
+    *
     * @return true if the variable is defined but never referenced
     */
    public boolean isUnused(VariableRef variableRef) {
       Collection<Integer> refs = new LinkedHashSet<>(varRefStmts.get(variableRef));
       refs.remove(varDefineStmt.get(variableRef));
-      return refs.size()==0;
+      return refs.size() == 0;
    }
 
    /**
     * Determines if a constant is unused
+    *
     * @return true if the constant is never referenced
     */
    public boolean isUnused(ConstantRef constRef) {
diff --git a/src/main/java/dk/camelot64/kickc/model/VariableRegisterWeights.java b/src/main/java/dk/camelot64/kickc/model/VariableRegisterWeights.java
index 89de874f4..6217875eb 100644
--- a/src/main/java/dk/camelot64/kickc/model/VariableRegisterWeights.java
+++ b/src/main/java/dk/camelot64/kickc/model/VariableRegisterWeights.java
@@ -20,11 +20,11 @@ public class VariableRegisterWeights {
     * Add to the weight of a variable
     *
     * @param variableRef The variable
-    * @param w           The amount to add to the weight
+    * @param w The amount to add to the weight
     */
    public void addWeight(VariableRef variableRef, double w) {
       Double weight = this.registerWeights.get(variableRef);
-      if (weight == null) {
+      if(weight == null) {
          weight = 0.0;
       }
       weight = weight + w;
@@ -38,7 +38,7 @@ public class VariableRegisterWeights {
    public double getTotalWeight(LiveRangeEquivalenceClass equivalenceClass) {
       double totalWeight = 0.0;
       List<VariableRef> vars = equivalenceClass.getVariables();
-      for (VariableRef var : vars) {
+      for(VariableRef var : vars) {
          Double varWeight = getWeight(var);
          totalWeight += varWeight;
       }
@@ -47,7 +47,7 @@ public class VariableRegisterWeights {
 
    public double getTotalWeights(RegisterUpliftScope upliftScope) {
       double totalWeight = 0.0;
-      for (LiveRangeEquivalenceClass equivalenceClass : upliftScope.getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : upliftScope.getEquivalenceClasses()) {
          totalWeight += getTotalWeight(equivalenceClass);
       }
       return totalWeight;
diff --git a/src/main/java/dk/camelot64/kickc/model/VariableUnversioned.java b/src/main/java/dk/camelot64/kickc/model/VariableUnversioned.java
index 97b1d5a17..7f7f996fa 100644
--- a/src/main/java/dk/camelot64/kickc/model/VariableUnversioned.java
+++ b/src/main/java/dk/camelot64/kickc/model/VariableUnversioned.java
@@ -34,8 +34,8 @@ public class VariableUnversioned extends Variable {
    }
 
    public VariableVersion createVersion() {
-         VariableVersion version = new VariableVersion(this, this.getNextVersionNumber());
-         getScope().add(version);
-         return version;
+      VariableVersion version = new VariableVersion(this, this.getNextVersionNumber());
+      getScope().add(version);
+      return version;
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/VariableVersion.java b/src/main/java/dk/camelot64/kickc/model/VariableVersion.java
index 206ad7ed8..94e37e6fd 100644
--- a/src/main/java/dk/camelot64/kickc/model/VariableVersion.java
+++ b/src/main/java/dk/camelot64/kickc/model/VariableVersion.java
@@ -10,7 +10,7 @@ public class VariableVersion extends Variable {
    private String versionOfName;
 
    public VariableVersion(VariableUnversioned versionOf, int version) {
-      super(versionOf.getLocalName()+"#"+version, versionOf.getScope(), versionOf.getType());
+      super(versionOf.getLocalName() + "#" + version, versionOf.getScope(), versionOf.getType());
       this.setDeclaredAlignment(versionOf.getDeclaredAlignment());
       this.versionOfName = versionOf.getLocalName();
    }
@@ -49,13 +49,13 @@ public class VariableVersion extends Variable {
 
    @Override
    public boolean equals(Object o) {
-      if (this == o) {
+      if(this == o) {
          return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if(o == null || getClass() != o.getClass()) {
          return false;
       }
-      if (!super.equals(o)) {
+      if(!super.equals(o)) {
          return false;
       }
 
diff --git a/src/main/java/dk/camelot64/kickc/passes/AliasReplacer.java b/src/main/java/dk/camelot64/kickc/passes/AliasReplacer.java
index 41e290d8f..767d818e0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/AliasReplacer.java
+++ b/src/main/java/dk/camelot64/kickc/passes/AliasReplacer.java
@@ -24,52 +24,52 @@ public class AliasReplacer implements ValueReplacer.Replacer {
     * @return The alias to use. Null if no alias exists.
     */
    public static RValue getReplacement(RValue rValue, Map<? extends SymbolRef, ? extends RValue> aliases) {
-      if (rValue instanceof SymbolRef) {
+      if(rValue instanceof SymbolRef) {
          RValue alias = aliases.get(rValue);
-         if (alias != null) {
-            if (alias.equals(rValue)) {
+         if(alias != null) {
+            if(alias.equals(rValue)) {
                return alias;
             }
             RValue replacement = getReplacement(alias, aliases);
-            if (replacement != null) {
+            if(replacement != null) {
                return replacement;
             } else {
                return alias;
             }
          }
-      } else if (rValue instanceof ConstantUnary) {
+      } else if(rValue instanceof ConstantUnary) {
          ConstantUnary constantUnary = (ConstantUnary) rValue;
          ConstantValue alias = (ConstantValue) getReplacement(constantUnary.getOperand(), aliases);
-         if (alias != null) {
+         if(alias != null) {
             return new ConstantUnary(constantUnary.getOperator(), alias);
          }
-      } else if (rValue instanceof ConstantBinary) {
+      } else if(rValue instanceof ConstantBinary) {
          ConstantBinary constantBinary = (ConstantBinary) rValue;
          ConstantValue aliasLeft = (ConstantValue) getReplacement(constantBinary.getLeft(), aliases);
          ConstantValue aliasRight = (ConstantValue) getReplacement(constantBinary.getRight(), aliases);
-         if (aliasLeft != null || aliasRight != null) {
-            if (aliasLeft == null) {
+         if(aliasLeft != null || aliasRight != null) {
+            if(aliasLeft == null) {
                aliasLeft = constantBinary.getLeft();
             }
-            if (aliasRight == null) {
+            if(aliasRight == null) {
                aliasRight = constantBinary.getRight();
             }
             return new ConstantBinary(aliasLeft, constantBinary.getOperator(), aliasRight);
          }
-      } else if (rValue instanceof ConstantArrayList) {
+      } else if(rValue instanceof ConstantArrayList) {
          ConstantArrayList constantArrayList = (ConstantArrayList) rValue;
          ArrayList<ConstantValue> replacementList = new ArrayList<>();
          boolean any = false;
-         for (ConstantValue elemValue : constantArrayList.getElements()) {
+         for(ConstantValue elemValue : constantArrayList.getElements()) {
             RValue elemReplacement = getReplacement(elemValue, aliases);
-            if (elemReplacement != null) {
+            if(elemReplacement != null) {
                replacementList.add((ConstantValue) elemReplacement);
                any = true;
             } else {
                replacementList.add(elemValue);
             }
          }
-         if (any) {
+         if(any) {
             return new ConstantArrayList(replacementList, constantArrayList.getElementType());
          }
       }
@@ -81,13 +81,14 @@ public class AliasReplacer implements ValueReplacer.Replacer {
 
    /**
     * Execute alias replacement on a replaceable value
+    *
     * @param replaceable The replaceable value
     */
    @Override
    public void execute(ValueReplacer.ReplaceableValue replaceable, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock) {
-      if (replaceable.get() != null) {
+      if(replaceable.get() != null) {
          RValue replacement = getReplacement(replaceable.get(), aliases);
-         if (replacement != null) {
+         if(replacement != null) {
             replaceable.set(replacement);
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/ParseTreeConstantEvaluator.java b/src/main/java/dk/camelot64/kickc/passes/ParseTreeConstantEvaluator.java
index 35d6b864b..3eda464ee 100644
--- a/src/main/java/dk/camelot64/kickc/passes/ParseTreeConstantEvaluator.java
+++ b/src/main/java/dk/camelot64/kickc/passes/ParseTreeConstantEvaluator.java
@@ -19,10 +19,99 @@ public class ParseTreeConstantEvaluator extends KickCBaseVisitor<ConstantValue>
       return (new ParseTreeConstantEvaluator()).visit(expr);
    }
 
+   static ConstantValue calculateBinary(Operator operator, ConstantValue c1, ConstantValue c2) {
+      switch(operator.getOperator()) {
+         case "-": {
+            if(c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
+               return new ConstantInteger(getInteger(c1) - getInteger(c2));
+            } else {
+               return new ConstantDouble(getDouble(c1) - getDouble(c2));
+            }
+         }
+         case "+": {
+            if(c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
+               return new ConstantInteger(getInteger(c1) + getInteger(c2));
+            } else {
+               return new ConstantDouble(getDouble(c1) + getDouble(c2));
+            }
+         }
+         case "*": {
+            if(c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
+               return new ConstantInteger(getInteger(c1) * getInteger(c2));
+            } else {
+               return new ConstantDouble(getDouble(c1) * getDouble(c2));
+            }
+         }
+         case "/": {
+            if(c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
+               return new ConstantInteger(getInteger(c1) / getInteger(c2));
+            } else {
+               return new ConstantDouble(getDouble(c1) / getDouble(c2));
+            }
+         }
+         case "*idx": {
+            // Cannot be directly propagated
+            return null;
+         }
+         default:
+            throw new RuntimeException("Unhandled Binary Operator " + operator.getOperator());
+      }
+   }
+
+   private static Integer getInteger(ConstantValue constant) {
+      if(constant instanceof ConstantInteger) {
+         return ((ConstantInteger) constant).getNumber();
+      } else {
+         throw new RuntimeException("Type Mismatch. Constant is not an integer number " + constant);
+      }
+   }
+
+   private static Double getDouble(ConstantValue constant) {
+      if(constant instanceof ConstantDouble) {
+         return ((ConstantDouble) constant).getNumber();
+      } else if(constant instanceof ConstantInteger) {
+         return ((ConstantInteger) constant).getNumber().doubleValue();
+      } else {
+         throw new RuntimeException("Type Mismatch. Constant is not a number " + constant);
+      }
+   }
+
+   public static ConstantValue calculateUnary(Operator operator, ConstantValue c) {
+      switch(operator.getOperator()) {
+         case "-": {
+            if(c instanceof ConstantInteger) {
+               ConstantInteger cInt = (ConstantInteger) c;
+               return new ConstantInteger(-cInt.getNumber());
+            } else if(c instanceof ConstantDouble) {
+               ConstantDouble cDoub = (ConstantDouble) c;
+               return new ConstantDouble(-cDoub.getNumber());
+            } else {
+               throw new RuntimeException("Type mismatch. Unary Minus cannot handle value " + c);
+            }
+         }
+         case "+": {
+            return c;
+         }
+         case "++": {
+            ConstantInteger cInt = (ConstantInteger) c;
+            return new ConstantInteger(cInt.getNumber() + 1);
+         }
+         case "--": {
+            ConstantInteger cInt = (ConstantInteger) c;
+            return new ConstantInteger(cInt.getNumber() - 1);
+         }
+         case "*": { // pointer dereference
+            return null;
+         }
+         default:
+            throw new RuntimeException("Unhandled Unary Operator " + operator.getOperator());
+      }
+   }
+
    @Override
    public ConstantValue visitExprNumber(KickCParser.ExprNumberContext ctx) {
       Number number = NumberParser.parseLiteral(ctx.getText());
-      if(number instanceof Integer)  {
+      if(number instanceof Integer) {
          return new ConstantInteger((Integer) number);
       } else {
          return new ConstantDouble((Double) number);
@@ -72,7 +161,7 @@ public class ParseTreeConstantEvaluator extends KickCBaseVisitor<ConstantValue>
    @Override
    public ConstantValue visitExprUnary(KickCParser.ExprUnaryContext ctx) {
       ConstantValue sub = visit(ctx.expr());
-      String op = ((TerminalNode)ctx.getChild(0)).getSymbol().getText();
+      String op = ((TerminalNode) ctx.getChild(0)).getSymbol().getText();
       Operator operator = Operator.getUnary(op);
       return calculateUnary(operator, sub);
    }
@@ -81,7 +170,7 @@ public class ParseTreeConstantEvaluator extends KickCBaseVisitor<ConstantValue>
    public ConstantValue visitExprBinary(KickCParser.ExprBinaryContext ctx) {
       ConstantValue left = this.visit(ctx.expr(0));
       ConstantValue right = this.visit(ctx.expr(1));
-      String op = ((TerminalNode)ctx.getChild(1)).getSymbol().getText();
+      String op = ((TerminalNode) ctx.getChild(1)).getSymbol().getText();
       Operator operator = Operator.getBinary(op);
       return calculateBinary(operator, left, right);
    }
@@ -92,93 +181,4 @@ public class ParseTreeConstantEvaluator extends KickCBaseVisitor<ConstantValue>
       }
    }
 
-   static ConstantValue calculateBinary(Operator operator, ConstantValue c1, ConstantValue c2) {
-      switch (operator.getOperator()) {
-         case "-": {
-            if (c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
-               return new ConstantInteger(getInteger(c1) - getInteger(c2));
-            } else {
-               return new ConstantDouble(getDouble(c1) - getDouble(c2));
-            }
-         }
-         case "+": {
-            if (c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
-               return new ConstantInteger(getInteger(c1) + getInteger(c2));
-            } else {
-               return new ConstantDouble(getDouble(c1) + getDouble(c2));
-            }
-         }
-         case "*": {
-            if (c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
-               return new ConstantInteger(getInteger(c1) * getInteger(c2));
-            } else {
-               return new ConstantDouble(getDouble(c1) * getDouble(c2));
-            }
-         }
-         case "/": {
-            if (c1 instanceof ConstantInteger && c2 instanceof ConstantInteger) {
-               return new ConstantInteger(getInteger(c1) / getInteger(c2));
-            } else {
-               return new ConstantDouble(getDouble(c1) / getDouble(c2));
-            }
-         }
-         case "*idx": {
-            // Cannot be directly propagated
-            return null;
-         }
-         default:
-            throw new RuntimeException("Unhandled Binary Operator " + operator.getOperator());
-      }
-   }
-
-   private static Integer getInteger(ConstantValue constant) {
-      if (constant instanceof ConstantInteger) {
-         return ((ConstantInteger) constant).getNumber();
-      } else {
-         throw new RuntimeException("Type Mismatch. Constant is not an integer number " + constant);
-      }
-   }
-
-   private static Double getDouble(ConstantValue constant) {
-      if (constant instanceof ConstantDouble) {
-         return ((ConstantDouble) constant).getNumber();
-      } else if (constant instanceof ConstantInteger) {
-         return ((ConstantInteger) constant).getNumber().doubleValue();
-      } else {
-         throw new RuntimeException("Type Mismatch. Constant is not a number " + constant);
-      }
-   }
-
-   public static ConstantValue calculateUnary(Operator operator, ConstantValue c) {
-      switch (operator.getOperator()) {
-         case "-": {
-            if (c instanceof ConstantInteger) {
-               ConstantInteger cInt = (ConstantInteger) c;
-               return new ConstantInteger(-cInt.getNumber());
-            } else if (c instanceof ConstantDouble) {
-               ConstantDouble cDoub = (ConstantDouble) c;
-               return new ConstantDouble(-cDoub.getNumber());
-            } else {
-               throw new RuntimeException("Type mismatch. Unary Minus cannot handle value " + c);
-            }
-         }
-         case "+": {
-            return c;
-         }
-         case "++": {
-            ConstantInteger cInt = (ConstantInteger) c;
-            return new ConstantInteger(cInt.getNumber()+1);
-         }
-         case "--": {
-            ConstantInteger cInt = (ConstantInteger) c;
-            return new ConstantInteger(cInt.getNumber()-1);
-         }
-         case "*": { // pointer dereference
-            return null;
-         }
-         default:
-            throw new RuntimeException("Unhandled Unary Operator " + operator.getOperator());
-      }
-   }
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index f71902dbd..70ee4c868 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -152,7 +152,7 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
             if(type instanceof SymbolTypeArray || type.equals(SymbolType.STRING)) {
                lValue.setDeclaredAlignment(((DirectiveAlign) directive).getAlignment());
             } else {
-               throw new CompileError("Error! Cannot align variable that is not a string or an array " +lValue.toString(program));
+               throw new CompileError("Error! Cannot align variable that is not a string or an array " + lValue.toString(program));
             }
          } else {
             throw new CompileError("Unknown directive " + directive);
@@ -178,9 +178,6 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
       return null;
    }
 
-   /** A declaration directive.*/
-   private interface Directive {}
-
    @Override
    public List<Directive> visitDirectives(KickCParser.DirectivesContext ctx) {
       ArrayList<Directive> directives = new ArrayList<>();
@@ -190,27 +187,11 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
       return directives;
    }
 
-   /** Variable declared constant. */
-   private static class DirectiveConst implements Directive { }
-
    @Override
    public Directive visitDirectiveConst(KickCParser.DirectiveConstContext ctx) {
       return new DirectiveConst();
    }
 
-   /** Variable memory alignment. */
-   private static class DirectiveAlign implements Directive {
-      private int alignment;
-
-      public DirectiveAlign(int alignment) {
-         this.alignment = alignment;
-      }
-
-      public int getAlignment() {
-         return alignment;
-      }
-   }
-
    @Override
    public Directive visitDirectiveAlign(KickCParser.DirectiveAlignContext ctx) {
       Number alignment = NumberParser.parseLiteral(ctx.NUMBER().getText());
@@ -378,8 +359,8 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
       } else {
          lValue = getCurrentSymbols().getVariable(varName);
       }
-      if(lValue==null) {
-         throw new CompileError("Unknown variable! "+varName);
+      if(lValue == null) {
+         throw new CompileError("Unknown variable! " + varName);
       }
       KickCParser.ExprContext rangeFirstCtx = ctx.expr(0);
       KickCParser.ExprContext rangeLastCtx = ctx.expr(1);
@@ -429,7 +410,6 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
       return null;
    }
 
-
    @Override
    public Object visitStmtAsm(KickCParser.StmtAsmContext ctx) {
       sequence.addStatement(new StatementAsm(ctx.asmLines()));
@@ -654,6 +634,27 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
       return sequence;
    }
 
+   /** A declaration directive. */
+   private interface Directive {
+   }
+
+   /** Variable declared constant. */
+   private static class DirectiveConst implements Directive {
+   }
+
+   /** Variable memory alignment. */
+   private static class DirectiveAlign implements Directive {
+      private int alignment;
+
+      public DirectiveAlign(int alignment) {
+         this.alignment = alignment;
+      }
+
+      public int getAlignment() {
+         return alignment;
+      }
+   }
+
    private static class PrePostModifierHandler extends KickCBaseVisitor<Void> {
 
       private List<PrePostModifier> postMods;
@@ -666,14 +667,6 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
          postMods = new ArrayList<>();
       }
 
-      public List<PrePostModifier> getPreMods() {
-         return preMods;
-      }
-
-      public List<PrePostModifier> getPostMods() {
-         return postMods;
-      }
-
       public static void addPostModifiers(Pass0GenerateStatementSequence parser, ParserRuleContext ctx) {
          PrePostModifierHandler prePostModifierHandler = new PrePostModifierHandler(parser);
          prePostModifierHandler.visit(ctx);
@@ -698,6 +691,14 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
          }
       }
 
+      public List<PrePostModifier> getPreMods() {
+         return preMods;
+      }
+
+      public List<PrePostModifier> getPostMods() {
+         return postMods;
+      }
+
       @Override
       public Void visitExprPostMod(KickCParser.ExprPostModContext ctx) {
          RValue child = (RValue) mainParser.visit(ctx.expr());
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AddTypePromotions.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AddTypePromotions.java
index 02a8d2842..c5eb3149c 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AddTypePromotions.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AddTypePromotions.java
@@ -16,12 +16,12 @@ public class Pass1AddTypePromotions extends Pass1Base {
 
    @Override
    public boolean step() {
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
          List<Statement> statements = block.getStatements();
          ListIterator<Statement> stmtIt = statements.listIterator();
-         while (stmtIt.hasNext()) {
-            Statement statement =  stmtIt.next();
-            if (statement instanceof StatementAssignment) {
+         while(stmtIt.hasNext()) {
+            Statement statement = stmtIt.next();
+            if(statement instanceof StatementAssignment) {
                getPromotionAssignment((StatementAssignment) statement, stmtIt);
             }
             // TODO: Implement promotion for calls
@@ -33,7 +33,7 @@ public class Pass1AddTypePromotions extends Pass1Base {
    /**
     * Examines an assignment to determine if a cast of the rValue is needed (the lvalue type and the rvalue type is not equal)
     * and possible (the types are promotion compatible).
-    *
+    * <p>
     * If a promotion is needed it is added by adding a new tmp-var with a cast and modifying the statement.
     *
     * @param assignment The assignment to examine
@@ -43,18 +43,18 @@ public class Pass1AddTypePromotions extends Pass1Base {
       LValue lValue = assignment.getlValue();
       SymbolType lValueType = SymbolTypeInference.inferType(getScope(), lValue);
       SymbolType rValueType = SymbolTypeInference.inferTypeRValue(getScope(), assignment);
-      if (SymbolTypeInference.typeMatch(lValueType, rValueType)) {
+      if(SymbolTypeInference.typeMatch(lValueType, rValueType)) {
          return;
       }
       // No direct type match - attempt promotion
       if(canPromote(lValueType, rValueType)) {
          // Promotion possible - add tmp-var and a cast
-         if(assignment.getOperator()==null) {
+         if(assignment.getOperator() == null) {
             // No operator - add cast directly!
             assignment.setOperator(Operator.getCastUnary(lValueType));
-            getProgram().getLog().append("Promoting "+rValueType+" to "+lValueType+" in "+assignment);
+            getProgram().getLog().append("Promoting " + rValueType + " to " + lValueType + " in " + assignment);
          } else {
-            throw new RuntimeException("Tmp-var promotions not implemented yet "+assignment);
+            throw new RuntimeException("Tmp-var promotions not implemented yet " + assignment);
          }
       } else {
          String msg = "ERROR! Type mismatch (" + lValueType.getTypeName() + ") cannot be assigned from (" + rValueType.getTypeName() + "). " +
@@ -66,6 +66,7 @@ public class Pass1AddTypePromotions extends Pass1Base {
 
    /**
     * Determines if it is possible to promote (cast without loss) one type to another
+    *
     * @param lValueType The type of the lValue
     * @param rValueType The type of the rValue (that will be cast)
     * @return True if a cast is possible without any loss
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertArrayLengths.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertArrayLengths.java
index 42f23bcf9..16ec8efb0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertArrayLengths.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertArrayLengths.java
@@ -26,12 +26,12 @@ public class Pass1AssertArrayLengths extends Pass1Base {
                         if(assignment.getrValue1() == null && assignment.getOperator() == null) {
                            RValue value = assignment.getrValue2();
                            if(value instanceof ValueList) {
-                              if(((ValueList) value).getList().size()!=declaredSize) {
-                                 throw new CompileError("Error! Array length mismatch "+statement.toString(getProgram(), false));
+                              if(((ValueList) value).getList().size() != declaredSize) {
+                                 throw new CompileError("Error! Array length mismatch " + statement.toString(getProgram(), false));
                               }
                            } else if(value instanceof ConstantString) {
-                              if(((ConstantString) value).getValue().length()!=declaredSize) {
-                                 throw new CompileError("Error! Array length mismatch "+statement.toString(getProgram(), false));
+                              if(((ConstantString) value).getValue().length() != declaredSize) {
+                                 throw new CompileError("Error! Array length mismatch " + statement.toString(getProgram(), false));
                               }
                            }
                         }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoLValueIntermediate.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoLValueIntermediate.java
index cc29bc9e4..ae9ba26df 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoLValueIntermediate.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoLValueIntermediate.java
@@ -13,14 +13,14 @@ public class Pass1AssertNoLValueIntermediate extends Pass1Base {
 
    @Override
    public boolean step() {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             if(statement instanceof StatementLValue) {
                LValue lValue = ((StatementLValue) statement).getlValue();
                if(lValue instanceof LvalueIntermediate) {
                   VariableRef intermediateVar = ((LvalueIntermediate) lValue).getVariable();
                   StatementAssignment assignment = getGraph().getAssignment(intermediateVar);
-                  throw new CompileError("Error! LValue is illegal. "+statement+" - definition of lValue "+assignment);
+                  throw new CompileError("Error! LValue is illegal. " + statement + " - definition of lValue " + assignment);
                }
             }
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertReturn.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertReturn.java
index 0db7a24f5..789226bb6 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertReturn.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertReturn.java
@@ -17,8 +17,8 @@ public class Pass1AssertReturn extends Pass1Base {
    @Override
    public boolean step() {
       Collection<Procedure> allProcedures = getProgram().getScope().getAllProcedures(true);
-      for (Procedure procedure : allProcedures) {
-         if (procedure.getReturnType() != null && !SymbolType.VOID.equals(procedure.getReturnType())) {
+      for(Procedure procedure : allProcedures) {
+         if(procedure.getReturnType() != null && !SymbolType.VOID.equals(procedure.getReturnType())) {
             LabelRef entryLabel = procedure.getRef().getLabelRef();
             ControlFlowBlock entryBlock = getProgram().getGraph().getBlock(entryLabel);
             assertReturn(entryBlock, new LinkedHashSet<>());
@@ -31,30 +31,30 @@ public class Pass1AssertReturn extends Pass1Base {
     * Assert that all control flows end at a return statement.
     * Follow the control flow of the graph recursively.
     *
-    * @param block   The block to examine
+    * @param block The block to examine
     * @param visited Blocks already visited
     */
    public void assertReturn(ControlFlowBlock block, Collection<LabelRef> visited) {
-      if (visited.contains(block.getLabel())) {
+      if(visited.contains(block.getLabel())) {
          return;
       }
       visited.add(block.getLabel());
-      for (Statement statement : block.getStatements()) {
-         if (statement instanceof StatementAssignment) {
+      for(Statement statement : block.getStatements()) {
+         if(statement instanceof StatementAssignment) {
             StatementAssignment assignment = (StatementAssignment) statement;
             if(assignment.getlValue() instanceof VariableRef && ((VariableRef) assignment.getlValue()).getLocalName().equals("return")) {
                // Happy days - return found!
                return;
             }
-         } else if (statement instanceof StatementConditionalJump) {
+         } else if(statement instanceof StatementConditionalJump) {
             StatementConditionalJump cond = (StatementConditionalJump) statement;
             ControlFlowBlock jumpTo = getProgram().getGraph().getBlock(cond.getDestination());
             assertReturn(jumpTo, visited);
          }
       }
       ControlFlowBlock successor = getProgram().getGraph().getBlock(block.getDefaultSuccessor());
-      if (successor == null || successor.getLabel().getLocalName().equals(SymbolRef.PROCEXIT_BLOCK_NAME)) {
-         throw new CompileError("Error! Method must end with a return statement. "+block.getScope().toString(getProgram()));
+      if(successor == null || successor.getLabel().getLocalName().equals(SymbolRef.PROCEXIT_BLOCK_NAME)) {
+         throw new CompileError("Error! Method must end with a return statement. " + block.getScope().toString(getProgram()));
       } else {
          assertReturn(successor, visited);
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertUsedVars.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertUsedVars.java
index 32d41e0f7..d34117125 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertUsedVars.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertUsedVars.java
@@ -33,6 +33,7 @@ public class Pass1AssertUsedVars extends Pass1Base {
    /**
     * Assert that all used vars have been assigned values before the use.
     * Follow the control flow of the graph recursively.
+    *
     * @param block The block to examine
     * @param referenceInfos Information about assigned/used variables in statements
     * @param defined Variables already assigned a value at the point of the first execution of the block
@@ -43,34 +44,34 @@ public class Pass1AssertUsedVars extends Pass1Base {
          return;
       }
       visited.add(block.getLabel());
-      for (Statement statement : block.getStatements()) {
-         Collection<VariableRef> used =  referenceInfos.getUsedVars(statement);
-         for (VariableRef usedRef : used) {
+      for(Statement statement : block.getStatements()) {
+         Collection<VariableRef> used = referenceInfos.getUsedVars(statement);
+         for(VariableRef usedRef : used) {
             if(!defined.contains(usedRef)) {
-               throw new CompileError("Error! Variable used before being defined "+usedRef.toString(getProgram())+" in "+statement.toString(getProgram(), false));
+               throw new CompileError("Error! Variable used before being defined " + usedRef.toString(getProgram()) + " in " + statement.toString(getProgram(), false));
             }
          }
          Collection<VariableRef> defd = referenceInfos.getDefinedVars(statement);
-         for (VariableRef definedRef : defd) {
+         for(VariableRef definedRef : defd) {
             defined.add(definedRef);
          }
          if(statement instanceof StatementCall) {
             StatementCall call = (StatementCall) statement;
             Procedure procedure = getProgram().getScope().getProcedure(call.getProcedure());
-            for (String paramName : procedure.getParameterNames()) {
+            for(String paramName : procedure.getParameterNames()) {
                defined.add(procedure.getVariable(paramName).getRef());
             }
             ControlFlowBlock procedureStart = getProgram().getGraph().getBlock(call.getProcedure().getLabelRef());
 
             assertUsedVars(procedureStart, referenceInfos, defined, visited);
          } else if(statement instanceof StatementConditionalJump) {
-            StatementConditionalJump cond= (StatementConditionalJump) statement;
-            ControlFlowBlock jumpTo  = getProgram().getGraph().getBlock(cond.getDestination());
+            StatementConditionalJump cond = (StatementConditionalJump) statement;
+            ControlFlowBlock jumpTo = getProgram().getGraph().getBlock(cond.getDestination());
             assertUsedVars(jumpTo, referenceInfos, defined, visited);
          }
       }
-      ControlFlowBlock successor  = getProgram().getGraph().getBlock(block.getDefaultSuccessor());
-      if(successor!=null) {
+      ControlFlowBlock successor = getProgram().getGraph().getBlock(block.getDefaultSuccessor());
+      if(successor != null) {
          assertUsedVars(successor, referenceInfos, defined, visited);
       }
    }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1Base.java b/src/main/java/dk/camelot64/kickc/passes/Pass1Base.java
index d80f38b63..4c4869ac8 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1Base.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1Base.java
@@ -1,7 +1,9 @@
 package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.CompileLog;
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowGraph;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.ProgramScope;
 
 /**
  * Pass 1 (before SSA optimizations) base class
@@ -19,7 +21,7 @@ public abstract class Pass1Base {
     */
    public void execute() {
       boolean again = true;
-      while (again) {
+      while(again) {
          again = step();
       }
    }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateEmptyBlocks.java b/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateEmptyBlocks.java
index fcfc501bb..41c64ec39 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateEmptyBlocks.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateEmptyBlocks.java
@@ -22,35 +22,35 @@ public class Pass1EliminateEmptyBlocks extends Pass1Base {
       ControlFlowGraph graph = getProgram().getGraph();
       Collection<ControlFlowBlock> blocks = graph.getAllBlocks();
       List<LabelRef> removeList = new ArrayList<>();
-      for (ControlFlowBlock block : blocks) {
+      for(ControlFlowBlock block : blocks) {
          if(block.getLabel().getFullName().equals(SymbolRef.END_BLOCK_NAME)) {
             continue;
          } else if(block.getLabel().getFullName().equals(SymbolRef.BEGIN_BLOCK_NAME)) {
             continue;
          }
-         if (block.getStatements().isEmpty()) {
+         if(block.getStatements().isEmpty()) {
             List<ControlFlowBlock> predecessors = graph.getPredecessors(block);
             boolean remove = true;
-            for (ControlFlowBlock predecessor : predecessors) {
+            for(ControlFlowBlock predecessor : predecessors) {
                if(predecessor.getDefaultSuccessor().equals(block.getLabel())) {
                   predecessor.setDefaultSuccessor(block.getDefaultSuccessor());
                } else {
                   remove = false;
                }
             }
-            if (remove) {
+            if(remove) {
                removeList.add(block.getLabel());
             }
          }
       }
       boolean modified = false;
-      for (LabelRef labelRef : removeList) {
+      for(LabelRef labelRef : removeList) {
          Symbol removeSymbol = getScope().getSymbol(labelRef);
          if(removeSymbol instanceof Label) {
             Label label = (Label) removeSymbol;
             graph.remove(labelRef);
             label.getScope().remove(label);
-            log.append("Removing empty block "+labelRef);
+            log.append("Removing empty block " + labelRef);
             modified = true;
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateUncalledProcedures.java b/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateUncalledProcedures.java
index 056f0fc21..f6c05a28a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateUncalledProcedures.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1EliminateUncalledProcedures.java
@@ -7,7 +7,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-/**  Eliminate uncalled methods  */
+/** Eliminate uncalled methods */
 public class Pass1EliminateUncalledProcedures extends Pass1Base {
 
    public Pass1EliminateUncalledProcedures(Program program) {
@@ -17,8 +17,8 @@ public class Pass1EliminateUncalledProcedures extends Pass1Base {
    @Override
    public boolean step() {
       Set<ProcedureRef> calledProcedures = new LinkedHashSet<>();
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             if(statement instanceof StatementCall) {
                StatementCall call = (StatementCall) statement;
                ProcedureRef procedureRef = call.getProcedure();
@@ -29,24 +29,24 @@ public class Pass1EliminateUncalledProcedures extends Pass1Base {
 
       Set<ProcedureRef> unusedProcedures = new LinkedHashSet<>();
       Collection<Procedure> allProcedures = getProgram().getScope().getAllProcedures(true);
-      for (Procedure procedure : allProcedures) {
+      for(Procedure procedure : allProcedures) {
          if(!calledProcedures.contains(procedure.getRef())) {
             // The procedure is not used - mark for removal!
             unusedProcedures.add(procedure.getRef());
          }
       }
 
-      for (ProcedureRef unusedProcedure : unusedProcedures) {
-         getLog().append("Removing unused procedure "+unusedProcedure);
+      for(ProcedureRef unusedProcedure : unusedProcedures) {
+         getLog().append("Removing unused procedure " + unusedProcedure);
          Procedure procedure = getProgram().getScope().getProcedure(unusedProcedure);
          List<ControlFlowBlock> procedureBlocks = getProgram().getGraph().getScopeBlocks(unusedProcedure);
-         for (ControlFlowBlock procedureBlock : procedureBlocks) {
+         for(ControlFlowBlock procedureBlock : procedureBlocks) {
             getProgram().getGraph().remove(procedureBlock.getLabel());
          }
          procedure.getScope().remove(procedure);
       }
 
-      return unusedProcedures.size()>0;
+      return unusedProcedures.size() > 0;
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1ExtractInlineStrings.java b/src/main/java/dk/camelot64/kickc/passes/Pass1ExtractInlineStrings.java
index d9e853f3f..4bae23a20 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1ExtractInlineStrings.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1ExtractInlineStrings.java
@@ -2,7 +2,7 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * All inline strings in the code are extracted into constants.
@@ -42,12 +42,12 @@ public class Pass1ExtractInlineStrings extends Pass1Base {
 
    private ConstantVar createStringConstantVar(Scope blockScope, ConstantString constantString, String nameHint) {
       String name;
-      if (nameHint == null) {
+      if(nameHint == null) {
          name = blockScope.allocateIntermediateVariableName();
       } else {
          int nameHintIdx = 1;
          name = nameHint;
-         while (blockScope.getSymbol(name) != null) {
+         while(blockScope.getSymbol(name) != null) {
             name = nameHint + nameHintIdx++;
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java b/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
index a8b1406cf..7e18b738a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1FixLValuesLoHi.java
@@ -19,19 +19,19 @@ public class Pass1FixLValuesLoHi extends Pass1Base {
    @Override
    public boolean step() {
       ProgramScope programScope = getProgram().getScope();
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
          List<Statement> statements = block.getStatements();
          ListIterator<Statement> statementsIt = statements.listIterator();
-         while (statementsIt.hasNext()) {
+         while(statementsIt.hasNext()) {
             Statement statement = statementsIt.next();
-            if (statement instanceof StatementLValue && ((StatementLValue) statement).getlValue() instanceof LvalueIntermediate) {
+            if(statement instanceof StatementLValue && ((StatementLValue) statement).getlValue() instanceof LvalueIntermediate) {
                StatementLValue statementLValue = (StatementLValue) statement;
                LvalueIntermediate intermediate = (LvalueIntermediate) statementLValue.getlValue();
                StatementAssignment intermediateAssignment = getProgram().getGraph().getAssignment(intermediate.getVariable());
-               if (Operator.LOWBYTE.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
+               if(Operator.LOWBYTE.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
                   // Found assignment to an intermediate low byte lValue <x = ...
                   fixLoHiLValue(programScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operator.SET_LOWBYTE);
-               } else if (Operator.HIBYTE.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
+               } else if(Operator.HIBYTE.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
                   // Found assignment to an intermediate low byte lValue >x = ...
                   fixLoHiLValue(programScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operator.SET_HIBYTE);
                }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateControlFlowGraph.java b/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateControlFlowGraph.java
index 70b98fad0..fcfa326cd 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateControlFlowGraph.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateControlFlowGraph.java
@@ -9,12 +9,12 @@ import java.util.Stack;
 /** Pass that generates a control flow graph for the program */
 public class Pass1GenerateControlFlowGraph extends Pass1Base {
 
+   private Map<LabelRef, ControlFlowBlock> blocks;
+
    public Pass1GenerateControlFlowGraph(Program program) {
       super(program);
    }
 
-   private Map<LabelRef, ControlFlowBlock> blocks;
-
    @Override
    public boolean step() {
       this.blocks = new LinkedHashMap<>();
@@ -24,13 +24,13 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
       Stack<ControlFlowBlock> blockStack = new Stack<>();
       blockStack.push(firstBlock);
       sequence.addStatement(new StatementLabel(scope.addLabel(SymbolRef.END_BLOCK_NAME).getRef()));
-      for (Statement statement : sequence.getStatements()) {
+      for(Statement statement : sequence.getStatements()) {
          ControlFlowBlock currentBlock = blockStack.peek();
          Symbol currentBlockLabel = scope.getSymbol(currentBlock.getLabel());
          Scope currentBlockScope;
          if(currentBlockLabel instanceof Procedure) {
             currentBlockScope = (Scope) currentBlockLabel;
-         }  else {
+         } else {
             currentBlockScope = currentBlockLabel.getScope();
          }
          if(statement instanceof StatementLabel) {
@@ -39,14 +39,14 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
             currentBlock.setDefaultSuccessor(nextBlock.getLabel());
             blockStack.pop();
             blockStack.push(nextBlock);
-         }  else if(statement instanceof StatementJump) {
+         } else if(statement instanceof StatementJump) {
             StatementJump statementJump = (StatementJump) statement;
             ControlFlowBlock jmpBlock = getOrCreateBlock(statementJump.getDestination(), currentBlock.getScope());
             currentBlock.setDefaultSuccessor(jmpBlock.getLabel());
             ControlFlowBlock nextBlock = getOrCreateBlock(currentBlockScope.addLabelIntermediate().getRef(), currentBlock.getScope());
             blockStack.pop();
             blockStack.push(nextBlock);
-         }  else if(statement instanceof StatementConditionalJump) {
+         } else if(statement instanceof StatementConditionalJump) {
             currentBlock.addStatement(statement);
             StatementConditionalJump statementConditionalJump = (StatementConditionalJump) statement;
             ControlFlowBlock jmpBlock = getOrCreateBlock(statementConditionalJump.getDestination(), currentBlock.getScope());
@@ -55,7 +55,7 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
             currentBlock.setConditionalSuccessor(jmpBlock.getLabel());
             blockStack.pop();
             blockStack.push(nextBlock);
-         }  else if(statement instanceof StatementProcedureBegin) {
+         } else if(statement instanceof StatementProcedureBegin) {
             // Procedure strategy implemented is currently variable-based transfer of parameters/return values
             StatementProcedureBegin procedureBegin = (StatementProcedureBegin) statement;
             procedureBegin.setStrategy(StatementProcedureBegin.Strategy.PASS_BY_REGISTER);
@@ -63,7 +63,7 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
             LabelRef procedureLabelRef = procedureRef.getLabelRef();
             ControlFlowBlock procBlock = getOrCreateBlock(procedureLabelRef, procedureRef);
             blockStack.push(procBlock);
-         }  else if(statement instanceof StatementProcedureEnd) {
+         } else if(statement instanceof StatementProcedureEnd) {
             // Procedure strategy implemented is currently variable-based transfer of parameters/return values
             currentBlock.setDefaultSuccessor(new Label(SymbolRef.PROCEXIT_BLOCK_NAME, scope, false).getRef());
             ControlFlowBlock nextBlock = getOrCreateBlock(scope.addLabelIntermediate().getRef(), ScopeRef.ROOT);
@@ -71,7 +71,7 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
             ControlFlowBlock prevBlock = blockStack.pop();
             prevBlock.setDefaultSuccessor(nextBlock.getLabel());
             blockStack.push(nextBlock);
-         }  else if(statement instanceof StatementReturn) {
+         } else if(statement instanceof StatementReturn) {
             // Procedure strategy implemented is currently variable-based transfer of parameters/return values
             StatementReturn aReturn = (StatementReturn) statement;
             currentBlock.addStatement(aReturn);
@@ -87,7 +87,7 @@ public class Pass1GenerateControlFlowGraph extends Pass1Base {
 
    private ControlFlowBlock getOrCreateBlock(LabelRef label, ScopeRef scope) {
       ControlFlowBlock block = blocks.get(label);
-      if(block==null) {
+      if(block == null) {
          block = new ControlFlowBlock(label, scope);
          blocks.put(block.getLabel(), block);
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateSingleStaticAssignmentForm.java b/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateSingleStaticAssignmentForm.java
index 532595fd6..ac0ce09da 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateSingleStaticAssignmentForm.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1GenerateSingleStaticAssignmentForm.java
@@ -26,7 +26,7 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
          getLog().append("Completing Phi functions...");
          done = completePhiFunctions();
          //log.append(this.controlFlowGraph.toString(symbols));
-      } while (!done);
+      } while(!done);
       return false;
    }
 
@@ -34,22 +34,22 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
     * Version all non-versioned non-intermediary being assigned a value.
     */
    private void versionAllAssignments() {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementLValue) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementLValue) {
                StatementLValue statementLValue = (StatementLValue) statement;
                LValue lValue = statementLValue.getlValue();
-               if (lValue instanceof VariableRef) {
+               if(lValue instanceof VariableRef) {
                   VariableRef lValueRef = (VariableRef) lValue;
                   Variable assignedVar = getScope().getVariable(lValueRef);
-                  if (assignedVar instanceof VariableUnversioned) {
+                  if(assignedVar instanceof VariableUnversioned) {
                      // Assignment to a non-versioned non-intermediary variable
                      VariableUnversioned assignedSymbol = (VariableUnversioned) assignedVar;
                      VariableVersion version;
                      if(assignedSymbol.isDeclaredConstant()) {
                         Collection<VariableVersion> versions = assignedVar.getScope().getVersions(assignedSymbol);
-                        if(versions.size()!=0) {
-                           throw new CompileError("Error! Constants can not be modified "+statement);
+                        if(versions.size() != 0) {
+                           throw new CompileError("Error! Constants can not be modified " + statement);
                         }
                         version = assignedSymbol.createVersion();
                         version.setDeclaredConstant(true);
@@ -77,10 +77,10 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
          Map<VariableUnversioned, VariableVersion> blockNewPhis) {
       RValue value = replaceableValue.get();
       VariableVersion version = findOrCreateVersion(value, blockVersions, blockNewPhis);
-      if (version != null) {
+      if(version != null) {
          replaceableValue.set(version.getRef());
       }
-      for (ValueReplacer.ReplaceableValue subValue : replaceableValue.getSubValues()) {
+      for(ValueReplacer.ReplaceableValue subValue : replaceableValue.getSubValues()) {
          execute(subValue, blockVersions, blockNewPhis);
       }
    }
@@ -89,15 +89,15 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
     * Version all uses of non-versioned non-intermediary variables
     */
    private void versionAllUses() {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
          // Newest version of variables in the block.
          Map<VariableUnversioned, VariableVersion> blockVersions = new LinkedHashMap<>();
          // New phi functions introduced in the block to create versions of variables.
          Map<VariableUnversioned, VariableVersion> blockNewPhis = new LinkedHashMap<>();
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementReturn) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementReturn) {
                execute(new ValueReplacer.ReplaceableReturn((StatementReturn) statement), blockVersions, blockNewPhis);
-            } else if (statement instanceof StatementAssignment) {
+            } else if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
                execute(new ValueReplacer.ReplaceableRValue1(assignment), blockVersions, blockNewPhis);
                execute(new ValueReplacer.ReplaceableRValue2(assignment), blockVersions, blockNewPhis);
@@ -105,10 +105,10 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
 
                // Update map of versions encountered in the block
                LValue lValue = assignment.getlValue();
-               if (lValue instanceof VariableRef) {
+               if(lValue instanceof VariableRef) {
                   VariableRef lValueRef = (VariableRef) lValue;
                   Variable variable = getScope().getVariable(lValueRef);
-                  if (variable instanceof VariableVersion) {
+                  if(variable instanceof VariableVersion) {
                      VariableVersion versioned = (VariableVersion) variable;
                      blockVersions.put(versioned.getVersionOf(), versioned);
                   }
@@ -116,7 +116,7 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
             }
          }
          // Add new Phi functions to block
-         for (VariableUnversioned symbol : blockNewPhis.keySet()) {
+         for(VariableUnversioned symbol : blockNewPhis.keySet()) {
             block.getPhiBlock().addPhiVariable(blockNewPhis.get(symbol).getRef());
          }
       }
@@ -126,9 +126,9 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
     * Find and return the latest version of an rValue (if it is a non-versioned symbol).
     * If a version is needed and no version is found a new version is created as a phi-function.
     *
-    * @param rValue        The rValue to examine
+    * @param rValue The rValue to examine
     * @param blockVersions The current version defined in the block for each symbol.
-    * @param blockNewPhis  New versions to be created as phi-functions. Modified if a new phi-function needs to be created.
+    * @param blockNewPhis New versions to be created as phi-functions. Modified if a new phi-function needs to be created.
     * @return Null if the rValue does not need versioning. The versioned symbol to use if it does.
     */
    private VariableVersion findOrCreateVersion(
@@ -136,27 +136,27 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
          Map<VariableUnversioned, VariableVersion> blockVersions,
          Map<VariableUnversioned, VariableVersion> blockNewPhis) {
       VariableVersion version = null;
-      if (rValue instanceof VariableRef) {
+      if(rValue instanceof VariableRef) {
          Variable rValueVar = getScope().getVariable((VariableRef) rValue);
-         if (rValueVar instanceof VariableUnversioned) {
+         if(rValueVar instanceof VariableUnversioned) {
             // rValue needs versioning - look for version in statements
             VariableUnversioned rSymbol = (VariableUnversioned) rValueVar;
             if(rSymbol.isDeclaredConstant()) {
                // A constant - find the single created version
                Scope scope = rSymbol.getScope();
                Collection<VariableVersion> versions = scope.getVersions(rSymbol);
-               if(versions.size()!=1) {
-                  throw new CompileError("Error! Constants must have exactly one version "+rSymbol);
+               if(versions.size() != 1) {
+                  throw new CompileError("Error! Constants must have exactly one version " + rSymbol);
                }
                return versions.iterator().next();
-            }  else {
+            } else {
                // A proper variable - find or create version
                version = blockVersions.get(rSymbol);
-               if (version == null) {
+               if(version == null) {
                   // look for version in new phi functions
                   version = blockNewPhis.get(rSymbol);
                }
-               if (version == null) {
+               if(version == null) {
                   // create a new phi function
                   version = rSymbol.createVersion();
                   blockNewPhis.put(rSymbol, version);
@@ -176,32 +176,32 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
    private boolean completePhiFunctions() {
       Map<LabelRef, Map<VariableUnversioned, VariableVersion>> newPhis = new LinkedHashMap<>();
       Map<LabelRef, Map<VariableUnversioned, VariableVersion>> symbolMap = buildSymbolMap();
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
 
-            if (statement instanceof StatementPhiBlock) {
+            if(statement instanceof StatementPhiBlock) {
                StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
-               for (StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
-                  if (phiVariable.isEmpty()) {
+               for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
+                  if(phiVariable.isEmpty()) {
                      VariableRef phiLValVarRef = phiVariable.getVariable();
                      VariableVersion versioned = (VariableVersion) getScope().getVariable(phiLValVarRef);
                      VariableUnversioned unversioned = versioned.getVersionOf();
-                     for (ControlFlowBlock predecessor : getGraph().getPredecessors(block)) {
+                     for(ControlFlowBlock predecessor : getGraph().getPredecessors(block)) {
                         LabelRef predecessorLabel = predecessor.getLabel();
                         Map<VariableUnversioned, VariableVersion> predecessorMap = symbolMap.get(predecessorLabel);
                         VariableVersion previousSymbol = null;
-                        if (predecessorMap != null) {
+                        if(predecessorMap != null) {
                            previousSymbol = predecessorMap.get(unversioned);
                         }
-                        if (previousSymbol == null) {
+                        if(previousSymbol == null) {
                            // No previous symbol found in predecessor block. Look in new phi functions.
                            Map<VariableUnversioned, VariableVersion> predecessorNewPhis = newPhis.get(predecessorLabel);
-                           if (predecessorNewPhis == null) {
+                           if(predecessorNewPhis == null) {
                               predecessorNewPhis = new LinkedHashMap<>();
                               newPhis.put(predecessorLabel, predecessorNewPhis);
                            }
                            previousSymbol = predecessorNewPhis.get(unversioned);
-                           if (previousSymbol == null) {
+                           if(previousSymbol == null) {
                               // No previous symbol found in predecessor block. Add a new phi function to the predecessor.
                               previousSymbol = unversioned.createVersion();
                               predecessorNewPhis.put(unversioned, previousSymbol);
@@ -215,10 +215,10 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
          }
       }
       // Ads new phi functions to blocks
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
          Map<VariableUnversioned, VariableVersion> blockNewPhis = newPhis.get(block.getLabel());
-         if (blockNewPhis != null) {
-            for (VariableUnversioned symbol : blockNewPhis.keySet()) {
+         if(blockNewPhis != null) {
+            for(VariableUnversioned symbol : blockNewPhis.keySet()) {
                StatementPhiBlock phiBlock = block.getPhiBlock();
                phiBlock.addPhiVariable(blockNewPhis.get(symbol).getRef());
             }
@@ -233,14 +233,14 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
     */
    private Map<LabelRef, Map<VariableUnversioned, VariableVersion>> buildSymbolMap() {
       Map<LabelRef, Map<VariableUnversioned, VariableVersion>> symbolMap = new LinkedHashMap<>();
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementLValue) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementLValue) {
                StatementLValue assignment = (StatementLValue) statement;
                addSymbolToMap(symbolMap, block, assignment.getlValue());
-            } else if (statement instanceof StatementPhiBlock) {
+            } else if(statement instanceof StatementPhiBlock) {
                StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
-               for (StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
+               for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
                   addSymbolToMap(symbolMap, block, phiVariable.getVariable());
                }
             }
@@ -250,14 +250,14 @@ public class Pass1GenerateSingleStaticAssignmentForm extends Pass1Base {
    }
 
    private void addSymbolToMap(Map<LabelRef, Map<VariableUnversioned, VariableVersion>> symbolMap, ControlFlowBlock block, LValue lValue) {
-      if (lValue instanceof VariableRef) {
+      if(lValue instanceof VariableRef) {
          Variable lValueVar = getScope().getVariable((VariableRef) lValue);
-         if (lValueVar instanceof VariableVersion) {
+         if(lValueVar instanceof VariableVersion) {
             VariableVersion versioned = (VariableVersion) lValueVar;
             LabelRef label = block.getLabel();
             VariableUnversioned unversioned = versioned.getVersionOf();
             Map<VariableUnversioned, VariableVersion> blockMap = symbolMap.get(label);
-            if (blockMap == null) {
+            if(blockMap == null) {
                blockMap = new LinkedHashMap<>();
                symbolMap.put(label, blockMap);
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1ModifiedVarsAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass1ModifiedVarsAnalysis.java
index 4ad3d4146..724dd7d90 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1ModifiedVarsAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1ModifiedVarsAnalysis.java
@@ -15,7 +15,7 @@ public class Pass1ModifiedVarsAnalysis extends Pass1Base {
    public boolean step() {
       Map<ProcedureRef, Set<VariableRef>> modified = new LinkedHashMap<>();
       Collection<Procedure> allProcedures = getScope().getAllProcedures(true);
-      for (Procedure procedure : allProcedures) {
+      for(Procedure procedure : allProcedures) {
          Set<VariableRef> modifiedVars = getModifiedVars(procedure);
          modified.put(procedure.getRef(), modifiedVars);
       }
@@ -23,7 +23,8 @@ public class Pass1ModifiedVarsAnalysis extends Pass1Base {
       return false;
    }
 
-   /** Get all outside variables modified by a procedure (or any sub-procedure called by the procedure).
+   /**
+    * Get all outside variables modified by a procedure (or any sub-procedure called by the procedure).
     *
     * @param procedure The procedure to examine
     * @return All variables declared outside the procedure modified inside the procedure.
@@ -32,8 +33,8 @@ public class Pass1ModifiedVarsAnalysis extends Pass1Base {
       Set<VariableRef> modified = new LinkedHashSet<>();
       ScopeRef procScope = procedure.getRef();
       List<ControlFlowBlock> procBlocks = getProgram().getGraph().getScopeBlocks(procScope);
-      for (ControlFlowBlock block : procBlocks) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : procBlocks) {
+         for(Statement statement : block.getStatements()) {
             if(statement instanceof StatementLValue) {
                LValue lValue = ((StatementLValue) statement).getlValue();
                if(lValue instanceof VariableRef) {
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallParameters.java b/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallParameters.java
index 68f4fc538..542ae3589 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallParameters.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallParameters.java
@@ -31,7 +31,7 @@ public class Pass1ProcedureCallParameters extends ControlFlowGraphCopyVisitor {
       Procedure procedure = getScope().getProcedure(procedureRef);
       List<Variable> parameterDecls = procedure.getParameters();
       List<RValue> parameterValues = origCall.getParameters();
-      for (int i = 0; i < parameterDecls.size(); i++) {
+      for(int i = 0; i < parameterDecls.size(); i++) {
          Variable parameterDecl = parameterDecls.get(i);
          RValue parameterValue = parameterValues.get(i);
          addStatementToCurrentBlock(new StatementAssignment(parameterDecl.getRef(), parameterValue));
@@ -39,7 +39,7 @@ public class Pass1ProcedureCallParameters extends ControlFlowGraphCopyVisitor {
       String procedureName = origCall.getProcedureName();
       Variable procReturnVar = procedure.getVariable("return");
       VariableRef procReturnVarRef = null;
-      if (procReturnVar != null) {
+      if(procReturnVar != null) {
          procReturnVarRef = procReturnVar.getRef();
       }
       StatementCall copyCall = new StatementCall(procReturnVarRef, procedureName, null);
@@ -51,11 +51,11 @@ public class Pass1ProcedureCallParameters extends ControlFlowGraphCopyVisitor {
       Scope currentBlockScope;
       if(currentBlockSymbol instanceof Procedure) {
          currentBlockScope = (Scope) currentBlockSymbol;
-      }  else {
+      } else {
          currentBlockScope = currentBlockSymbol.getScope();
       }
       splitCurrentBlock(currentBlockScope.addLabelIntermediate().getRef());
-      if(!SymbolType.VOID.equals(procedure.getReturnType()) && origCall.getlValue()!=null) {
+      if(!SymbolType.VOID.equals(procedure.getReturnType()) && origCall.getlValue() != null) {
          addStatementToCurrentBlock(new StatementAssignment(origCall.getlValue(), procReturnVarRef));
       } else {
          // No return type. Remove variable receiving the result.
@@ -68,7 +68,7 @@ public class Pass1ProcedureCallParameters extends ControlFlowGraphCopyVisitor {
       }
       // Add self-assignments for all variables modified in the procedure
       Set<VariableRef> modifiedVars = program.getProcedureModifiedVars().getModifiedVars(procedure.getRef());
-      for (VariableRef modifiedVar : modifiedVars) {
+      for(VariableRef modifiedVar : modifiedVars) {
          addStatementToCurrentBlock(new StatementAssignment(modifiedVar, modifiedVar));
       }
       return null;
@@ -81,12 +81,11 @@ public class Pass1ProcedureCallParameters extends ControlFlowGraphCopyVisitor {
       Procedure procedure = program.getScope().getProcedure(currentProcName);
       // Add self-assignments for all variables modified in the procedure
       Set<VariableRef> modifiedVars = program.getProcedureModifiedVars().getModifiedVars(procedure.getRef());
-      for (VariableRef modifiedVar : modifiedVars) {
+      for(VariableRef modifiedVar : modifiedVars) {
          addStatementToCurrentBlock(new StatementAssignment(modifiedVar, modifiedVar));
       }
       return super.visitReturn(origReturn);
    }
 
 
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallsReturnValue.java b/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallsReturnValue.java
index 5db72b5d4..258b945c3 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallsReturnValue.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1ProcedureCallsReturnValue.java
@@ -32,21 +32,21 @@ public class Pass1ProcedureCallsReturnValue extends ControlFlowGraphCopyVisitor
       copyCall.setProcedure(procedureRef);
       addStatementToCurrentBlock(copyCall);
       getCurrentBlock().setCallSuccessor(procedure.getLabel().getRef());
-      if (!SymbolType.VOID.equals(procedure.getReturnType())) {
+      if(!SymbolType.VOID.equals(procedure.getReturnType())) {
          // Find return variable final version
          Label returnBlockLabel = procedure.getLabel(SymbolRef.PROCEXIT_BLOCK_NAME);
          ControlFlowBlock returnBlock = program.getGraph().getBlock(returnBlockLabel.getRef());
          VariableRef returnVarFinal = null;
-         for (Statement statement : returnBlock.getStatements()) {
-            if (statement instanceof StatementReturn) {
+         for(Statement statement : returnBlock.getStatements()) {
+            if(statement instanceof StatementReturn) {
                StatementReturn statementReturn = (StatementReturn) statement;
                RValue returnValue = statementReturn.getValue();
-               if (returnValue instanceof VariableRef) {
+               if(returnValue instanceof VariableRef) {
                   returnVarFinal = (VariableRef) returnValue;
                }
             }
          }
-         if (returnVarFinal == null) {
+         if(returnVarFinal == null) {
             throw new RuntimeException("Error! Cannot find final return variable for " + procedure.getFullName());
          }
          StatementAssignment returnAssignment = new StatementAssignment(origCall.getlValue(), returnVarFinal);
@@ -57,15 +57,15 @@ public class Pass1ProcedureCallsReturnValue extends ControlFlowGraphCopyVisitor
       LabelRef successor = getOrigBlock().getDefaultSuccessor();
       ControlFlowBlock successorBlock = program.getGraph().getBlock(successor);
       Set<VariableRef> modifiedVars = program.getProcedureModifiedVars().getModifiedVars(procedure.getRef());
-      for (Statement statement : successorBlock.getStatements()) {
-         if (statement instanceof StatementPhiBlock) {
+      for(Statement statement : successorBlock.getStatements()) {
+         if(statement instanceof StatementPhiBlock) {
             StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
-            for (StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
                VariableRef phiVar = phiVariable.getVariable();
                VariableRef unversionedVar = new VariableRef(phiVar.getFullNameUnversioned());
-               if (modifiedVars.contains(unversionedVar)) {
-                  for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                     if (phiRValue.getPredecessor().equals(getOrigBlock().getLabel())) {
+               if(modifiedVars.contains(unversionedVar)) {
+                  for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                     if(phiRValue.getPredecessor().equals(getOrigBlock().getLabel())) {
                         VariableRef procReturnVersion = findReturnVersion(procedure, unversionedVar);
                         phiRValue.setrValue(procReturnVersion);
                      }
@@ -82,12 +82,12 @@ public class Pass1ProcedureCallsReturnValue extends ControlFlowGraphCopyVisitor
       String unversionedName = assignedVar.getFullNameUnversioned();
       LabelRef returnBlock = new LabelRef(procedure.getRef().getFullName() + "::@return");
       ControlFlowBlock block = program.getGraph().getBlock(returnBlock);
-      for (Statement statement : block.getStatements()) {
-         if (statement instanceof StatementAssignment) {
+      for(Statement statement : block.getStatements()) {
+         if(statement instanceof StatementAssignment) {
             StatementAssignment assignment = (StatementAssignment) statement;
-            if (assignment.getlValue() instanceof VariableRef) {
+            if(assignment.getlValue() instanceof VariableRef) {
                VariableRef lValue = (VariableRef) assignment.getlValue();
-               if (lValue.getFullNameUnversioned().equals(unversionedName)) {
+               if(lValue.getFullNameUnversioned().equals(unversionedName)) {
                   return lValue;
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1TypeInference.java b/src/main/java/dk/camelot64/kickc/passes/Pass1TypeInference.java
index cd717cc41..06d477e12 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1TypeInference.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1TypeInference.java
@@ -19,27 +19,27 @@ public class Pass1TypeInference extends Pass1Base {
       Stack<Scope> scopes = new Stack<>();
       ProgramScope programScope = getScope();
       scopes.add(programScope);
-      for (Statement statement : getProgram().getStatementSequence().getStatements()) {
+      for(Statement statement : getProgram().getStatementSequence().getStatements()) {
          if(statement instanceof StatementProcedureBegin) {
-                StatementProcedureBegin procedureBegin = (StatementProcedureBegin) statement;
+            StatementProcedureBegin procedureBegin = (StatementProcedureBegin) statement;
             ProcedureRef procedureRef = procedureBegin.getProcedure();
             Procedure procedure = programScope.getProcedure(procedureRef);
             scopes.push(procedure);
-         }  else if(statement instanceof StatementProcedureEnd) {
+         } else if(statement instanceof StatementProcedureEnd) {
             scopes.pop();
-         } else if (statement instanceof StatementAssignment) {
+         } else if(statement instanceof StatementAssignment) {
             StatementAssignment assignment = (StatementAssignment) statement;
             SymbolTypeInference.inferAssignmentLValue(programScope, assignment);
          } else if(statement instanceof StatementCall) {
             StatementCall call = (StatementCall) statement;
             String procedureName = call.getProcedureName();
             Procedure procedure = scopes.peek().getProcedure(procedureName);
-            if(procedure==null) {
-               throw new CompileError("Called procedure not found. "+call.toString(getProgram(), false));
+            if(procedure == null) {
+               throw new CompileError("Called procedure not found. " + call.toString(getProgram(), false));
             }
             call.setProcedure(procedure.getRef());
-            if(procedure.getParameters().size()!=call.getParameters().size()) {
-               throw new CompileError("Wrong number of parameters in call. Expected " +procedure.getParameters().size()+". "+statement.toString());
+            if(procedure.getParameters().size() != call.getParameters().size()) {
+               throw new CompileError("Wrong number of parameters in call. Expected " + procedure.getParameters().size() + ". " + statement.toString());
             }
             SymbolTypeInference.inferCallLValue(programScope, (StatementCall) statement);
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AliasElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AliasElimination.java
index f5a560e71..8ba6fa68a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AliasElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AliasElimination.java
@@ -13,6 +13,117 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       super(program);
    }
 
+   public static Aliases findAliases(Program program) {
+      Aliases candidates = findAliasesCandidates(program);
+      cleanupCandidates(candidates, program);
+      return candidates;
+   }
+
+   // Remove all candidates that are used after assignment in phi blocks
+   private static void cleanupCandidates(Aliases candidates, Program program) {
+      for(final AliasSet aliasSet : candidates.aliases) {
+         for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
+            if(block.hasPhiBlock()) {
+               StatementPhiBlock phi = block.getPhiBlock();
+               boolean lMatch = false;
+               for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+                  if(lMatch) {
+                     if(aliasSet.contains(phiVariable.getVariable())) {
+                        // Assigning inside tha alias set again - no need to check the variables
+                        continue;
+                     }
+                     for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                        RValue rValue = phiRValue.getrValue();
+                        if(aliasSet.contains(rValue)) {
+                           program.getLog().append("Alias candidate removed " + rValue.toString(program));
+                           aliasSet.remove(rValue);
+                           break;
+                        }
+                     }
+                  } else {
+                     if(aliasSet.contains(phiVariable.getVariable())) {
+                        lMatch = true;
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+
+   /**
+    * Find variables which are aliases of other variables.
+    *
+    * @return A bunch of alias sets
+    */
+   private static Aliases findAliasesCandidates(final Program program) {
+      Aliases aliases = new Aliases();
+      for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementAssignment) {
+               StatementAssignment assignment = (StatementAssignment) statement;
+               if(assignment.getlValue() instanceof VariableRef) {
+                  VariableRef variable = (VariableRef) assignment.getlValue();
+                  if(assignment.getrValue1() == null && assignment.getOperator() == null && assignment.getrValue2() instanceof VariableRef) {
+                     // Alias assignment
+                     VariableRef alias = (VariableRef) assignment.getrValue2();
+                     // Examine if the alis is assigned inside another scope
+                     ControlFlowBlock aliasAssignmentBlock = program.getGraph().getAssignmentBlock(alias);
+                     ScopeRef aliasScope = aliasAssignmentBlock.getScope();
+                     ScopeRef varScope = block.getScope();
+                     if(!alias.isIntermediate() && (!varScope.equals(aliasScope) || !variable.getScopeNames().equals(alias.getScopeNames()))) {
+                        program.getLog().append("Not aliassing across scopes: " + variable + " " + alias);
+                     } else {
+                        aliases.add(variable, alias);
+                     }
+                  }
+               }
+            } else if(statement instanceof StatementPhiBlock) {
+               StatementPhiBlock phi = (StatementPhiBlock) statement;
+               for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+                  VariableRef variable = phiVariable.getVariable();
+                  VariableRef alias = null;
+                  for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                     if(alias == null) {
+                        // First rValue
+                        if(phiRValue.getrValue() instanceof VariableRef) {
+                           alias = (VariableRef) phiRValue.getrValue();
+                           // Examine if the alis is assigned inside another scope
+                           ControlFlowBlock aliasAssignmentBlock = program.getGraph().getAssignmentBlock(alias);
+                           ScopeRef aliasScope = aliasAssignmentBlock.getScope();
+                           ScopeRef varScope = block.getScope();
+                           if(!varScope.equals(aliasScope) || !variable.getScopeNames().equals(alias.getScopeNames())) {
+                              program.getLog().append("Not aliassing across scopes: " + variable + " " + alias);
+                              alias = null;
+                              break;
+                           } else if(variable.equals(alias)) {
+                              program.getLog().append("Not aliassing identity: " + variable + " " + alias);
+                              alias = null;
+                              break;
+                           }
+                        } else {
+                           // Not aliasing non-variables
+                           break;
+                        }
+                     } else {
+                        // rValue 2-n
+                        if(!alias.equals(phiRValue.getrValue())) {
+                           // Not aliasing if any rValue is not identical
+                           alias = null;
+                           break;
+                        }
+                     }
+                  }
+                  if(alias != null) {
+                     aliases.add(variable, alias);
+                  }
+
+               }
+            }
+         }
+      }
+      return aliases;
+   }
 
    /**
     * Eliminate alias assignments replacing them with the aliassed variable.
@@ -22,11 +133,11 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       final Aliases aliases = findAliases(getProgram());
       removeAliasAssignments(aliases);
       replaceVariables(aliases.getReplacements(getScope()));
-      for (AliasSet aliasSet : aliases.getAliasSets()) {
+      for(AliasSet aliasSet : aliases.getAliasSets()) {
          StringBuilder str = new StringBuilder();
          str.append(aliasSet.getKeepVar(getScope()).toString(getProgram()));
          str.append(" = ");
-         for (VariableRef var : aliasSet.getEliminateVars(getScope())) {
+         for(VariableRef var : aliasSet.getEliminateVars(getScope())) {
             str.append(var.toString(getProgram()) + " ");
          }
          getLog().append("Alias " + str);
@@ -42,37 +153,37 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
     */
 
    private void removeAliasAssignments(Aliases aliases) {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Iterator<Statement> iterator = block.getStatements().iterator(); iterator.hasNext(); ) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Iterator<Statement> iterator = block.getStatements().iterator(); iterator.hasNext(); ) {
             Statement statement = iterator.next();
-            if (statement instanceof StatementAssignment) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
                AliasSet aliasSet = aliases.findAliasSet(assignment.getlValue());
-               if (aliasSet != null) {
-                  if ((assignment.getrValue1() == null) && (assignment.getOperator() == null) && aliasSet.contains(assignment.getrValue2())) {
+               if(aliasSet != null) {
+                  if((assignment.getrValue1() == null) && (assignment.getOperator() == null) && aliasSet.contains(assignment.getrValue2())) {
                      iterator.remove();
                   }
                }
-            } else if (statement instanceof StatementPhiBlock) {
+            } else if(statement instanceof StatementPhiBlock) {
                StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
                Iterator<StatementPhiBlock.PhiVariable> variableIterator = phiBlock.getPhiVariables().iterator();
-               while (variableIterator.hasNext()) {
+               while(variableIterator.hasNext()) {
                   StatementPhiBlock.PhiVariable phiVariable = variableIterator.next();
                   AliasSet aliasSet = aliases.findAliasSet(phiVariable.getVariable());
-                  if (aliasSet != null) {
+                  if(aliasSet != null) {
                      boolean remove = true;
-                     for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                        if (!aliasSet.contains(phiRValue.getrValue())) {
+                     for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                        if(!aliasSet.contains(phiRValue.getrValue())) {
                            remove = false;
                            break;
                         }
                      }
-                     if (remove) {
+                     if(remove) {
                         variableIterator.remove();
                      }
                   }
                }
-               if (phiBlock.getPhiVariables().size() == 0) {
+               if(phiBlock.getPhiVariables().size() == 0) {
                   iterator.remove();
                }
             }
@@ -90,7 +201,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
 
       public Aliases(Aliases aliases) {
          this.aliases = new ArrayList<>();
-         for (AliasSet aliasSet : aliases.getAliasSets()) {
+         for(AliasSet aliasSet : aliases.getAliasSets()) {
             AliasSet copySet = new AliasSet(aliasSet);
             this.aliases.add(copySet);
          }
@@ -98,7 +209,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
 
       public List<VariableRef> getSymbolsToRemove(ProgramScope scope) {
          ArrayList<VariableRef> eliminates = new ArrayList<>();
-         for (AliasSet alias : aliases) {
+         for(AliasSet alias : aliases) {
             eliminates.addAll(alias.getEliminateVars(scope));
          }
          return eliminates;
@@ -106,10 +217,10 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
 
       public Map<VariableRef, VariableRef> getReplacements(ProgramScope scope) {
          HashMap<VariableRef, VariableRef> replacements = new LinkedHashMap<>();
-         for (AliasSet aliasSet : aliases) {
+         for(AliasSet aliasSet : aliases) {
             VariableRef keepVar = aliasSet.getKeepVar(scope);
-            for (VariableRef var : aliasSet.getEliminateVars(scope)) {
-               if (!var.equals(keepVar)) {
+            for(VariableRef var : aliasSet.getEliminateVars(scope)) {
+               if(!var.equals(keepVar)) {
                   replacements.put(var, keepVar);
                }
             }
@@ -124,9 +235,9 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       public void add(VariableRef var1, VariableRef var2) {
          AliasSet aliasSet1 = findAliasSet(var1);
          AliasSet aliasSet2 = findAliasSet(var2);
-         if (aliasSet1 != null) {
-            if (aliasSet2 != null) {
-               if (aliasSet1 != aliasSet2) {
+         if(aliasSet1 != null) {
+            if(aliasSet2 != null) {
+               if(aliasSet1 != aliasSet2) {
                   aliasSet1.addAll(aliasSet2);
                   aliases.remove(aliasSet2);
                }
@@ -134,7 +245,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
                aliasSet1.add(var2);
             }
          } else {
-            if (aliasSet2 != null) {
+            if(aliasSet2 != null) {
                aliasSet2.add(var1);
             } else {
                AliasSet newSet = new AliasSet();
@@ -146,9 +257,9 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       }
 
       public AliasSet findAliasSet(LValue lValue) {
-         if (lValue instanceof VariableRef) {
-            for (AliasSet alias : aliases) {
-               if (alias.contains(lValue)) {
+         if(lValue instanceof VariableRef) {
+            for(AliasSet alias : aliases) {
+               if(alias.contains(lValue)) {
                   return alias;
                }
             }
@@ -161,11 +272,11 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       }
 
       public void addAll(Aliases aliases) {
-         for (AliasSet aliasSet : aliases.getAliasSets()) {
+         for(AliasSet aliasSet : aliases.getAliasSets()) {
             List<VariableRef> vars = aliasSet.getVars();
             VariableRef first = null;
-            for (VariableRef var : vars) {
-               if (first == null) {
+            for(VariableRef var : vars) {
+               if(first == null) {
                   first = var;
                } else {
                   add(first, var);
@@ -192,7 +303,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       }
 
       public boolean contains(RValue rValue) {
-         if (rValue instanceof VariableRef) {
+         if(rValue instanceof VariableRef) {
             return vars.contains(rValue);
          } else {
             return false;
@@ -212,7 +323,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
          int maxScore = 0;
          String maxName = null;
          Map<String, Integer> varNameScore = new LinkedHashMap<>();
-         for (VariableRef var : vars) {
+         for(VariableRef var : vars) {
             String name;
             int score;
             Variable variable = scope.getVariable(var);
@@ -221,19 +332,19 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
                score = 100;
             } else if(var.isVersion()) {
                name = var.getFullNameUnversioned();
-               score = 4-var.getScopeDepth();
+               score = 4 - var.getScopeDepth();
             } else {
                // must be intermediate
                name = var.getFullName();
-               score = 2-var.getScopeDepth();
+               score = 2 - var.getScopeDepth();
             }
             Integer nameScore = varNameScore.get(name);
-            if(nameScore==null) {
+            if(nameScore == null) {
                nameScore = 0;
             }
             nameScore = nameScore + score;
             varNameScore.put(name, nameScore);
-            if(nameScore>maxScore) {
+            if(nameScore > maxScore) {
                maxName = name;
                maxScore = nameScore;
             }
@@ -241,12 +352,12 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
          // Find first var with highest scoring name
          List<VariableRef> vars = new ArrayList<>(this.vars);
          Collections.sort(vars, Comparator.comparing(SymbolRef::getFullName));
-         for (VariableRef var : vars) {
+         for(VariableRef var : vars) {
             if(var.isVersion()) {
                if(maxName.equals(var.getFullNameUnversioned())) {
                   return var;
                }
-            }  else {
+            } else {
                if(maxName.equals(var.getFullName())) {
                   return var;
                }
@@ -260,8 +371,8 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       public List<VariableRef> getEliminateVars(ProgramScope scope) {
          List<VariableRef> eliminate = new ArrayList<>();
          VariableRef keepVar = getKeepVar(scope);
-         for (VariableRef var : vars) {
-            if (!var.equals(keepVar)) {
+         for(VariableRef var : vars) {
+            if(!var.equals(keepVar)) {
                eliminate.add(var);
             }
          }
@@ -269,7 +380,7 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
       }
 
       public void remove(RValue rValue) {
-         if (rValue instanceof VariableRef) {
+         if(rValue instanceof VariableRef) {
             vars.remove(rValue);
          }
       }
@@ -277,117 +388,4 @@ public class Pass2AliasElimination extends Pass2SsaOptimization {
    }
 
 
-   public static Aliases findAliases(Program program) {
-      Aliases candidates = findAliasesCandidates(program);
-      cleanupCandidates(candidates, program);
-      return candidates;
-   }
-
-   // Remove all candidates that are used after assignment in phi blocks
-   private static void cleanupCandidates(Aliases candidates, Program program) {
-      for (final AliasSet aliasSet : candidates.aliases) {
-         for (ControlFlowBlock block : program.getGraph().getAllBlocks()) {
-            if (block.hasPhiBlock()) {
-               StatementPhiBlock phi = block.getPhiBlock();
-               boolean lMatch = false;
-               for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-                  if (lMatch) {
-                     if (aliasSet.contains(phiVariable.getVariable())) {
-                        // Assigning inside tha alias set again - no need to check the variables
-                        continue;
-                     }
-                     for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                        RValue rValue = phiRValue.getrValue();
-                        if (aliasSet.contains(rValue)) {
-                           program.getLog().append("Alias candidate removed " + rValue.toString(program));
-                           aliasSet.remove(rValue);
-                           break;
-                        }
-                     }
-                  } else {
-                     if (aliasSet.contains(phiVariable.getVariable())) {
-                        lMatch = true;
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   /**
-    * Find variables which are aliases of other variables.
-    *
-    * @return A bunch of alias sets
-    */
-   private static Aliases findAliasesCandidates(final Program program) {
-      Aliases aliases = new Aliases();
-      for (ControlFlowBlock block : program.getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if(statement instanceof StatementAssignment) {
-               StatementAssignment assignment = (StatementAssignment) statement;
-               if (assignment.getlValue() instanceof VariableRef) {
-                  VariableRef variable = (VariableRef) assignment.getlValue();
-                  if (assignment.getrValue1() == null && assignment.getOperator() == null && assignment.getrValue2() instanceof VariableRef) {
-                     // Alias assignment
-                     VariableRef alias = (VariableRef) assignment.getrValue2();
-                     // Examine if the alis is assigned inside another scope
-                     ControlFlowBlock aliasAssignmentBlock = program.getGraph().getAssignmentBlock(alias);
-                     ScopeRef aliasScope = aliasAssignmentBlock.getScope();
-                     ScopeRef varScope = block.getScope();
-                     if (!alias.isIntermediate() && (!varScope.equals(aliasScope) || !variable.getScopeNames().equals(alias.getScopeNames()))) {
-                        program.getLog().append("Not aliassing across scopes: " + variable + " " + alias);
-                     } else {
-                        aliases.add(variable, alias);
-                     }
-                  }
-               }
-            }  else if(statement instanceof StatementPhiBlock) {
-               StatementPhiBlock phi = (StatementPhiBlock) statement;
-               for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-                  VariableRef variable = phiVariable.getVariable();
-                  VariableRef alias = null;
-                  for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                     if (alias == null) {
-                        // First rValue
-                        if (phiRValue.getrValue() instanceof VariableRef) {
-                           alias = (VariableRef) phiRValue.getrValue();
-                           // Examine if the alis is assigned inside another scope
-                           ControlFlowBlock aliasAssignmentBlock = program.getGraph().getAssignmentBlock(alias);
-                           ScopeRef aliasScope = aliasAssignmentBlock.getScope();
-                           ScopeRef varScope = block.getScope();
-                           if (!varScope.equals(aliasScope) || !variable.getScopeNames().equals(alias.getScopeNames())) {
-                              program.getLog().append("Not aliassing across scopes: " + variable + " " + alias);
-                              alias = null;
-                              break;
-                           } else if (variable.equals(alias)) {
-                              program.getLog().append("Not aliassing identity: " + variable + " " + alias);
-                              alias = null;
-                              break;
-                           }
-                        } else {
-                           // Not aliasing non-variables
-                           break;
-                        }
-                     } else {
-                        // rValue 2-n
-                        if (!alias.equals(phiRValue.getrValue())) {
-                           // Not aliasing if any rValue is not identical
-                           alias = null;
-                           break;
-                        }
-                     }
-                  }
-                  if (alias != null) {
-                     aliases.add(variable, alias);
-                  }
-
-               }
-            }
-         }
-      }
-      return aliases;
-   }
-
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertBlocks.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertBlocks.java
index 57f703d4c..cfc4a8df0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertBlocks.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertBlocks.java
@@ -2,7 +2,9 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /** Assert that all referenced blocks exist in the program */
 public class Pass2AssertBlocks extends Pass2SsaAssertion {
@@ -18,7 +20,7 @@ public class Pass2AssertBlocks extends Pass2SsaAssertion {
 
       Set<LabelRef> seenBlocks = blockReferenceFinder.getSeenBlocks();
       Collection<ControlFlowBlock> allBlocks = getGraph().getAllBlocks();
-      for (LabelRef seenBlock : seenBlocks) {
+      for(LabelRef seenBlock : seenBlocks) {
          ControlFlowBlock block = getGraph().getBlock(seenBlock);
          if(!allBlocks.contains(block)) {
             throw new AssertionFailed("Compilation Process Error! A block in the program is not contained in the allBocks list (probably a block sequence problem). " + seenBlock);
@@ -28,9 +30,8 @@ public class Pass2AssertBlocks extends Pass2SsaAssertion {
 
    private static class BlockReferenceChecker extends ControlFlowGraphBaseVisitor<Void> {
 
-      private ControlFlowGraph graph;
-
       Set<LabelRef> seenBlocks;
+      private ControlFlowGraph graph;
 
       public BlockReferenceChecker(ControlFlowGraph graph) {
          this.graph = graph;
@@ -42,15 +43,15 @@ public class Pass2AssertBlocks extends Pass2SsaAssertion {
       }
 
       private void assertBlock(LabelRef blockLabel) throws AssertionFailed {
-         if (blockLabel == null) {
+         if(blockLabel == null) {
             return;
          }
-         if (blockLabel.getFullName().equals(SymbolRef.PROCEXIT_BLOCK_NAME)) {
+         if(blockLabel.getFullName().equals(SymbolRef.PROCEXIT_BLOCK_NAME)) {
             return;
          }
          seenBlocks.add(blockLabel);
          ControlFlowBlock block = graph.getBlock(blockLabel);
-         if (block == null) {
+         if(block == null) {
             throw new AssertionFailed("Compilation Process Error! Block referenced, but not found in program. " + blockLabel);
          }
       }
@@ -80,8 +81,8 @@ public class Pass2AssertBlocks extends Pass2SsaAssertion {
 
       @Override
       public Void visitPhiBlock(StatementPhiBlock phi) {
-         for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+         for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                assertBlock(phiRValue.getPredecessor());
             }
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallLvalues.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallLvalues.java
index cf639c21b..e5889e83f 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallLvalues.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallLvalues.java
@@ -18,8 +18,8 @@ public class Pass2AssertNoCallLvalues extends Pass2SsaAssertion {
 
          @Override
          public Void visitCall(StatementCall call) {
-            if(call.getlValue()!=null) {
-               throw new AssertionFailed("No call lValue allowed! "+ call);
+            if(call.getlValue() != null) {
+               throw new AssertionFailed("No call lValue allowed! " + call);
             }
             return null;
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallParameters.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallParameters.java
index 0813a28cd..a23d77cf5 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallParameters.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoCallParameters.java
@@ -1,6 +1,9 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.RValue;
+import dk.camelot64.kickc.model.StatementCall;
 
 import java.util.List;
 
@@ -19,8 +22,8 @@ public class Pass2AssertNoCallParameters extends Pass2SsaAssertion {
          @Override
          public Void visitCall(StatementCall call) {
             List<RValue> parameters = call.getParameters();
-            if(parameters!=null && parameters.size()>0) {
-               throw new AssertionFailed("No call parameters allowed! "+ call);
+            if(parameters != null && parameters.size() > 0) {
+               throw new AssertionFailed("No call parameters allowed! " + call);
             }
             return null;
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoLabels.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoLabels.java
index 091cd9780..9b8effab0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoLabels.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoLabels.java
@@ -1,6 +1,8 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.StatementLabel;
 
 /** Asserts that the graph contains no label statements */
 public class Pass2AssertNoLabels extends Pass2SsaAssertion {
@@ -16,7 +18,7 @@ public class Pass2AssertNoLabels extends Pass2SsaAssertion {
 
          @Override
          public Void visitJumpTarget(StatementLabel jumpTarget) {
-            throw new AssertionFailed("No label statements allowed! "+jumpTarget);
+            throw new AssertionFailed("No label statements allowed! " + jumpTarget);
          }
       };
       checkCalls.visitGraph(getGraph());
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoProcs.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoProcs.java
index 08994afc1..10dff7749 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoProcs.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoProcs.java
@@ -1,6 +1,9 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.StatementProcedureBegin;
+import dk.camelot64.kickc.model.StatementProcedureEnd;
 
 /** Asserts that the graph contains no proc/endproc statements */
 public class Pass2AssertNoProcs extends Pass2SsaAssertion {
@@ -16,12 +19,12 @@ public class Pass2AssertNoProcs extends Pass2SsaAssertion {
 
          @Override
          public Void visitProcedureBegin(StatementProcedureBegin procedureBegin) {
-            throw new AssertionFailed("No proc statements allowed! "+ procedureBegin);
+            throw new AssertionFailed("No proc statements allowed! " + procedureBegin);
          }
 
          @Override
          public Void visitProcedureEnd(StatementProcedureEnd procedureEnd) {
-            throw new AssertionFailed("No proc statements allowed! "+ procedureEnd);
+            throw new AssertionFailed("No proc statements allowed! " + procedureEnd);
          }
       };
       checkCalls.visitGraph(getGraph());
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoReturnValues.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoReturnValues.java
index 8ee1b6f83..c126c6f4c 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoReturnValues.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertNoReturnValues.java
@@ -18,8 +18,8 @@ public class Pass2AssertNoReturnValues extends Pass2SsaAssertion {
 
          @Override
          public Void visitReturn(StatementReturn aReturn) {
-            if(aReturn.getValue()!=null) {
-               throw new AssertionFailed("No return values allowed! "+ aReturn);
+            if(aReturn.getValue() != null) {
+               throw new AssertionFailed("No return values allowed! " + aReturn);
             }
             return null;
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSingleAssignment.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSingleAssignment.java
index 0f781007e..f673f6a5e 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSingleAssignment.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSingleAssignment.java
@@ -17,15 +17,15 @@ public class Pass2AssertSingleAssignment extends Pass2SsaAssertion {
 
       Map<VariableRef, Statement> assignments = new LinkedHashMap<>();
 
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             if(statement instanceof StatementLValue) {
                LValue lValue = ((StatementLValue) statement).getlValue();
                if(lValue instanceof VariableRef) {
                   checkAssignment(assignments, lValue, statement);
                }
             } else if(statement instanceof StatementPhiBlock) {
-               for (StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
+               for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
                   checkAssignment(assignments, phiVariable.getVariable(), statement);
                }
             }
@@ -35,8 +35,8 @@ public class Pass2AssertSingleAssignment extends Pass2SsaAssertion {
    }
 
    private void checkAssignment(Map<VariableRef, Statement> assignments, LValue lValue, Statement statement) {
-      if(assignments.get(lValue)!=null) {
-         throw  new AssertionFailed("Multiple assignments to variable "+lValue+" 1: "+assignments.get(lValue)+" 2:"+statement);
+      if(assignments.get(lValue) != null) {
+         throw new AssertionFailed("Multiple assignments to variable " + lValue + " 1: " + assignments.get(lValue) + " 2:" + statement);
       } else {
          assignments.put((VariableRef) lValue, statement);
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSymbols.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSymbols.java
index 798759dfb..b816c6e3c 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSymbols.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertSymbols.java
@@ -17,35 +17,35 @@ public class Pass2AssertSymbols extends Pass2SsaAssertion {
       symbolFinder.visitGraph(getGraph());
       HashSet<Symbol> codeSymbols = symbolFinder.getSymbols();
       // Check that all symbols found in the code is also oin the symbol tabel
-      for (Symbol codeSymbol : codeSymbols) {
+      for(Symbol codeSymbol : codeSymbols) {
          if(codeSymbol.getFullName().equals(SymbolRef.PROCEXIT_BLOCK_NAME)) continue;
          Symbol tableSymbol = getSymbols().getSymbol(codeSymbol.getFullName());
-         if(tableSymbol==null) {
-            throw new AssertionFailed("Compile process error. Symbol found in code, but not in symbol table. "+codeSymbol.getFullName());
+         if(tableSymbol == null) {
+            throw new AssertionFailed("Compile process error. Symbol found in code, but not in symbol table. " + codeSymbol.getFullName());
          }
       }
       // Check that all symbols in the symbol table is also in the code
       HashSet<Symbol> tableSymbols = getAllSymbols(getSymbols());
-      for (Symbol tableSymbol : tableSymbols) {
+      for(Symbol tableSymbol : tableSymbols) {
          if(tableSymbol instanceof VariableUnversioned) continue;
          if(tableSymbol instanceof ConstantVar) continue;
          Symbol codeSymbol = null;
          String codeSymbolFullName = tableSymbol.getFullName();
-         for (Symbol symbol : codeSymbols) {
+         for(Symbol symbol : codeSymbols) {
             if(codeSymbolFullName.equals(symbol.getFullName())) {
                codeSymbol = symbol;
                break;
             }
          }
-         if(codeSymbol==null) {
-            throw new AssertionFailed("Compile process error. Symbol found in symbol table, but not in code. "+ codeSymbolFullName);
+         if(codeSymbol == null) {
+            throw new AssertionFailed("Compile process error. Symbol found in symbol table, but not in code. " + codeSymbolFullName);
          }
       }
    }
 
    private HashSet<Symbol> getAllSymbols(Scope symbols) {
       HashSet<Symbol> allSymbols = new HashSet<>();
-      for (Symbol symbol : symbols.getAllSymbols()) {
+      for(Symbol symbol : symbols.getAllSymbols()) {
          allSymbols.add(symbol);
          if(symbol instanceof Scope) {
             HashSet<Symbol> subSymbols = getAllSymbols((Scope) symbol);
@@ -58,19 +58,18 @@ public class Pass2AssertSymbols extends Pass2SsaAssertion {
    private static class SymbolFinder extends ControlFlowGraphBaseVisitor<Void> {
 
       private ProgramScope programScope;
+      private HashSet<Symbol> symbols = new HashSet<>();
 
       public SymbolFinder(ProgramScope programScope) {
          this.programScope = programScope;
       }
 
-      private HashSet<Symbol> symbols = new HashSet<>();
-
       public HashSet<Symbol> getSymbols() {
          return symbols;
       }
 
       private void addSymbol(Value symbol) {
-         if (symbol instanceof Symbol) {
+         if(symbol instanceof Symbol) {
             symbols.add((Symbol) symbol);
          } else if(symbol instanceof SymbolRef) {
             addSymbol(programScope.getSymbol((SymbolRef) symbol));
@@ -145,8 +144,8 @@ public class Pass2AssertSymbols extends Pass2SsaAssertion {
       public Void visitCall(StatementCall call) {
          addSymbol(call.getlValue());
          addSymbol(call.getProcedure());
-         if(call.getParameters()!=null) {
-            for (RValue param : call.getParameters()) {
+         if(call.getParameters() != null) {
+            for(RValue param : call.getParameters()) {
                addSymbol(param);
             }
          }
@@ -155,9 +154,9 @@ public class Pass2AssertSymbols extends Pass2SsaAssertion {
 
       @Override
       public Void visitPhiBlock(StatementPhiBlock phi) {
-         for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+         for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
             addSymbol(phiVariable.getVariable());
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                addSymbol(phiRValue.getrValue());
             }
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertTypeMatch.java b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertTypeMatch.java
index 0c2a2242b..28712674f 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2AssertTypeMatch.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2AssertTypeMatch.java
@@ -13,9 +13,9 @@ public class Pass2AssertTypeMatch extends Pass2SsaAssertion {
 
    @Override
    public void check() throws AssertionFailed {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementAssignment) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementAssignment) {
                checkAssignment((StatementAssignment) statement);
             }
             // TODO: Implement checking for calls / conditional jumps / ...
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ConditionalJumpSimplification.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ConditionalJumpSimplification.java
index b2e553ba7..050819573 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2ConditionalJumpSimplification.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2ConditionalJumpSimplification.java
@@ -25,23 +25,23 @@ public class Pass2ConditionalJumpSimplification extends Pass2SsaOptimization {
       final List<VariableRef> simpleConditionVars = getSimpleConditions(assignments, usages);
       removeAssignments(simpleConditionVars);
       deleteSymbols(simpleConditionVars);
-      return (simpleConditionVars.size()>0);
+      return (simpleConditionVars.size() > 0);
    }
 
-   private List<VariableRef>  getSimpleConditions(final Map<LValue, StatementAssignment> assignments, final Map<RValue, List<Statement>> usages) {
+   private List<VariableRef> getSimpleConditions(final Map<LValue, StatementAssignment> assignments, final Map<RValue, List<Statement>> usages) {
 
-      final List<VariableRef>  simpleConditionVars = new ArrayList<>();
+      final List<VariableRef> simpleConditionVars = new ArrayList<>();
 
       ControlFlowGraphBaseVisitor<Void> visitor = new ControlFlowGraphBaseVisitor<Void>() {
          @Override
          public Void visitConditionalJump(StatementConditionalJump conditionalJump) {
-            if(conditionalJump.getrValue1()==null && conditionalJump.getOperator()==null) {
+            if(conditionalJump.getrValue1() == null && conditionalJump.getOperator() == null) {
                RValue conditionRValue = conditionalJump.getrValue2();
-               if(conditionRValue instanceof VariableRef && usages.get(conditionRValue).size()==1) {
+               if(conditionRValue instanceof VariableRef && usages.get(conditionRValue).size() == 1) {
                   VariableRef conditionVar = (VariableRef) conditionRValue;
                   StatementAssignment conditionAssignment = assignments.get(conditionVar);
-                  if(conditionAssignment.getOperator()!=null) {
-                     switch (conditionAssignment.getOperator().getOperator()) {
+                  if(conditionAssignment.getOperator() != null) {
+                     switch(conditionAssignment.getOperator().getOperator()) {
                         case "==":
                         case "<>":
                         case "!=":
@@ -51,12 +51,12 @@ public class Pass2ConditionalJumpSimplification extends Pass2SsaOptimization {
                         case "=<":
                         case ">=":
                         case "=>":
-                        conditionalJump.setrValue1(conditionAssignment.getrValue1());
-                        conditionalJump.setOperator(conditionAssignment.getOperator());
-                        conditionalJump.setrValue2(conditionAssignment.getrValue2());
-                        simpleConditionVars.add(conditionVar);
-                        getLog().append("Simple Condition " + conditionVar.toString(getProgram()) + " " + conditionalJump.toString(getProgram(), true));
-                        break;
+                           conditionalJump.setrValue1(conditionAssignment.getrValue1());
+                           conditionalJump.setOperator(conditionAssignment.getOperator());
+                           conditionalJump.setrValue2(conditionAssignment.getrValue2());
+                           simpleConditionVars.add(conditionVar);
+                           getLog().append("Simple Condition " + conditionVar.toString(getProgram()) + " " + conditionalJump.toString(getProgram(), true));
+                           break;
                         default:
                      }
                   }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantAdditionElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantAdditionElimination.java
index 005c4e743..c1ba1ddc8 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantAdditionElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantAdditionElimination.java
@@ -6,7 +6,7 @@ import java.util.Map;
 
 /**
  * Compiler Pass eliminating several additions of constants by consolidating them to a single (compile time) constant c1+v+c2 => (c1+c2)+v
- *
+ * <p>
  * TODO:
  * - If sub variable is used in other places consolidation is not allowed!
  * Example: With only a & b the constants c1 & c2 could be consolidated to b=(c1+c2)+a, a=v. Since c also uses a this is not an option.
@@ -34,9 +34,9 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
       this.usages = countVarUsages();
 
       // Examine all assignments - performing constant consolidation
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementAssignment) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
                if(assignment.getlValue() instanceof PointerDereferenceIndexed) {
                   optimized |= optimizePointerDereferenceIndexed(new ValueReplacer.ReplaceableLValue(assignment));
@@ -49,8 +49,8 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
                }
 
                Operator operator = assignment.getOperator();
-               if (operator != null) {
-                  switch (operator.getOperator()) {
+               if(operator != null) {
+                  switch(operator.getOperator()) {
                      case "+":
                         optimized |= optimizePlus(assignment);
                         break;
@@ -86,7 +86,7 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
       if(pointerDereferenceIndexed.getPointer() instanceof ConstantValue && pointerDereferenceIndexed.getIndex() instanceof VariableRef) {
          VariableRef variable = (VariableRef) pointerDereferenceIndexed.getIndex();
          ConstantValue consolidated = consolidateSubConstants(variable);
-         if (consolidated != null) {
+         if(consolidated != null) {
             ConstantValue ptrConstant = (ConstantValue) pointerDereferenceIndexed.getPointer();
             ConstantValue newPtr = new ConstantBinary(ptrConstant, Operator.PLUS, consolidated);
             pointerDereferenceIndexed.setPointer(newPtr);
@@ -98,7 +98,7 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
    }
 
    private boolean optimizeArrayDeref(StatementAssignment assignment) {
-      if (assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof ConstantValue) {
+      if(assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof ConstantValue) {
          ConstantValue ptrConstant = (ConstantValue) assignment.getrValue1();
          ConstantValue idxConstant = (ConstantValue) assignment.getrValue2();
          ConstantValue newPtr = new ConstantBinary(ptrConstant, Operator.PLUS, idxConstant);
@@ -108,10 +108,10 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
          getLog().append("Consolidated referenced array index constant in assignment " + assignment.getlValue());
          return true;
       }
-      if (assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof VariableRef) {
+      if(assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof VariableRef) {
          VariableRef variable = (VariableRef) assignment.getrValue2();
          ConstantValue consolidated = consolidateSubConstants(variable);
-         if (consolidated != null) {
+         if(consolidated != null) {
             ConstantValue ptrConstant = (ConstantValue) assignment.getrValue1();
             ConstantValue newPtr = new ConstantBinary(ptrConstant, Operator.PLUS, consolidated);
             assignment.setrValue1(newPtr);
@@ -123,19 +123,19 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
    }
 
    private boolean optimizePlus(StatementAssignment assignment) {
-      if (assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof VariableRef) {
+      if(assignment.getrValue1() instanceof ConstantValue && assignment.getrValue2() instanceof VariableRef) {
          VariableRef variable = (VariableRef) assignment.getrValue2();
          ConstantValue consolidated = consolidateSubConstants(variable);
-         if (consolidated != null) {
+         if(consolidated != null) {
             ConstantValue const1 = (ConstantValue) assignment.getrValue1();
             assignment.setrValue1(new ConstantBinary(const1, Operator.PLUS, consolidated));
             getLog().append("Consolidated constant in assignment " + assignment.getlValue());
             return true;
          }
-      } else if (assignment.getrValue1() instanceof VariableRef && assignment.getrValue2() instanceof ConstantValue) {
+      } else if(assignment.getrValue1() instanceof VariableRef && assignment.getrValue2() instanceof ConstantValue) {
          VariableRef variable = (VariableRef) assignment.getrValue1();
          ConstantValue consolidated = consolidateSubConstants(variable);
-         if (consolidated != null) {
+         if(consolidated != null) {
             ConstantValue const2 = (ConstantValue) assignment.getrValue2();
             ConstantValue newNumber = new ConstantBinary(consolidated, Operator.PLUS, const2);
             assignment.setrValue2(newNumber);
@@ -154,18 +154,18 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
     * @return The consolidated constant. Null if no sub-constants were found, or if the constants cannot be consolidated.
     */
    private ConstantValue consolidateSubConstants(VariableRef variable) {
-      if(getUsages(variable) >1) {
-         getLog().append("Multiple usages for variable. Not optimizing sub-constant "+variable.toString(getProgram()));
+      if(getUsages(variable) > 1) {
+         getLog().append("Multiple usages for variable. Not optimizing sub-constant " + variable.toString(getProgram()));
          return null;
       }
       StatementAssignment assignment = getGraph().getAssignment(variable);
-      if (assignment != null && assignment.getOperator() != null && "+".equals(assignment.getOperator().getOperator())) {
-         if (assignment.getrValue1() instanceof ConstantValue) {
+      if(assignment != null && assignment.getOperator() != null && "+".equals(assignment.getOperator().getOperator())) {
+         if(assignment.getrValue1() instanceof ConstantValue) {
             ConstantValue constant = (ConstantValue) assignment.getrValue1();
             assignment.setrValue1(null);
             assignment.setOperator(null);
             return constant;
-         } else if (assignment.getrValue2() instanceof ConstantValue) {
+         } else if(assignment.getrValue2() instanceof ConstantValue) {
             ConstantValue constant = (ConstantValue) assignment.getrValue2();
             assignment.setrValue2(assignment.getrValue1());
             assignment.setOperator(null);
@@ -173,31 +173,31 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
             return constant;
          } else {
             ConstantValue const1 = null;
-            if (assignment.getrValue1() instanceof VariableRef) {
+            if(assignment.getrValue1() instanceof VariableRef) {
                const1 = consolidateSubConstants((VariableRef) assignment.getrValue1());
             }
             ConstantValue const2 = null;
-            if (assignment.getrValue2() instanceof VariableRef) {
+            if(assignment.getrValue2() instanceof VariableRef) {
                const2 = consolidateSubConstants((VariableRef) assignment.getrValue2());
             }
             ConstantValue result = null;
-            if (const1 != null) {
+            if(const1 != null) {
                result = const1;
-               if (const2 != null) {
+               if(const2 != null) {
                   result = new ConstantBinary(const1, Operator.PLUS, const2);
                }
-            } else if (const2 != null) {
+            } else if(const2 != null) {
                result = const2;
             }
             return result;
          }
       }
-      if (assignment != null && assignment.getOperator() != null && "-".equals(assignment.getOperator().getOperator())) {
-         if (assignment.getrValue1() instanceof ConstantValue) {
+      if(assignment != null && assignment.getOperator() != null && "-".equals(assignment.getOperator().getOperator())) {
+         if(assignment.getrValue1() instanceof ConstantValue) {
             ConstantValue constant = (ConstantValue) assignment.getrValue1();
             assignment.setrValue1(null);
             return constant;
-         } else if (assignment.getrValue2() instanceof ConstantValue) {
+         } else if(assignment.getrValue2() instanceof ConstantValue) {
             ConstantValue constant = (ConstantValue) assignment.getrValue2();
             assignment.setrValue2(assignment.getrValue1());
             assignment.setOperator(null);
@@ -205,20 +205,20 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
             return new ConstantUnary(Operator.MINUS, constant);
          } else {
             ConstantValue const1 = null;
-            if (assignment.getrValue1() instanceof VariableRef) {
+            if(assignment.getrValue1() instanceof VariableRef) {
                const1 = consolidateSubConstants((VariableRef) assignment.getrValue1());
             }
             ConstantValue const2 = null;
-            if (assignment.getrValue2() instanceof VariableRef) {
+            if(assignment.getrValue2() instanceof VariableRef) {
                const2 = consolidateSubConstants((VariableRef) assignment.getrValue2());
             }
             ConstantValue result = null;
-            if (const1 != null) {
+            if(const1 != null) {
                result = const1;
-               if (const2 != null) {
-                  result = new ConstantBinary(const1, Operator.MINUS,const2);
+               if(const2 != null) {
+                  result = new ConstantBinary(const1, Operator.MINUS, const2);
                }
-            } else if (const2 != null) {
+            } else if(const2 != null) {
                result = const2;
             }
             return result;
@@ -229,7 +229,7 @@ public class Pass2ConstantAdditionElimination extends Pass2SsaOptimization {
 
    private Integer getUsages(VariableRef variable) {
       Integer useCount = usages.get(variable);
-      if(useCount==null) useCount = 0;
+      if(useCount == null) useCount = 0;
       return useCount;
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java
index f1dc904df..843731479 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java
@@ -16,6 +16,29 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
       super(program);
    }
 
+   static ConstantValue createUnary(Operator operator, ConstantValue c) {
+      switch(operator.getOperator()) {
+         case "-":
+         case "+":
+         case "++":
+         case "--":
+         case "<":
+         case ">":
+         case "((byte))":
+         case "((signed byte))":
+         case "((sbyte))":
+         case "((word))":
+         case "((signed word))":
+         case "((byte*))":
+            return new ConstantUnary(operator, c);
+         case "*": { // pointer dereference - not constant
+            return null;
+         }
+         default:
+            throw new RuntimeException("Unhandled Unary Operator " + operator.getOperator());
+      }
+   }
+
    /**
     * Propagate constants, replacing variables with constants where possible.
     *
@@ -26,7 +49,7 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
       Map<VariableRef, ConstantValue> constants = findConstantVariables();
       LinkedHashMap<VariableRef, RValue> constAliases = new LinkedHashMap<>();
       // Update symbol table with the constant value
-      for (VariableRef constRef : constants.keySet()) {
+      for(VariableRef constRef : constants.keySet()) {
          Variable variable = getProgram().getScope().getVariable(constRef);
          ConstantValue constVal = constants.get(constRef);
          Scope constScope = variable.getScope();
@@ -43,8 +66,8 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
             } else {
                throw new CompileError(
                      "Constant variable has a non-matching type \n variable: " + variable.toString(getProgram()) +
-                           "\n value: (" + valueType.toString()+") "+ConstantValueCalculator.calcValue(getScope(), constVal) +
-                           "\n value definition: "+constVal.toString(getProgram()));
+                           "\n value: (" + valueType.toString() + ") " + ConstantValueCalculator.calcValue(getScope(), constVal) +
+                           "\n value definition: " + constVal.toString(getProgram()));
             }
          }
 
@@ -77,47 +100,47 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
          @Override
          public Void visitAssignment(StatementAssignment assignment) {
             LValue lValue = assignment.getlValue();
-            if (lValue instanceof VariableRef) {
+            if(lValue instanceof VariableRef) {
                VariableRef variable = (VariableRef) lValue;
-               if (assignment.getrValue1() == null && getConstant(assignment.getrValue2()) != null) {
-                  if (assignment.getOperator() == null) {
+               if(assignment.getrValue1() == null && getConstant(assignment.getrValue2()) != null) {
+                  if(assignment.getOperator() == null) {
                      // Constant assignment
                      ConstantValue constant = getConstant(assignment.getrValue2());
                      constants.put(variable, constant);
                   } else {
                      // Constant unary expression
                      ConstantValue constant = createUnary(assignment.getOperator(), getConstant(assignment.getrValue2()));
-                     if (constant != null) {
+                     if(constant != null) {
                         constants.put(variable, constant);
                      }
                   }
-               } else if (getConstant(assignment.getrValue1()) != null && getConstant(assignment.getrValue2()) != null) {
+               } else if(getConstant(assignment.getrValue1()) != null && getConstant(assignment.getrValue2()) != null) {
                   // Constant binary expression
                   ConstantValue constant = createBinary(
                         getConstant(assignment.getrValue1()),
                         assignment.getOperator(),
                         getConstant(assignment.getrValue2()));
-                  if (constant != null) {
+                  if(constant != null) {
 
                      constants.put(variable, constant);
                   }
-               } else if (assignment.getrValue2() instanceof ValueList && assignment.getOperator() == null && assignment.getrValue1() == null) {
-                  if (lValue instanceof VariableRef) {
+               } else if(assignment.getrValue2() instanceof ValueList && assignment.getOperator() == null && assignment.getrValue1() == null) {
+                  if(lValue instanceof VariableRef) {
                      Variable lVariable = getScope().getVariable((VariableRef) lValue);
-                     if (lVariable.getType() instanceof SymbolTypeArray) {
+                     if(lVariable.getType() instanceof SymbolTypeArray) {
                         ValueList valueList = (ValueList) assignment.getrValue2();
                         List<RValue> values = valueList.getList();
                         boolean allConstant = true;
                         SymbolType elementType = null;
                         List<ConstantValue> elements = new ArrayList<>();
-                        for (RValue value : values) {
-                           if (value instanceof ConstantValue) {
+                        for(RValue value : values) {
+                           if(value instanceof ConstantValue) {
                               ConstantValue constantValue = (ConstantValue) value;
                               SymbolType type = constantValue.getType(getScope());
-                              if (elementType == null) {
+                              if(elementType == null) {
                                  elementType = type;
                               } else {
-                                 if (!SymbolTypeInference.typeMatch(type, elementType)) {
+                                 if(!SymbolTypeInference.typeMatch(type, elementType)) {
                                     throw new RuntimeException("Array type mismatch " + elementType + " does not match " + type + " " + valueList.toString(getProgram()));
                                  }
                               }
@@ -128,7 +151,7 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
                               break;
                            }
                         }
-                        if (allConstant && elementType != null) {
+                        if(allConstant && elementType != null) {
                            ConstantValue constant = new ConstantArrayList(elements, elementType);
                            constants.put(variable, constant);
                         }
@@ -141,10 +164,10 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
 
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-               if (phiVariable.getValues().size() == 1) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+               if(phiVariable.getValues().size() == 1) {
                   StatementPhiBlock.PhiRValue phiRValue = phiVariable.getValues().get(0);
-                  if (getConstant(phiRValue.getrValue()) != null) {
+                  if(getConstant(phiRValue.getrValue()) != null) {
                      VariableRef variable = phiVariable.getVariable();
                      ConstantValue constant = getConstant(phiRValue.getrValue());
                      constants.put(variable, constant);
@@ -167,18 +190,17 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
     * @return The constant value. null is the rValue is not a known constant.
     */
    private ConstantValue getConstant(RValue rValue) {
-      if (rValue instanceof ConstantValue) {
+      if(rValue instanceof ConstantValue) {
          return (ConstantValue) rValue;
-      } else if (rValue instanceof ConstantVar) {
+      } else if(rValue instanceof ConstantVar) {
          ConstantVar constantVar = (ConstantVar) rValue;
          return constantVar.getRef();
       }
       return null;
    }
 
-
    ConstantValue createBinary(ConstantValue c1, Operator operator, ConstantValue c2) {
-      switch (operator.getOperator()) {
+      switch(operator.getOperator()) {
          case "-":
          case "+":
             if(SymbolType.STRING.equals(c1.getType(getScope()))) {
@@ -208,27 +230,4 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
       }
    }
 
-   static ConstantValue createUnary(Operator operator, ConstantValue c) {
-      switch (operator.getOperator()) {
-         case "-":
-         case "+":
-         case "++":
-         case "--":
-         case "<":
-         case ">":
-         case "((byte))":
-         case "((signed byte))":
-         case "((sbyte))":
-         case "((word))":
-         case "((signed word))":
-         case "((byte*))":
-            return new ConstantUnary(operator, c);
-         case "*": { // pointer dereference - not constant
-            return null;
-         }
-         default:
-            throw new RuntimeException("Unhandled Unary Operator " + operator.getOperator());
-      }
-   }
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantInlining.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantInlining.java
index a5983257d..958b10cd1 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantInlining.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantInlining.java
@@ -6,12 +6,13 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-/** Compiler Pass consolidating unnamed constants and constant aliasses into the place using them (instructions or the definition of another constant value).
- *    <ul>
- *       <li> Unnamed constant:   $1 = VIC+$20 </li>
- *       <li> Constant alias:     i#1 = i#0    </li>
- *    </ul>
- * */
+/**
+ * Compiler Pass consolidating unnamed constants and constant aliasses into the place using them (instructions or the definition of another constant value).
+ * <ul>
+ * <li> Unnamed constant:   $1 = VIC+$20 </li>
+ * <li> Constant alias:     i#1 = i#0    </li>
+ * </ul>
+ */
 public class Pass2ConstantInlining extends Pass2SsaOptimization {
 
    public Pass2ConstantInlining(Program program) {
@@ -20,6 +21,7 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
 
    /**
     * Consolidate unnamed constants into other constants value
+    *
     * @return true optimization was performed. false if no optimization was possible.
     */
    @Override
@@ -38,24 +40,25 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
       // Replace all usages of the constants in constant definitions inside the symbol table
       replaceInSymbolTable(inline);
 
-      for (ConstantRef constantRef : inline.keySet()) {
-         getLog().append("Constant inlined " + constantRef.toString()+" = "+inline.get(constantRef).toString(getProgram()));
+      for(ConstantRef constantRef : inline.keySet()) {
+         getLog().append("Constant inlined " + constantRef.toString() + " = " + inline.get(constantRef).toString(getProgram()));
       }
 
-      return inline.size()>0;
+      return inline.size() > 0;
 
    }
 
    /**
     * Replace any alias within the constant defimtions inside the symbol table
+    *
     * @param inline The replacements to make
     */
    private void replaceInSymbolTable(Map<ConstantRef, ConstantValue> inline) {
       Collection<ConstantVar> allConstants = getProgram().getScope().getAllConstants(true);
-      for (ConstantVar constantVar : allConstants) {
+      for(ConstantVar constantVar : allConstants) {
          ConstantValue constantValue = constantVar.getValue();
          RValue replacement = AliasReplacer.getReplacement(constantValue, inline);
-         if(replacement!=null) {
+         if(replacement != null) {
             constantVar.setValue((ConstantValue) replacement);
          }
       }
@@ -63,16 +66,17 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
 
    /**
     * Replace any aliases within the constant values themselves
+    *
     * @param inline The replacements
     */
    private void replaceInValues(Map<ConstantRef, ConstantValue> inline) {
       boolean replaced = true;
       while(replaced) {
          replaced = false;
-         for (ConstantRef constantRef : inline.keySet()) {
+         for(ConstantRef constantRef : inline.keySet()) {
             ConstantValue constantValue = inline.get(constantRef);
             ConstantValue replacement = (ConstantValue) AliasReplacer.getReplacement(constantValue, inline);
-            if (replacement != null) {
+            if(replacement != null) {
                replaced = true;
                inline.put(constantRef, replacement);
             }
@@ -82,14 +86,15 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
 
    /**
     * Find all unnamed constants $1 = VIC+$20
+    *
     * @return Map from constant name to constant value
     */
    private Map<ConstantRef, ConstantValue> findUnnamedConstants() {
       Map<ConstantRef, ConstantValue> unnamed = new HashMap<>();
       Collection<ConstantVar> allConstants = getProgram().getScope().getAllConstants(true);
-      for (ConstantVar constant : allConstants) {
+      for(ConstantVar constant : allConstants) {
          if(constant.getRef().isIntermediate()) {
-            if(!(constant.getType().equals(SymbolType.STRING)) && !(constant.getValue() instanceof ConstantArrayList)&& !(constant.getValue() instanceof ConstantArrayFilled)) {
+            if(!(constant.getType().equals(SymbolType.STRING)) && !(constant.getValue() instanceof ConstantArrayList) && !(constant.getValue() instanceof ConstantArrayFilled)) {
                unnamed.put(constant.getRef(), constant.getValue());
             }
          }
@@ -99,20 +104,21 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
 
    /**
     * Find all constant aliases. An alias is a constant with the exact same value as another constant eg. i#2 = i#0
+    *
     * @return Map from constant name to constant value
     */
    private Map<ConstantRef, ConstantValue> findAliasConstants() {
       Map<ConstantRef, ConstantValue> aliases = new HashMap<>();
       ProgramScope programScope = getProgram().getScope();
       Collection<ConstantVar> allConstants = programScope.getAllConstants(true);
-      for (ConstantVar constant : allConstants) {
+      for(ConstantVar constant : allConstants) {
          ConstantValue constantValue = constant.getValue();
          if(constantValue instanceof ConstantRef) {
             if(((ConstantRef) constantValue).isIntermediate()) {
                // The value is an intermediate constant - replace all uses of the intermediate with uses of the referrer instead.
                aliases.put((ConstantRef) constant.getValue(), constant.getRef());
                constant.setValue(programScope.getConstant((ConstantRef) constantValue).getValue());
-            }  else {
+            } else {
                aliases.put(constant.getRef(), constant.getValue());
             }
          }
@@ -124,30 +130,31 @@ public class Pass2ConstantInlining extends Pass2SsaOptimization {
     * Find
     * - variable versions that are constant, while other versions are still variable eg. i#0 = 0, i#1 = i#0 + 1
     * - constant versions where other constant versions have different values eg. line(1); line(2); (the constants here are the parameters to the method line)
+    *
     * @return Map from constant name to constant value
     */
    private Map<ConstantRef, ConstantValue> findConstVarVersions() {
       Map<ConstantRef, ConstantValue> aliases = new HashMap<>();
 
       Collection<ConstantVar> allConstants = getProgram().getScope().getAllConstants(true);
-      for (ConstantVar constant : allConstants) {
+      for(ConstantVar constant : allConstants) {
          if(constant.getRef().isVersion()) {
             // Constant is a version - find the other versions
             String baseName = constant.getRef().getFullNameUnversioned();
             Collection<Symbol> scopeSymbols = constant.getScope().getAllSymbols();
-            for (Symbol symbol : scopeSymbols) {
+            for(Symbol symbol : scopeSymbols) {
                if(symbol.getRef().isVersion() && symbol.getRef().getFullNameUnversioned().equals(baseName)) {
                   ConstantValue value = constant.getValue();
                   if(symbol instanceof Variable) {
                      aliases.put(constant.getRef(), value);
-                     getLog().append("Inlining constant with var siblings "+constant);
+                     getLog().append("Inlining constant with var siblings " + constant);
                      //   break;
                   } else if(symbol instanceof ConstantVar) {
                      ConstantValue otherValue = ((ConstantVar) symbol).getValue();
                      if(!otherValue.equals(value) && !(value instanceof ConstantString) && !(value instanceof ConstantArrayList) && !(value instanceof ConstantArrayFilled) && !(otherValue instanceof ConstantRef)) {
                         aliases.put(constant.getRef(), value);
-                        getLog().append("Inlining constant with different constant siblings "+constant);
-                     //   break;
+                        getLog().append("Inlining constant with different constant siblings " + constant);
+                        //   break;
                      }
                   }
                }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2CullEmptyBlocks.java b/src/main/java/dk/camelot64/kickc/passes/Pass2CullEmptyBlocks.java
index 1f0909556..5ac739f48 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2CullEmptyBlocks.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2CullEmptyBlocks.java
@@ -2,7 +2,10 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /** Pass that culls empty control flow blocks from the program */
 public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
@@ -14,15 +17,15 @@ public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
    @Override
    public boolean step() {
       final List<ControlFlowBlock> remove = new ArrayList<>();
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         if (block.getStatements().isEmpty() && block.getLabel().isIntermediate()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         if(block.getStatements().isEmpty() && block.getLabel().isIntermediate()) {
             remove.add(block);
          }
       }
 
       List<ControlFlowBlock> dontRemove = new ArrayList<>();
 
-      for (final ControlFlowBlock removeBlock : remove) {
+      for(final ControlFlowBlock removeBlock : remove) {
          ControlFlowBlock successor = getGraph().getDefaultSuccessor(removeBlock);
          LabelRef successorRef = successor.getLabel();
          // Replace all jumps (default/conditional/call) to @removeBlock with a jump to the default successor
@@ -32,9 +35,9 @@ public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
          // Do not remove it - because this will result in problems in distinguishing the default successor and
          // the conditional successor when generating the phi-block of the successor
          boolean dontCull = false;
-         for (ControlFlowBlock predecessor : predecessors) {
+         for(ControlFlowBlock predecessor : predecessors) {
             if(successorRef.equals(predecessor.getConditionalSuccessor()) || successorRef.equals(predecessor.getDefaultSuccessor())) {
-               getLog().append("Not culling empty block because it shares successor with its predecessor. "+removeBlock.getLabel().toString(getProgram()));
+               getLog().append("Not culling empty block because it shares successor with its predecessor. " + removeBlock.getLabel().toString(getProgram()));
                dontCull = true;
                dontRemove.add(removeBlock);
             }
@@ -42,16 +45,16 @@ public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
          if(dontCull)
             continue;
 
-         for (ControlFlowBlock predecessor : predecessors) {
+         for(ControlFlowBlock predecessor : predecessors) {
             Map<LabelRef, LabelRef> replace = new LinkedHashMap<>();
             replace.put(removeBlock.getLabel(), successorRef);
-            if (removeBlock.getLabel().equals(predecessor.getDefaultSuccessor())) {
+            if(removeBlock.getLabel().equals(predecessor.getDefaultSuccessor())) {
                predecessor.setDefaultSuccessor(successorRef);
             }
-            if (removeBlock.getLabel().equals(predecessor.getConditionalSuccessor())) {
+            if(removeBlock.getLabel().equals(predecessor.getConditionalSuccessor())) {
                predecessor.setConditionalSuccessor(successorRef);
             }
-            if (removeBlock.getLabel().equals(predecessor.getCallSuccessor())) {
+            if(removeBlock.getLabel().equals(predecessor.getCallSuccessor())) {
                predecessor.setCallSuccessor(successorRef);
             }
             replaceLabels(predecessor, replace);
@@ -60,13 +63,13 @@ public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
          ControlFlowGraphBaseVisitor<Void> phiFixVisitor = new ControlFlowGraphBaseVisitor<Void>() {
             @Override
             public Void visitPhiBlock(StatementPhiBlock phi) {
-               for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-                  for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+               for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+                  for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                      if(phiRValue.getPredecessor().equals(removeBlock.getLabel())) {
                         // Found a phi function referencing the remove block - add copies for each predecessor
                         RValue previousRValue = phiRValue.getrValue();
-                        for (ControlFlowBlock predecessor : predecessors) {
-                           if(phiRValue!=null) {
+                        for(ControlFlowBlock predecessor : predecessors) {
+                           if(phiRValue != null) {
                               phiRValue.setPredecessor(predecessor.getLabel());
                               phiRValue = null;
                            } else {
@@ -88,7 +91,7 @@ public class Pass2CullEmptyBlocks extends Pass2SsaOptimization {
          getLog().append("Culled Empty Block " + removeBlockLabel.toString(getProgram()));
       }
       remove.removeAll(dontRemove);
-      return remove.size()>0;
+      return remove.size() > 0;
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2FixWordConstructors.java b/src/main/java/dk/camelot64/kickc/passes/Pass2FixWordConstructors.java
index 53586fbd2..c6a380505 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2FixWordConstructors.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2FixWordConstructors.java
@@ -8,7 +8,7 @@ import java.util.ListIterator;
  * Identifies word constructors <code>{ b1, b2 }</code> and replaces
  * them with a binary operator <code>word w = b1 w= b2 ;</code>
  */
-public class Pass2FixWordConstructors extends Pass2SsaOptimization{
+public class Pass2FixWordConstructors extends Pass2SsaOptimization {
 
    public Pass2FixWordConstructors(Program program) {
       super(program);
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2RedundantPhiElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass2RedundantPhiElimination.java
index 60c9945aa..06acc62a1 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2RedundantPhiElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2RedundantPhiElimination.java
@@ -2,10 +2,8 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 /** Compiler Pass eliminating redundant phi functions */
 public class Pass2RedundantPhiElimination extends Pass2SsaOptimization {
@@ -22,16 +20,17 @@ public class Pass2RedundantPhiElimination extends Pass2SsaOptimization {
       final Map<VariableRef, RValue> aliases = findRedundantPhis();
       removeAssignments(aliases.keySet());
       replaceVariables(aliases);
-      for (VariableRef var : aliases.keySet()) {
+      for(VariableRef var : aliases.keySet()) {
          RValue alias = aliases.get(var);
          getLog().append("Redundant Phi " + var.toString(getProgram()) + " " + alias.toString(getProgram()));
       }
       deleteSymbols(aliases.keySet());
-      return aliases.size()>0;
+      return aliases.size() > 0;
    }
 
    /**
     * Find phi variables where all previous symbols are identical.
+    *
     * @return Map from (phi) Variable to the previous value
     */
    private Map<VariableRef, RValue> findRedundantPhis() {
@@ -40,11 +39,11 @@ public class Pass2RedundantPhiElimination extends Pass2SsaOptimization {
 
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
                boolean found = true;
                RValue rValue = null;
-               for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                  if(rValue==null) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                  if(rValue == null) {
                      rValue = phiRValue.getrValue();
                   } else {
                      if(!rValue.equals(phiRValue.getrValue())) {
@@ -55,7 +54,9 @@ public class Pass2RedundantPhiElimination extends Pass2SsaOptimization {
                }
                if(found) {
                   VariableRef variable = phiVariable.getVariable();
-                  if(rValue==null) {rValue = LValue.VOID;}
+                  if(rValue == null) {
+                     rValue = LValue.VOID;
+                  }
                   aliases.put(variable, rValue);
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2SelfPhiElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass2SelfPhiElimination.java
index 460a59315..7f7b85cf6 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2SelfPhiElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2SelfPhiElimination.java
@@ -1,10 +1,12 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowGraphBaseVisitor;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.StatementPhiBlock;
 
 import java.util.Iterator;
 
-/** Compiler Pass eliminating phi self assignments  */
+/** Compiler Pass eliminating phi self assignments */
 public class Pass2SelfPhiElimination extends Pass2SsaOptimization {
 
    public Pass2SelfPhiElimination(Program program) {
@@ -20,14 +22,14 @@ public class Pass2SelfPhiElimination extends Pass2SsaOptimization {
       ControlFlowGraphBaseVisitor<Void> visitor = new ControlFlowGraphBaseVisitor<Void>() {
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
                Iterator<StatementPhiBlock.PhiRValue> iterator = phiVariable.getValues().iterator();
-               while (iterator.hasNext()) {
+               while(iterator.hasNext()) {
                   StatementPhiBlock.PhiRValue phiRValue = iterator.next();
-                  if (phiRValue.getrValue().equals(phiVariable.getVariable())) {
+                  if(phiRValue.getrValue().equals(phiVariable.getVariable())) {
                      iterator.remove();
                      optimized[0] = Boolean.TRUE;
-                     getLog().append("Self Phi Eliminated "+phiVariable.getVariable().toString(getProgram()));
+                     getLog().append("Self Phi Eliminated " + phiVariable.getVariable().toString(getProgram()));
                   }
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2SsaOptimization.java b/src/main/java/dk/camelot64/kickc/passes/Pass2SsaOptimization.java
index 50ed67a1d..14c1bb676 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2SsaOptimization.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2SsaOptimization.java
@@ -14,6 +14,21 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
       super(program);
    }
 
+   /**
+    * Get the label to use as replacement for another label.
+    *
+    * @param replacements The label replacement map
+    * @param label The label to find a replacement for
+    * @return The alias to use. Null if no replacement exists.
+    */
+   private static LabelRef getReplacement(Map<LabelRef, LabelRef> replacements, LabelRef label) {
+      LabelRef replacement = replacements.get(label);
+      while(replacements.get(replacement) != null) {
+         replacement = replacements.get(replacement);
+      }
+      return replacement;
+   }
+
    /**
     * Attempt to perform optimization.
     *
@@ -47,7 +62,7 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Void visitConditionalJump(StatementConditionalJump conditionalJump) {
-            if (getReplacement(replacements, conditionalJump.getDestination()) != null) {
+            if(getReplacement(replacements, conditionalJump.getDestination()) != null) {
                conditionalJump.setDestination(getReplacement(replacements, conditionalJump.getDestination()));
             }
             return null;
@@ -55,7 +70,7 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Void visitJump(StatementJump jump) {
-            if (getReplacement(replacements, jump.getDestination()) != null) {
+            if(getReplacement(replacements, jump.getDestination()) != null) {
                jump.setDestination(getReplacement(replacements, jump.getDestination()));
             }
             return null;
@@ -63,9 +78,9 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-               for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                  if (getReplacement(replacements, phiRValue.getPredecessor()) != null) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                  if(getReplacement(replacements, phiRValue.getPredecessor()) != null) {
                      phiRValue.setPredecessor(getReplacement(replacements, phiRValue.getPredecessor()));
                   }
                }
@@ -75,46 +90,30 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
       };
    }
 
-   /**
-    * Get the label to use as replacement for another label.
-    *
-    * @param replacements The label replacement map
-    * @param label        The label to find a replacement for
-    * @return The alias to use. Null if no replacement exists.
-    */
-   private static LabelRef getReplacement(Map<LabelRef, LabelRef> replacements, LabelRef label) {
-      LabelRef replacement = replacements.get(label);
-      while (replacements.get(replacement) != null) {
-         replacement = replacements.get(replacement);
-      }
-      return replacement;
-   }
-
-
    /**
     * Remove all assignments to specific LValues from the control flow graph (as they are no longer needed).
     *
     * @param variables The variables to eliminate
     */
    public void removeAssignments(Collection<? extends LValue> variables) {
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         for (Iterator<Statement> iterator = block.getStatements().iterator(); iterator.hasNext(); ) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         for(Iterator<Statement> iterator = block.getStatements().iterator(); iterator.hasNext(); ) {
             Statement statement = iterator.next();
-            if (statement instanceof StatementAssignment) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
-               if (variables.contains(assignment.getlValue())) {
+               if(variables.contains(assignment.getlValue())) {
                   iterator.remove();
                }
-            } else if (statement instanceof StatementPhiBlock) {
+            } else if(statement instanceof StatementPhiBlock) {
                StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
                Iterator<StatementPhiBlock.PhiVariable> variableIterator = phiBlock.getPhiVariables().iterator();
-               while (variableIterator.hasNext()) {
+               while(variableIterator.hasNext()) {
                   StatementPhiBlock.PhiVariable phiVariable = variableIterator.next();
                   if(variables.contains(phiVariable.getVariable())) {
                      variableIterator.remove();
                   }
                }
-               if(phiBlock.getPhiVariables().size()==0) {
+               if(phiBlock.getPhiVariables().size() == 0) {
                   iterator.remove();
                }
             }
@@ -123,7 +122,7 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
    }
 
    public void deleteSymbols(Collection<? extends SymbolRef> symbols) {
-      for (SymbolRef symbolRef : symbols) {
+      for(SymbolRef symbolRef : symbols) {
          Symbol symbol = getScope().getSymbol(symbolRef.getFullName());
          symbol.getScope().remove(symbol);
       }
@@ -161,8 +160,8 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-               for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                   addUsage(phiRValue.getrValue(), phi);
                }
             }
@@ -170,11 +169,11 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
          }
 
          private void addUsage(RValue rValue, Statement statement) {
-            if (rValue == null) {
+            if(rValue == null) {
                return;
             }
             List<Statement> use = usages.get(rValue);
-            if (use == null) {
+            if(use == null) {
                use = new ArrayList<>();
                usages.put(rValue, use);
             }
@@ -194,7 +193,7 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
             if(rVal instanceof VariableRef) {
                VariableRef var = (VariableRef) rVal;
                Integer usage = usages.get(var);
-               if (usage == null) {
+               if(usage == null) {
                   usage = 0;
                }
                usage = usage + 1;
@@ -223,8 +222,8 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Object visitCall(StatementCall call) {
-            if(call.getParameters()!=null) {
-               for (RValue param : call.getParameters()) {
+            if(call.getParameters() != null) {
+               for(RValue param : call.getParameters()) {
                   addUsage(param);
                }
             }
@@ -233,8 +232,8 @@ public abstract class Pass2SsaOptimization extends Pass1Base {
 
          @Override
          public Void visitPhiBlock(StatementPhiBlock phi) {
-            for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-               for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                   addUsage(phiRValue.getrValue());
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2UnaryNotSimplification.java b/src/main/java/dk/camelot64/kickc/passes/Pass2UnaryNotSimplification.java
index 2c2493d9c..45eab0af0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2UnaryNotSimplification.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2UnaryNotSimplification.java
@@ -32,21 +32,21 @@ public class Pass2UnaryNotSimplification extends Pass2SsaOptimization {
     * Examine all unary nots. If they are the only usage of a reversable unary not getReplacement the unary not with the reversed comparison - and eliminate the riginal variable.
     *
     * @param assignments Assignments to examine
-    * @param usages      All variable usages
+    * @param usages All variable usages
     * @return Unused comparisons (because they have been replaced with reversed comparisions)
     */
    private List<VariableRef> optimizeUnaryNots(final Map<LValue, StatementAssignment> assignments, final Map<VariableRef, Integer> usages) {
 
       final List<VariableRef> unused = new ArrayList<>();
-      for (StatementAssignment assignment : assignments.values()) {
-         if (assignment.getrValue1() == null
+      for(StatementAssignment assignment : assignments.values()) {
+         if(assignment.getrValue1() == null
                && assignment.getOperator() != null
                && ("!".equals(assignment.getOperator().getOperator()) || "not".equals(assignment.getOperator().getOperator()))
                && assignment.getrValue2() instanceof VariableRef
                ) {
             VariableRef tempVar = (VariableRef) assignment.getrValue2();
             StatementAssignment tempAssignment = assignments.get(tempVar);
-            if (usages.get(tempVar) == 1 && tempAssignment.getOperator() != null) {
+            if(usages.get(tempVar) == 1 && tempAssignment.getOperator() != null) {
                switch(tempAssignment.getOperator().getOperator()) {
                   case "<":
                      createInverse(">=", assignment, tempAssignment);
@@ -96,9 +96,9 @@ public class Pass2UnaryNotSimplification extends Pass2SsaOptimization {
     */
    private void createInverse(String newOperator, StatementAssignment assignment, StatementAssignment tempAssignment) {
       assignment.setrValue1(tempAssignment.getrValue1());
-      assignment.setOperator(newOperator==null?null:Operator.getBinary(newOperator));
+      assignment.setOperator(newOperator == null ? null : Operator.getBinary(newOperator));
       assignment.setrValue2(tempAssignment.getrValue2());
-      getLog().append("Inversing boolean not "+assignment.toString(getProgram(), true) +" from "+tempAssignment.toString(getProgram(), true));
+      getLog().append("Inversing boolean not " + assignment.toString(getProgram(), true) + " from " + tempAssignment.toString(getProgram(), true));
    }
 
 
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3AddNopBeforeCallOns.java b/src/main/java/dk/camelot64/kickc/passes/Pass3AddNopBeforeCallOns.java
index c0c4f40bf..f7805b4f9 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3AddNopBeforeCallOns.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3AddNopBeforeCallOns.java
@@ -19,14 +19,14 @@ public class Pass3AddNopBeforeCallOns extends Pass2Base {
     * Create index numbers for all statements in the control flow graph.
     */
    public void generate() {
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
          List<Statement> statements = block.getStatements();
-         if (statements.size() == 0) {
+         if(statements.size() == 0) {
             statements.add(0, new StatementPhiBlock());
             getLog().append("Adding NOP phi() at start of " + block.getLabel());
          } else {
             Statement firstStmt = statements.get(0);
-            if (firstStmt instanceof StatementCall) {
+            if(firstStmt instanceof StatementCall) {
                statements.add(0, new StatementPhiBlock());
                getLog().append("Adding NOP phi() at start of " + block.getLabel());
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3BlockSequencePlanner.java b/src/main/java/dk/camelot64/kickc/passes/Pass3BlockSequencePlanner.java
index 111e70243..f0835d7de 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3BlockSequencePlanner.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3BlockSequencePlanner.java
@@ -11,20 +11,22 @@ import java.util.*;
 public class Pass3BlockSequencePlanner extends Pass2Base {
 
 
+   Deque<ScopeTodo> todoScopes = new ArrayDeque<>();
+
    public Pass3BlockSequencePlanner(Program program) {
       super(program);
    }
 
    public void plan() {
       ControlFlowBlock mainBlock = getGraph().getMainBlock();
-      if (mainBlock != null) {
+      if(mainBlock != null) {
          pushTodo(mainBlock);
       }
       pushTodo(getGraph().getFirstBlock());
       List<LabelRef> sequence = new ArrayList<>();
-      while(hasTodo()){
+      while(hasTodo()) {
          ControlFlowBlock block = popTodo();
-         if(block==null) {
+         if(block == null) {
             break;
          }
          if(sequence.contains(block.getLabel())) {
@@ -32,13 +34,13 @@ public class Pass3BlockSequencePlanner extends Pass2Base {
             continue;
          }
          sequence.add(block.getLabel());
-         if(block.getCallSuccessor()!=null) {
+         if(block.getCallSuccessor() != null) {
             pushTodo(getGraph().getCallSuccessor(block));
          }
-         if(block.getConditionalSuccessor()!=null) {
+         if(block.getConditionalSuccessor() != null) {
             pushTodo(getGraph().getConditionalSuccessor(block));
          }
-         if(getGraph().getDefaultSuccessor(block)!=null) {
+         if(getGraph().getDefaultSuccessor(block) != null) {
             pushTodo(getGraph().getDefaultSuccessor(block));
          }
 
@@ -47,20 +49,17 @@ public class Pass3BlockSequencePlanner extends Pass2Base {
 
       StringBuilder entry = new StringBuilder();
       entry.append("Block Sequence Planned ");
-      for (LabelRef labelRef : sequence) {
+      for(LabelRef labelRef : sequence) {
          entry.append(labelRef.getFullName() + " ");
 
       }
       getLog().append(entry.toString());
    }
 
-
-   Deque<ScopeTodo> todoScopes = new ArrayDeque<>();
-
    void pushTodo(ControlFlowBlock block) {
       LabelRef blockRef = block.getLabel();
       Scope blockScope = getSymbols().getSymbol(blockRef).getScope();
-      for (ScopeTodo todoScope : todoScopes) {
+      for(ScopeTodo todoScope : todoScopes) {
          if(todoScope.scope.equals(blockScope)) {
             todoScope.addTodo(block);
             return;
@@ -70,7 +69,7 @@ public class Pass3BlockSequencePlanner extends Pass2Base {
       todoScopes.push(newScopeTodo);
       newScopeTodo.addTodo(block);
    }
-   
+
    boolean hasTodo() {
       return !todoScopes.isEmpty();
    }
@@ -85,9 +84,9 @@ public class Pass3BlockSequencePlanner extends Pass2Base {
    }
 
    private static class ScopeTodo {
-      
+
       Scope scope;
-      
+
       Stack<ControlFlowBlock> todo;
 
       public ScopeTodo(Scope scope) {
@@ -99,6 +98,6 @@ public class Pass3BlockSequencePlanner extends Pass2Base {
          todo.push(block);
       }
    }
-   
-   
+
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3CallGraphAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3CallGraphAnalysis.java
index c471970fb..49b0bbe33 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3CallGraphAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3CallGraphAnalysis.java
@@ -10,22 +10,6 @@ public class Pass3CallGraphAnalysis extends Pass2Base {
       super(program);
    }
 
-   public void findCallGraph() {
-      CallGraph callGraph = new CallGraph();
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         LabelRef scopeRef = getScopeRef(block, getProgram());
-         for (Statement statement : block.getStatements()) {
-            if(statement instanceof StatementCall) {
-               ProcedureRef procedure = ((StatementCall) statement).getProcedure();
-               LabelRef procedureLabel = procedure.getLabelRef();
-               CallGraph.CallBlock callBlock = callGraph.getOrCreateCallBlock(scopeRef);
-               callBlock.addCall(procedureLabel, (StatementCall) statement);
-            }
-         }
-      }
-      getProgram().setCallGraph(callGraph);
-   }
-
    /**
     * Gets a label reference representing the scope of a block
     *
@@ -37,11 +21,27 @@ public class Pass3CallGraphAnalysis extends Pass2Base {
       LabelRef scopeRef;
       if(blockSymbol instanceof Procedure) {
          scopeRef = ((Procedure) blockSymbol).getRef().getLabelRef();
-      }  else {
+      } else {
          Scope blockScope = blockSymbol.getScope();
          scopeRef = new LabelRef(blockScope.getFullName());
       }
       return scopeRef;
    }
 
+   public void findCallGraph() {
+      CallGraph callGraph = new CallGraph();
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         LabelRef scopeRef = getScopeRef(block, getProgram());
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementCall) {
+               ProcedureRef procedure = ((StatementCall) statement).getProcedure();
+               LabelRef procedureLabel = procedure.getLabelRef();
+               CallGraph.CallBlock callBlock = callGraph.getOrCreateCallBlock(scopeRef);
+               callBlock.addCall(procedureLabel, (StatementCall) statement);
+            }
+         }
+      }
+      getProgram().setCallGraph(callGraph);
+   }
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3DominatorsAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3DominatorsAnalysis.java
index 841f1f049..2e5a8aadc 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3DominatorsAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3DominatorsAnalysis.java
@@ -29,11 +29,11 @@ public class Pass3DominatorsAnalysis extends Pass2Base {
       DominatorsBlock firstDominators = dominatorsGraph.addDominators(firstBlock);
       firstDominators.add(firstBlock);
       List<LabelRef> allBlocks = new ArrayList<>();
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
          allBlocks.add(block.getLabel());
       }
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         if (!block.getLabel().equals(firstBlock)) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         if(!block.getLabel().equals(firstBlock)) {
             DominatorsBlock dominatorsBlock = dominatorsGraph.addDominators(block.getLabel());
             dominatorsBlock.addAll(allBlocks);
          }
@@ -45,25 +45,25 @@ public class Pass3DominatorsAnalysis extends Pass2Base {
       boolean change = false;
       do {
          change = false;
-         for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-            if (!block.getLabel().equals(firstBlock)) {
+         for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+            if(!block.getLabel().equals(firstBlock)) {
                List<ControlFlowBlock> predecessors = getGraph().getPredecessors(block);
                DominatorsBlock newDominators = new DominatorsBlock();
                newDominators.addAll(allBlocks);
-               for (ControlFlowBlock predecessor : predecessors) {
+               for(ControlFlowBlock predecessor : predecessors) {
                   DominatorsBlock predecessorDominators = dominatorsGraph.getDominators(predecessor.getLabel());
                   newDominators.intersect(predecessorDominators);
                }
                newDominators.add(block.getLabel());
                DominatorsBlock currentDominators = dominatorsGraph.getDominators(block.getLabel());
-               if (!currentDominators.equals(newDominators)) {
+               if(!currentDominators.equals(newDominators)) {
                   change = true;
                   dominatorsGraph.setDominators(block.getLabel(), newDominators);
                }
             }
          }
 
-      } while (change);
+      } while(change);
       getProgram().setDominators(dominatorsGraph);
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesAnalysis.java
index bfc866ae2..128748693 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesAnalysis.java
@@ -6,7 +6,10 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 public class Pass3LiveRangesAnalysis extends Pass2Base {
 
@@ -21,11 +24,11 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
          propagating = calculateLiveRanges(liveRanges);
          getProgram().setLiveRangeVariables(liveRanges);
          getLog().append("Propagating live ranges...");
-         if (getLog().isVerboseLiveRanges()) {
+         if(getLog().isVerboseLiveRanges()) {
             getLog().append("CONTROL FLOW GRAPH - LIVE RANGES IN PROGRESS");
             getLog().append(getProgram().getGraph().toString(getProgram()));
          }
-      } while (propagating);
+      } while(propagating);
    }
 
    /**
@@ -35,17 +38,17 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
     * <p>
     * <code>alive(stmt) = used(nextstmt) &cup; alive(nextstmt) &#x2216; defined(nextstmt)</code>
     * <p>
-    *  where
-    *  <ul>
-    *     <li>alive(stmt) is the alive variables of the statement</li>
-    *     <li>used(stmt) is the variables used in the statement</li>
-    *     <li>defined(stmt) is the variables defined by the statement</li>
-    *     <li>nextstmt is the statement following the statement stmt</li>
-    *  </ul>
-    *
-    *  Special consideration is giving when handling statements at the end/start of blocks, as multiple blocks may jump to the same block resulting in multiple stmt/nextstmt pairs.
-    *  Calls to methods are also given special consideration.
-    *  Variables used inside the method must be propagated bak to all callers while variables not used inside the method must skip the method entirely back to the statement before the call.
+    * where
+    * <ul>
+    * <li>alive(stmt) is the alive variables of the statement</li>
+    * <li>used(stmt) is the variables used in the statement</li>
+    * <li>defined(stmt) is the variables defined by the statement</li>
+    * <li>nextstmt is the statement following the statement stmt</li>
+    * </ul>
+    * <p>
+    * Special consideration is giving when handling statements at the end/start of blocks, as multiple blocks may jump to the same block resulting in multiple stmt/nextstmt pairs.
+    * Calls to methods are also given special consideration.
+    * Variables used inside the method must be propagated bak to all callers while variables not used inside the method must skip the method entirely back to the statement before the call.
     *
     * @param liveRanges The live ranges to propagate.
     * @return true if any live ranges was modified. false if no modification was performed (and the propagation is complete)
@@ -53,59 +56,59 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
    private boolean calculateLiveRanges(LiveRangeVariables liveRanges) {
       VariableReferenceInfos referenceInfo = getProgram().getVariableReferenceInfos();
       boolean modified = false;
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement stmt : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement stmt : block.getStatements()) {
             List<VariableRef> aliveNextStmt = liveRanges.getAlive(stmt);
             Collection<VariableRef> definedNextStmt = referenceInfo.getDefinedVars(stmt);
             initLiveRange(liveRanges, definedNextStmt);
             Collection<PreviousStatement> previousStmts = getPreviousStatements(stmt);
-            for (PreviousStatement previousStmt : previousStmts) {
-               if (PreviousStatement.Type.NORMAL.equals(previousStmt.getType())) {
+            for(PreviousStatement previousStmt : previousStmts) {
+               if(PreviousStatement.Type.NORMAL.equals(previousStmt.getType())) {
                   // Add all used variables to the previous statement (taking into account phi from blocks)
                   modified |= initUsedVars(liveRanges, stmt, previousStmt);
                   // Add all vars alive in the next statement
-                  for (VariableRef aliveVar : aliveNextStmt) {
-                     if (!definedNextStmt.contains(aliveVar)) {
+                  for(VariableRef aliveVar : aliveNextStmt) {
+                     if(!definedNextStmt.contains(aliveVar)) {
                         boolean addAlive = liveRanges.addAlive(aliveVar, previousStmt.getStatement());
                         modified |= addAlive;
-                        if (addAlive && getLog().isVerboseLiveRanges()) {
+                        if(addAlive && getLog().isVerboseLiveRanges()) {
                            getLog().append("Propagated alive var " + aliveVar + " to " + previousStmt.getStatement());
                         }
                      }
                   }
-               } else if (PreviousStatement.Type.LAST_IN_METHOD.equals(previousStmt.getType())) {
+               } else if(PreviousStatement.Type.LAST_IN_METHOD.equals(previousStmt.getType())) {
                   // Add all vars that are referenced in the method
                   StatementCall call = (StatementCall) stmt;
                   ProcedureRef procedure = call.getProcedure();
                   Collection<VariableRef> procUsed = referenceInfo.getReferencedVars(procedure.getLabelRef());
                   // The call statement has no used or defined by itself so only work with the alive vars
-                  for (VariableRef aliveVar : aliveNextStmt) {
+                  for(VariableRef aliveVar : aliveNextStmt) {
                      // Add all variables to previous that are not used inside the method
-                     if (procUsed.contains(aliveVar)) {
+                     if(procUsed.contains(aliveVar)) {
                         boolean addUsedVar = liveRanges.addAlive(aliveVar, previousStmt.getStatement());
                         modified |= addUsedVar;
-                        if (addUsedVar && getLog().isVerboseLiveRanges()) {
+                        if(addUsedVar && getLog().isVerboseLiveRanges()) {
                            getLog().append("Propagated alive var used in method into method " + aliveVar + " to " + previousStmt.getStatement());
                         }
                      }
                   }
-               } else if (PreviousStatement.Type.SKIP_METHOD.equals(previousStmt.getType())) {
+               } else if(PreviousStatement.Type.SKIP_METHOD.equals(previousStmt.getType())) {
                   // Add all vars that the method does not use
                   StatementCall call = (StatementCall) stmt;
                   ProcedureRef procedure = call.getProcedure();
                   Collection<VariableRef> procUsed = referenceInfo.getReferencedVars(procedure.getLabelRef());
                   // The call statement has no used or defined by itself so only work with the alive vars
-                  for (VariableRef aliveVar : aliveNextStmt) {
+                  for(VariableRef aliveVar : aliveNextStmt) {
                      // Add all variables to previous that are not used inside the method
-                     if (!procUsed.contains(aliveVar)) {
+                     if(!procUsed.contains(aliveVar)) {
                         boolean addSkipVar = liveRanges.addAlive(aliveVar, previousStmt.getStatement());
                         modified |= addSkipVar;
-                        if (addSkipVar && getLog().isVerboseLiveRanges()) {
+                        if(addSkipVar && getLog().isVerboseLiveRanges()) {
                            getLog().append("Propagated alive var unused in method by skipping call " + aliveVar + " to " + previousStmt.getStatement());
                         }
                      }
                   }
-               } else if (PreviousStatement.Type.BEFORE_METHOD.equals(previousStmt.getType())) {
+               } else if(PreviousStatement.Type.BEFORE_METHOD.equals(previousStmt.getType())) {
                   // Add all used variables to the previous statement (taking into account phi from blocks)
                   modified |= initUsedVars(liveRanges, stmt, previousStmt);
                   // Add all alive variables to previous that are used inside the method
@@ -113,13 +116,13 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
                   Procedure procedure = (Procedure) getProgram().getScope().getSymbol(procBlock.getLabel());
                   Collection<VariableRef> procUsed = referenceInfo.getUsedVars(procedure.getRef().getLabelRef());
                   // The call statement has no used or defined by itself so only work with the alive vars
-                  for (VariableRef aliveVar : aliveNextStmt) {
+                  for(VariableRef aliveVar : aliveNextStmt) {
                      // Add all variables to previous that are used inside the method
-                     if (procUsed.contains(aliveVar)) {
-                        if (!definedNextStmt.contains(aliveVar)) {
+                     if(procUsed.contains(aliveVar)) {
+                        if(!definedNextStmt.contains(aliveVar)) {
                            boolean usedVar = liveRanges.addAlive(aliveVar, previousStmt.getStatement());
                            modified |= usedVar;
-                           if (usedVar && getLog().isVerboseLiveRanges()) {
+                           if(usedVar && getLog().isVerboseLiveRanges()) {
                               getLog().append("Propagated alive used in method out of method " + aliveVar + " to " + previousStmt.getStatement());
                            }
                         }
@@ -150,19 +153,19 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
       boolean modified = false;
       VariableReferenceInfos referenceInfo = getProgram().getVariableReferenceInfos();
       Collection<VariableRef> usedNextStmt = referenceInfo.getUsedVars(stmt);
-      if (stmt instanceof StatementPhiBlock) {
+      if(stmt instanceof StatementPhiBlock) {
          // If current statement is a phi add the used variables to previous based on the phi entries
          StatementPhiBlock phi = (StatementPhiBlock) stmt;
          ControlFlowBlock previousBlock =
                getProgram().getStatementInfos().getBlock(previousStmt.getStatement());
-         for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-               if (phiRValue.getPredecessor().equals(previousBlock.getLabel())) {
-                  if (phiRValue.getrValue() instanceof VariableRef) {
+         for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+               if(phiRValue.getPredecessor().equals(previousBlock.getLabel())) {
+                  if(phiRValue.getrValue() instanceof VariableRef) {
                      VariableRef usedVar = (VariableRef) phiRValue.getrValue();
                      boolean addUsed = liveRanges.addAlive(usedVar, previousStmt.getStatement());
                      modified |= addUsed;
-                     if (addUsed && getLog().isVerboseLiveRanges()) {
+                     if(addUsed && getLog().isVerboseLiveRanges()) {
                         getLog().append("Adding used phi var " + usedVar + " to " + previousStmt.getStatement());
                      }
                   }
@@ -171,10 +174,10 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
          }
       } else {
          // Not a phi block - add used vars to all previous blocks
-         for (VariableRef usedVar : usedNextStmt) {
+         for(VariableRef usedVar : usedNextStmt) {
             boolean addUsed = liveRanges.addAlive(usedVar, previousStmt.getStatement());
             modified |= addUsed;
-            if (addUsed && getLog().isVerboseLiveRanges()) {
+            if(addUsed && getLog().isVerboseLiveRanges()) {
                getLog().append("Adding used var " + usedVar + " to " + previousStmt.getStatement());
             }
          }
@@ -182,7 +185,139 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
       return modified;
    }
 
+   /**
+    * Find the statement(s) executed just before the passed statement.
+    * There may be multiple previous statements if the current statement is the first in a block.
+    *
+    * @param statement The statement to find previous for
+    * @return statement(s) executed just before the passed statement
+    */
+   private Collection<PreviousStatement> getPreviousStatements(Statement statement) {
+      ArrayList<PreviousStatement> previousStatements = new ArrayList<>();
+      // Find the statement(s) just before the current statement (disregarding if the current statement is a call - this will be handled later)
+      Collection<Statement> precedingStatements = getPrecedingStatement(statement);
+      if(statement instanceof StatementCall) {
+         // Add the statement(s) just before the call
+         for(Statement precedingStatement : precedingStatements) {
+            previousStatements.add(new PreviousStatement(precedingStatement, PreviousStatement.Type.SKIP_METHOD));
+         }
+         // Add the last statement of the called method
+         StatementCall call = (StatementCall) statement;
+         ProcedureRef procedure = call.getProcedure();
+         LabelRef procedureReturnBlock = procedure.getReturnBlock();
+         ControlFlowBlock returnBlock = getProgram().getGraph().getBlock(procedureReturnBlock);
+         Collection<Statement> lastStatements = getLastInBlock(returnBlock);
+         for(Statement lastStatement : lastStatements) {
+            previousStatements.add(new PreviousStatement(lastStatement, PreviousStatement.Type.LAST_IN_METHOD));
+         }
+      } else if(precedingStatements.size() > 0) {
+         // The normal situation where the preceding statements are just normal statements executed before the current statement
+         for(Statement precedingStatement : precedingStatements) {
+            previousStatements.add(new PreviousStatement(precedingStatement, PreviousStatement.Type.NORMAL));
+         }
+      } else {
+         // No preceding statements. Examine if this is the first statement in a call.
+         ControlFlowBlock block = getProgram().getStatementInfos().getBlock(statement);
+         if(block.isProcedureEntry(getProgram())) {
+            // Current is first statement of a call - add the statement preceding the call.
+            Collection<CallGraph.CallBlock.Call> callers = getProgram().getCallGraph().getCallers(block.getLabel());
+            for(CallGraph.CallBlock.Call call : callers) {
+               Statement callStmt = getProgram().getStatementInfos().getStatement(call.getCallStatementIdx());
+               Collection<Statement> precedingCallStmt = getPrecedingStatement(callStmt);
+               for(Statement precedingCall : precedingCallStmt) {
+                  previousStatements.add(new PreviousStatement(precedingCall, PreviousStatement.Type.BEFORE_METHOD));
+               }
+            }
+         }
+      }
+      return previousStatements;
+   }
 
+   /**
+    * Ensures that all defined vars have a non-zero live range
+    *
+    * @param liveRanges The live ranges
+    * @param defined The variables to init live ranges for
+    */
+   private void initLiveRange(LiveRangeVariables liveRanges, Collection<VariableRef> defined) {
+      if(defined != null) {
+         for(VariableRef variableRef : defined) {
+            LiveRange lValLiveRange = liveRanges.getLiveRange(variableRef);
+            if(lValLiveRange == null) {
+               liveRanges.addEmptyAlive(variableRef);
+               if(getProgram().getLog().isVerboseLiveRanges()) {
+                  getProgram().getLog().append("Adding empty live range for unused variable " + variableRef);
+               }
+            }
+         }
+      }
+   }
+
+   /**
+    * Gets all statements preceding a statement directly in the code.
+    * This ignores calls and just returns the statement preceding the call.
+    *
+    * @param statement The statement to look for a preceding statement for
+    * @return The preceding statement(s).
+    * Multiple statements are returned if the current statement is the first in a block with multiple predecessor blocks.
+    * Zero statements are returned if the current statement is the first statement in the program or the first statement in a method.
+    */
+   private Collection<Statement> getPrecedingStatement(Statement statement) {
+      Statement previousStmt = null;
+      Statement prev = null;
+      ControlFlowBlock block = getProgram().getStatementInfos().getBlock(statement);
+      List<Statement> statements = block.getStatements();
+      for(Statement stmt : statements) {
+         if(statement.getIndex().equals(stmt.getIndex())) {
+            previousStmt = prev;
+            break;
+         }
+         prev = stmt;
+      }
+      Collection<Statement> previous;
+      if(previousStmt != null) {
+         previous = Arrays.asList(previousStmt);
+      } else {
+         // Current is first in a block - look in predecessor blocks
+         previous = getLastInPredecessors(block);
+      }
+      return previous;
+   }
+
+   /**
+    * Find the last statement(s) of a block. Can trace back through predecessor blocks - but not back through calls.
+    *
+    * @param block The block
+    * @return The last statement(s). May contain multiple statements if the block is empty and has multiple predecessors.
+    * This method never traces back through calls, so the result may also be empty (if the block is an empty method).
+    */
+   private Collection<Statement> getLastInBlock(ControlFlowBlock block) {
+      List<Statement> statements = block.getStatements();
+      if(statements.size() > 0) {
+         return Arrays.asList(statements.get(statements.size() - 1));
+      } else {
+         // Trace back through direct/conditional predecessors (not calls)
+         return getLastInPredecessors(block);
+      }
+   }
+
+   /**
+    * Find the last statement(s) in the predecessors of a block. Can trace back through predecessor blocks - but not back through calls.
+    *
+    * @param block The block
+    * @return The last statement(s). May contain multiple statements if the block is empty and has multiple predecessors.
+    * This method never traces back through calls, so the result may also be empty (if the block is an empty method).
+    */
+   private Collection<Statement> getLastInPredecessors(ControlFlowBlock block) {
+      List<ControlFlowBlock> predecessors = getProgram().getGraph().getPredecessors(block);
+      ArrayList<Statement> last = new ArrayList<>();
+      for(ControlFlowBlock predecessor : predecessors) {
+         if(block.getLabel().equals(predecessor.getDefaultSuccessor()) || block.getLabel().equals(predecessor.getConditionalSuccessor())) {
+            last.addAll(getLastInBlock(predecessor));
+         }
+      }
+      return last;
+   }
 
    /** A statement just before the current statement. */
    private static class PreviousStatement {
@@ -193,20 +328,6 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
       /** The type. */
       private Type type;
 
-      public enum Type {
-         /** The previous statement is executed immediately before the current statement.
-          * It may be in the same block as the current statement or a preceding block if the current statement is the first in a block. */
-         NORMAL,
-         /** The previous statement is the last in a method. The current statement is the call to the method. */
-         LAST_IN_METHOD,
-         /** The previous statement is the statement just before a method. The current statement is the first statement inside the method.
-          * (Used for propagating variables used inside the method back to the calling context)*/
-         BEFORE_METHOD,
-         /** The previous statement is the statement before a call to a method, the current statement is the call
-          * (used for propagating variables that are not not used by the called method to statements before the call)*/
-         SKIP_METHOD
-      }
-
       PreviousStatement(Statement statement, Type type) {
          this.statement = statement;
          this.type = type;
@@ -220,136 +341,26 @@ public class Pass3LiveRangesAnalysis extends Pass2Base {
          return type;
       }
 
-   }
-
-   /**
-    * Find the statement(s) executed just before the passed statement.
-    * There may be multiple previous statements if the current statement is the first in a block.
-    * @param statement The statement to find previous for
-    * @return statement(s) executed just before the passed statement
-    */
-   private Collection<PreviousStatement> getPreviousStatements(Statement statement) {
-      ArrayList<PreviousStatement> previousStatements = new ArrayList<>();
-      // Find the statement(s) just before the current statement (disregarding if the current statement is a call - this will be handled later)
-      Collection<Statement> precedingStatements = getPrecedingStatement(statement);
-      if (statement instanceof StatementCall) {
-         // Add the statement(s) just before the call
-         for (Statement precedingStatement : precedingStatements) {
-            previousStatements.add(new PreviousStatement(precedingStatement, PreviousStatement.Type.SKIP_METHOD));
-         }
-         // Add the last statement of the called method
-         StatementCall call = (StatementCall) statement;
-         ProcedureRef procedure = call.getProcedure();
-         LabelRef procedureReturnBlock = procedure.getReturnBlock();
-         ControlFlowBlock returnBlock = getProgram().getGraph().getBlock(procedureReturnBlock);
-         Collection<Statement> lastStatements = getLastInBlock(returnBlock);
-         for (Statement lastStatement : lastStatements) {
-            previousStatements.add(new PreviousStatement(lastStatement, PreviousStatement.Type.LAST_IN_METHOD));
-         }
-      } else if (precedingStatements.size() > 0) {
-         // The normal situation where the preceding statements are just normal statements executed before the current statement
-         for (Statement precedingStatement : precedingStatements) {
-            previousStatements.add(new PreviousStatement(precedingStatement, PreviousStatement.Type.NORMAL));
-         }
-      } else {
-         // No preceding statements. Examine if this is the first statement in a call.
-         ControlFlowBlock block = getProgram().getStatementInfos().getBlock(statement);
-         if (block.isProcedureEntry(getProgram())) {
-            // Current is first statement of a call - add the statement preceding the call.
-            Collection<CallGraph.CallBlock.Call> callers = getProgram().getCallGraph().getCallers(block.getLabel());
-            for (CallGraph.CallBlock.Call call : callers) {
-               Statement callStmt = getProgram().getStatementInfos().getStatement(call.getCallStatementIdx());
-               Collection<Statement> precedingCallStmt = getPrecedingStatement(callStmt);
-               for (Statement precedingCall : precedingCallStmt) {
-                  previousStatements.add(new PreviousStatement(precedingCall, PreviousStatement.Type.BEFORE_METHOD));
-               }
-            }
-         }
+      public enum Type {
+         /**
+          * The previous statement is executed immediately before the current statement.
+          * It may be in the same block as the current statement or a preceding block if the current statement is the first in a block.
+          */
+         NORMAL,
+         /** The previous statement is the last in a method. The current statement is the call to the method. */
+         LAST_IN_METHOD,
+         /**
+          * The previous statement is the statement just before a method. The current statement is the first statement inside the method.
+          * (Used for propagating variables used inside the method back to the calling context)
+          */
+         BEFORE_METHOD,
+         /**
+          * The previous statement is the statement before a call to a method, the current statement is the call
+          * (used for propagating variables that are not not used by the called method to statements before the call)
+          */
+         SKIP_METHOD
       }
-      return previousStatements;
-   }
 
-   /**
-    * Ensures that all defined vars have a non-zero live range
-    * @param liveRanges The live ranges
-    * @param defined The variables to init live ranges for
-    */
-   private void initLiveRange(LiveRangeVariables liveRanges, Collection<VariableRef> defined) {
-      if (defined != null) {
-         for (VariableRef variableRef : defined) {
-            LiveRange lValLiveRange = liveRanges.getLiveRange(variableRef);
-            if (lValLiveRange == null) {
-               liveRanges.addEmptyAlive(variableRef);
-               if(getProgram().getLog().isVerboseLiveRanges()) {
-                  getProgram().getLog().append("Adding empty live range for unused variable " + variableRef);
-               }
-            }
-         }
-      }
-   }
-
-
-   /**
-    * Gets all statements preceding a statement directly in the code.
-    * This ignores calls and just returns the statement preceding the call.
-    * @param statement The statement to look for a preceding statement for
-    * @return The preceding statement(s).
-    * Multiple statements are returned if the current statement is the first in a block with multiple predecessor blocks.
-    * Zero statements are returned if the current statement is the first statement in the program or the first statement in a method.
-    */
-   private Collection<Statement> getPrecedingStatement(Statement statement) {
-      Statement previousStmt = null;
-      Statement prev = null;
-      ControlFlowBlock block = getProgram().getStatementInfos().getBlock(statement);
-      List<Statement> statements = block.getStatements();
-      for (Statement stmt : statements) {
-         if (statement.getIndex().equals(stmt.getIndex())) {
-            previousStmt = prev;
-            break;
-         }
-         prev = stmt;
-      }
-      Collection<Statement> previous;
-      if (previousStmt != null) {
-         previous = Arrays.asList(previousStmt);
-      } else {
-         // Current is first in a block - look in predecessor blocks
-         previous = getLastInPredecessors(block);
-      }
-      return previous;
-   }
-
-   /**
-    * Find the last statement(s) of a block. Can trace back through predecessor blocks - but not back through calls.
-    * @param block The block
-    * @return The last statement(s). May contain multiple statements if the block is empty and has multiple predecessors.
-    * This method never traces back through calls, so the result may also be empty (if the block is an empty method).
-    */
-   private Collection<Statement> getLastInBlock(ControlFlowBlock block) {
-      List<Statement> statements = block.getStatements();
-      if (statements.size() > 0) {
-         return Arrays.asList(statements.get(statements.size() - 1));
-      } else {
-         // Trace back through direct/conditional predecessors (not calls)
-         return getLastInPredecessors(block);
-      }
-   }
-
-   /**
-    * Find the last statement(s) in the predecessors of a block. Can trace back through predecessor blocks - but not back through calls.
-    * @param block The block
-    * @return The last statement(s). May contain multiple statements if the block is empty and has multiple predecessors.
-    * This method never traces back through calls, so the result may also be empty (if the block is an empty method).
-    */
-   private Collection<Statement> getLastInPredecessors(ControlFlowBlock block) {
-      List<ControlFlowBlock> predecessors = getProgram().getGraph().getPredecessors(block);
-      ArrayList<Statement> last = new ArrayList<>();
-      for (ControlFlowBlock predecessor : predecessors) {
-         if (block.getLabel().equals(predecessor.getDefaultSuccessor()) || block.getLabel().equals(predecessor.getConditionalSuccessor())) {
-            last.addAll(getLastInBlock(predecessor));
-         }
-      }
-      return last;
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesEffectiveAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesEffectiveAnalysis.java
index 5ef8ae596..dc2a7042a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesEffectiveAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3LiveRangesEffectiveAnalysis.java
@@ -42,7 +42,7 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
    private void populateProcedureCallPaths() {
       this.procedureCallPaths = new LinkedHashMap<>();
       Collection<Procedure> procedures = getProgram().getScope().getAllProcedures(true);
-      for (Procedure procedure : procedures) {
+      for(Procedure procedure : procedures) {
          populateProcedureCallPaths(procedure);
       }
    }
@@ -50,18 +50,18 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
    private void populateProcedureCallPaths(Procedure procedure) {
       ProcedureRef procedureRef = procedure.getRef();
       LiveRangeVariablesEffective.CallPaths callPaths = procedureCallPaths.get(procedureRef);
-      if (callPaths == null) {
+      if(callPaths == null) {
          callPaths = new LiveRangeVariablesEffective.CallPaths(procedureRef);
          Collection<CallGraph.CallBlock.Call> callers =
                getProgram().getCallGraph().getCallers(procedure.getLabel().getRef());
-         for (CallGraph.CallBlock.Call caller : callers) {
+         for(CallGraph.CallBlock.Call caller : callers) {
             // Each caller creates its own call-paths
             StatementCall callStatement =
                   (StatementCall) getProgram().getStatementInfos().getStatement(caller.getCallStatementIdx());
             ControlFlowBlock callBlock = getProgram().getStatementInfos().getBlock(callStatement);
             ScopeRef callScopeRef = callBlock.getScope();
             Scope callScope = getProgram().getScope().getScope(callScopeRef);
-            if (callScope instanceof Procedure) {
+            if(callScope instanceof Procedure) {
                // Found calling procedure!
                Procedure callerProcedure = (Procedure) callScope;
                // Make sure we have populated the call-paths of the calling procedure
@@ -70,7 +70,7 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
                Collection<VariableRef> referencedInCaller = referenceInfo.getReferencedVars(callerProcedure.getRef().getLabelRef());
                // For each caller path - create a new call-path
                LiveRangeVariablesEffective.CallPaths callerPaths = procedureCallPaths.get(callerProcedure.getRef());
-               for (LiveRangeVariablesEffective.CallPath callerPath : callerPaths.getCallPaths()) {
+               for(LiveRangeVariablesEffective.CallPath callerPath : callerPaths.getCallPaths()) {
                   ArrayList<CallGraph.CallBlock.Call> path = new ArrayList<>(callerPath.getPath());
                   path.add(caller);
                   Collection<VariableRef> alive = new LinkedHashSet<>();
@@ -101,6 +101,7 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
 
    /**
     * Find aliases defined when taking a specific call - meaning call parameters that have specific values when taking the specific call.
+    *
     * @param procedure The called procedure
     * @param callBlock The block performing the call
     * @return Aliases defined by the specific call.
@@ -113,16 +114,16 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
       }
       Pass2AliasElimination.Aliases aliases = new Pass2AliasElimination.Aliases();
       // Find aliases inside the phi-block of the called method
-      if(procedurePhiBlock!=null) {
-         for (StatementPhiBlock.PhiVariable phiVariable : procedurePhiBlock.getPhiVariables()) {
+      if(procedurePhiBlock != null) {
+         for(StatementPhiBlock.PhiVariable phiVariable : procedurePhiBlock.getPhiVariables()) {
             RValue phiRvalue = phiVariable.getrValue(callBlock.getLabel());
-            if (phiRvalue instanceof VariableRef) {
+            if(phiRvalue instanceof VariableRef) {
                aliases.add(phiVariable.getVariable(), (VariableRef) phiRvalue);
             }
          }
       }
       // Find call parameter aliases in the calling block before the call
-      for (Statement statement : callBlock.getStatements()) {
+      for(Statement statement : callBlock.getStatements()) {
          if(statement instanceof StatementAssignment) {
             StatementAssignment assignment = (StatementAssignment) statement;
             LValue lValue = assignment.getlValue();
@@ -130,7 +131,7 @@ public class Pass3LiveRangesEffectiveAnalysis extends Pass2Base {
                Variable lValueVar = getProgram().getScope().getVariable((VariableRef) lValue);
                if(lValueVar.getScope().equals(procedure)) {
                   // Assigning into the procedure scope
-                  if(assignment.getrValue1()==null && assignment.getOperator()==null && assignment.getrValue2() instanceof VariableRef) {
+                  if(assignment.getrValue1() == null && assignment.getOperator() == null && assignment.getrValue2() instanceof VariableRef) {
                      aliases.add((VariableRef) lValue, (VariableRef) assignment.getrValue2());
                   }
                }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3LoopAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3LoopAnalysis.java
index 53cee536f..7c29912b8 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3LoopAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3LoopAnalysis.java
@@ -28,20 +28,20 @@ public class Pass3LoopAnalysis extends Pass2Base {
 
       // Look through graph for natural loop back edges
       NaturalLoopSet loopSet = new NaturalLoopSet();
-      for (ControlFlowBlock block : blocks) {
+      for(ControlFlowBlock block : blocks) {
          DominatorsBlock blockDominators = dominators.getDominators(block.getLabel());
-         for (LabelRef successor : block.getSuccessors()) {
-            if (blockDominators.contains(successor)) {
+         for(LabelRef successor : block.getSuccessors()) {
+            if(blockDominators.contains(successor)) {
                // Found a loop back edge!
                NaturalLoop loop = new NaturalLoop(successor, block.getLabel());
-               getLog().append("Found back edge: "+loop.toString());
+               getLog().append("Found back edge: " + loop.toString());
                loopSet.addLoop(loop);
             }
          }
       }
 
       // Find all blocks for each loop
-      for (NaturalLoop loop : loopSet.getLoops()) {
+      for(NaturalLoop loop : loopSet.getLoops()) {
          Deque<LabelRef> todo = new ArrayDeque<>();
          Set<LabelRef> loopBlocks = new LinkedHashSet<>();
          todo.addAll(loop.getTails());
@@ -53,20 +53,20 @@ public class Pass3LoopAnalysis extends Pass2Base {
             }
             ControlFlowBlock controlFlowBlock = getGraph().getBlock(block);
             List<ControlFlowBlock> predecessors = getGraph().getPredecessors(controlFlowBlock);
-            for (ControlFlowBlock predecessor : predecessors) {
+            for(ControlFlowBlock predecessor : predecessors) {
                if(!loopBlocks.contains(predecessor.getLabel()) && !todo.contains(predecessor.getLabel())) {
                   todo.add(predecessor.getLabel());
                }
             }
          }
          loop.setBlocks(loopBlocks);
-         getLog().append("Populated: "+loop.toString());
+         getLog().append("Populated: " + loop.toString());
       }
 
       // Coalesce loops that are neither nested, nor disjoint
-      for (NaturalLoop loop : loopSet.getLoops()) {
+      for(NaturalLoop loop : loopSet.getLoops()) {
          Set<NaturalLoop> headLoops = loopSet.getLoopsFromHead(loop.getHead());
-         for (NaturalLoop other : headLoops) {
+         for(NaturalLoop other : headLoops) {
             if(other.equals(loop)) {
                // Same loop - do not process
                continue;
@@ -78,7 +78,7 @@ public class Pass3LoopAnalysis extends Pass2Base {
                loop.addTails(other.getTails());
                loop.addBlocks(other.getBlocks());
                loopSet.remove(other);
-               getLog().append("Coalesced: "+loop.toString()) ;
+               getLog().append("Coalesced: " + loop.toString());
             }
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3LoopDepthAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3LoopDepthAnalysis.java
index 4f7376271..21dcba8ee 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3LoopDepthAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3LoopDepthAnalysis.java
@@ -31,24 +31,24 @@ public class Pass3LoopDepthAnalysis extends Pass2Base {
          CallGraph.CallBlock currentCallBlock = callGraph.getOrCreateCallBlock(currentScope);
          // Add called sub blocks for later processing
          Collection<LabelRef> subBlocks = currentCallBlock.getCalledBlocks();
-         for (LabelRef subBlock : subBlocks) {
-            if (!done.contains(subBlock) && !todo.contains(subBlock)) {
+         for(LabelRef subBlock : subBlocks) {
+            if(!done.contains(subBlock) && !todo.contains(subBlock)) {
                todo.add(subBlock);
             }
          }
          // Find the scope blocks calling the current scope block - and the loop depth of the blocks where the call statement is
          int callingDepth = 1;
          Collection<LabelRef> callingScopes = callGraph.getCallingBlocks(currentScope);
-         for (LabelRef callingScope : callingScopes) {
+         for(LabelRef callingScope : callingScopes) {
             CallGraph.CallBlock callingBlock = callGraph.getOrCreateCallBlock(callingScope);
             Collection<CallGraph.CallBlock.Call> calls = callingBlock.getCalls(currentScope);
-            for (CallGraph.CallBlock.Call call : calls) {
+            for(CallGraph.CallBlock.Call call : calls) {
                int callStatementIdx = call.getCallStatementIdx();
                ControlFlowBlock callingControlBlock = getProgram().getStatementInfos().getBlock(callStatementIdx);
                Collection<NaturalLoop> callingLoops = loopSet.getLoopsContainingBlock(callingControlBlock.getLabel());
-               for (NaturalLoop callingLoop : callingLoops) {
-                  int potentialDepth = callingLoop.getDepth()+1;
-                  if(potentialDepth >callingDepth) {
+               for(NaturalLoop callingLoop : callingLoops) {
+                  int potentialDepth = callingLoop.getDepth() + 1;
+                  if(potentialDepth > callingDepth) {
                      callingDepth = potentialDepth;
                   }
                }
@@ -62,7 +62,7 @@ public class Pass3LoopDepthAnalysis extends Pass2Base {
       NaturalLoopSet loopSet = getProgram().getLoopSet();
       // Find loops in the current scope block
       List<NaturalLoop> currentScopeLoops = new ArrayList<>();
-      for (NaturalLoop loop : loopSet.getLoops()) {
+      for(NaturalLoop loop : loopSet.getLoops()) {
          LabelRef loopHead = loop.getHead();
          ControlFlowBlock loopHeadBlock = getGraph().getBlock(loopHead);
          LabelRef scopeRef = Pass3CallGraphAnalysis.getScopeRef(loopHeadBlock, getProgram());
@@ -72,9 +72,9 @@ public class Pass3LoopDepthAnalysis extends Pass2Base {
          }
       }
 
-      getLog().append("Found "+currentScopeLoops.size()+" loops in scope ["+currentScope.toString()+"]");
-      for (NaturalLoop loop : currentScopeLoops) {
-         getLog().append("  "+loop.toString());
+      getLog().append("Found " + currentScopeLoops.size() + " loops in scope [" + currentScope.toString() + "]");
+      for(NaturalLoop loop : currentScopeLoops) {
+         getLog().append("  " + loop.toString());
       }
 
       // Find loop nesting depths in current scope loops
@@ -86,7 +86,7 @@ public class Pass3LoopDepthAnalysis extends Pass2Base {
          todo.removeFirst();
          // Does any unprocessed loop nest this one?
          boolean postpone = false;
-         for (NaturalLoop otherLoop : todo) {
+         for(NaturalLoop otherLoop : todo) {
             if(otherLoop.nests(loop)) {
                // postpone this loop and move on
                postpone = true;
@@ -99,10 +99,10 @@ public class Pass3LoopDepthAnalysis extends Pass2Base {
          }
          int depth = initialDepth;
          // Does any already processed loop nest this one?
-         for (NaturalLoop otherLoop : done) {
+         for(NaturalLoop otherLoop : done) {
             if(otherLoop.nests(loop)) {
-               int potentialDepth = otherLoop.getDepth()+1;
-               if(potentialDepth>depth) {
+               int potentialDepth = otherLoop.getDepth() + 1;
+               if(potentialDepth > depth) {
                   depth = potentialDepth;
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3PhiLifting.java b/src/main/java/dk/camelot64/kickc/passes/Pass3PhiLifting.java
index d8eb15a98..a0e1d7861 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3PhiLifting.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3PhiLifting.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 /**
  * Perform PhiLifting to greatly reduce overlapping of alive intervals for variables.
- *
+ * <p>
  * After phi lifting it is guaranteed that variables in different phi blocks are in different live range equivalence classes.
  * <p>
  * PhiLifting introduces a large number of new virtual variables (one for each rvalue in phi-functions).
@@ -29,14 +29,14 @@ public class Pass3PhiLifting {
       ControlFlowGraph graph = program.getGraph();
       ProgramScope programScope = program.getScope();
       Collection<ControlFlowBlock> blocks = graph.getAllBlocks();
-      for (ControlFlowBlock block : blocks) {
+      for(ControlFlowBlock block : blocks) {
          // Maps old predecessors to new blocks created
          Map<LabelRef, LabelRef> newBlocks = new HashMap<>();
-         if (block.hasPhiBlock()) {
+         if(block.hasPhiBlock()) {
             StatementPhiBlock phiBlock = block.getPhiBlock();
-            for (StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
-               for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                  if (!(phiRValue.getrValue() instanceof ConstantValue)) {
+            for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
+               for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                  if(!(phiRValue.getrValue() instanceof ConstantValue)) {
                      LabelRef predecessorRef = phiRValue.getPredecessor();
                      ControlFlowBlock predecessorBlock = graph.getBlock(predecessorRef);
                      VariableRef rValVarRef = (VariableRef) phiRValue.getrValue();
@@ -45,7 +45,7 @@ public class Pass3PhiLifting {
                         Variable lValVar = program.getScope().getVariable(phiVariable.getVariable());
                         newVar = ((VariableVersion) lValVar).getVersionOf().createVersion();
                      } else {
-                        throw new RuntimeException("Only versions! "+phiVariable.getVariable());
+                        throw new RuntimeException("Only versions! " + phiVariable.getVariable());
                         //   Symbol predecessorSymbol = programScope.getSymbol(predecessorRef);
                         //   newVar = predecessorSymbol.getScope().addVariableIntermediate();
                      }
@@ -62,15 +62,15 @@ public class Pass3PhiLifting {
                      newVar.setInferredType(true);
                      List<Statement> predecessorStatements = predecessorBlock.getStatements();
                      Statement lastPredecessorStatement = null;
-                     if(predecessorStatements.size()>0) {
+                     if(predecessorStatements.size() > 0) {
                         lastPredecessorStatement = predecessorStatements.get(predecessorStatements.size() - 1);
                      }
                      StatementAssignment newAssignment = new StatementAssignment(newVar, phiRValue.getrValue());
-                     if (lastPredecessorStatement instanceof StatementConditionalJump) {
+                     if(lastPredecessorStatement instanceof StatementConditionalJump) {
                         // Use or Create a new block between the predecessor and this one - getReplacement labels where appropriate
                         ControlFlowBlock newBlock;
                         LabelRef newBlockRef = newBlocks.get(predecessorRef);
-                        if(newBlockRef==null) {
+                        if(newBlockRef == null) {
                            // Create new block
                            LabelRef currentBlockLabel = block.getLabel();
                            Scope currentScope = programScope.getSymbol(currentBlockLabel).getScope();
@@ -88,8 +88,8 @@ public class Pass3PhiLifting {
                            if(block.getLabel().equals(predecessorBlock.getDefaultSuccessor())) {
                               predecessorBlock.setDefaultSuccessor(newBlock.getLabel());
                            }
-                           program.getLog().append("Added new block during phi lifting "+newBlock.getLabel() + "(between "+predecessorRef+" and "+block.getLabel()+")");
-                        }  else {
+                           program.getLog().append("Added new block during phi lifting " + newBlock.getLabel() + "(between " + predecessorRef + " and " + block.getLabel() + ")");
+                        } else {
                            newBlock = graph.getBlock(newBlockRef);
                         }
                         List<Statement> newBlockStatements = newBlock.getStatements();
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3PhiMemCoalesce.java b/src/main/java/dk/camelot64/kickc/passes/Pass3PhiMemCoalesce.java
index a544de24e..415becf14 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3PhiMemCoalesce.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3PhiMemCoalesce.java
@@ -18,7 +18,6 @@ import java.util.Map;
  * (ie. those variables crossing non-trivial block transitions).
  * <p>
  * See http://compilers.cs.ucla.edu/fernando/projects/soc/reports/short_tech.pdf
- *
  */
 public class Pass3PhiMemCoalesce extends Pass2SsaOptimization {
 
@@ -41,6 +40,40 @@ public class Pass3PhiMemCoalesce extends Pass2SsaOptimization {
       return false;
    }
 
+   /**
+    * Creates initial live range equivalence classes from program phi statements.
+    */
+   public static class EquivalenceClassPhiInitializer extends ControlFlowGraphBaseVisitor<Void> {
+
+      private LiveRangeEquivalenceClassSet phiEquivalenceClasses;
+
+      public EquivalenceClassPhiInitializer(Program program) {
+         this.phiEquivalenceClasses = new LiveRangeEquivalenceClassSet(program);
+      }
+
+      @Override
+      public Void visitPhiBlock(StatementPhiBlock phi) {
+         for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            VariableRef variable = phiVariable.getVariable();
+            LiveRangeEquivalenceClass equivalenceClass = phiEquivalenceClasses.getOrCreateEquivalenceClass(variable);
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+               if(!(phiRValue.getrValue() instanceof ConstantValue)) {
+                  VariableRef phiRVar = (VariableRef) phiRValue.getrValue();
+                  LiveRangeEquivalenceClass rValEquivalenceClass = phiEquivalenceClasses.getOrCreateEquivalenceClass(phiRVar);
+                  if(!rValEquivalenceClass.equals(equivalenceClass)) {
+                     phiEquivalenceClasses.consolidate(equivalenceClass, rValEquivalenceClass);
+                  }
+               }
+            }
+         }
+         return null;
+      }
+
+      public LiveRangeEquivalenceClassSet getPhiEquivalenceClasses() {
+         return phiEquivalenceClasses;
+      }
+   }
+
    /** Coalesces phi equivalence classes when they do not overlap based on assignments to variables in phi statements. */
    private class PhiMemCoalescer extends ControlFlowGraphBaseVisitor<Void> {
 
@@ -64,18 +97,18 @@ public class Pass3PhiMemCoalesce extends Pass2SsaOptimization {
 
       @Override
       public Void visitAssignment(StatementAssignment assignment) {
-         if (assignment.getlValue() instanceof VariableRef) {
+         if(assignment.getlValue() instanceof VariableRef) {
             LiveRangeEquivalenceClass lValEquivalenceClass =
                   phiEquivalenceClassSet.getEquivalenceClass((VariableRef) assignment.getlValue());
-            if (lValEquivalenceClass != null && assignment.getOperator() == null && assignment.getrValue1() == null && assignment.getrValue2() instanceof VariableRef) {
+            if(lValEquivalenceClass != null && assignment.getOperator() == null && assignment.getrValue1() == null && assignment.getrValue2() instanceof VariableRef) {
                // Found copy assignment to a variable in an equivalence class - attempt to coalesce
                VariableRef assignVar = (VariableRef) assignment.getrValue2();
                LiveRangeEquivalenceClass assignVarEquivalenceClass = phiEquivalenceClassSet.getOrCreateEquivalenceClass(assignVar);
-               if (lValEquivalenceClass.equals(assignVarEquivalenceClass)) {
+               if(lValEquivalenceClass.equals(assignVarEquivalenceClass)) {
                   remove.add((VariableRef) assignment.getlValue());
                   replace.put((VariableRef) assignment.getlValue(), assignVar);
                   getLog().append("Coalesced (already) " + assignment);
-               } else if (!lValEquivalenceClass.getLiveRange().overlaps(assignVarEquivalenceClass.getLiveRange())) {
+               } else if(!lValEquivalenceClass.getLiveRange().overlaps(assignVarEquivalenceClass.getLiveRange())) {
                   phiEquivalenceClassSet.consolidate(lValEquivalenceClass, assignVarEquivalenceClass);
                   remove.add((VariableRef) assignment.getlValue());
                   replace.put((VariableRef) assignment.getlValue(), assignVar);
@@ -90,38 +123,4 @@ public class Pass3PhiMemCoalesce extends Pass2SsaOptimization {
 
    }
 
-   /**
-    * Creates initial live range equivalence classes from program phi statements.
-    */
-   public static class EquivalenceClassPhiInitializer extends ControlFlowGraphBaseVisitor<Void> {
-
-      private LiveRangeEquivalenceClassSet phiEquivalenceClasses;
-
-      public EquivalenceClassPhiInitializer(Program program) {
-         this.phiEquivalenceClasses = new LiveRangeEquivalenceClassSet(program);
-      }
-
-      @Override
-      public Void visitPhiBlock(StatementPhiBlock phi) {
-         for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-            VariableRef variable = phiVariable.getVariable();
-            LiveRangeEquivalenceClass equivalenceClass = phiEquivalenceClasses.getOrCreateEquivalenceClass(variable);
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-               if (!(phiRValue.getrValue() instanceof ConstantValue)) {
-                  VariableRef phiRVar = (VariableRef) phiRValue.getrValue();
-                  LiveRangeEquivalenceClass rValEquivalenceClass = phiEquivalenceClasses.getOrCreateEquivalenceClass(phiRVar);
-                  if(!rValEquivalenceClass.equals(equivalenceClass)) {
-                     phiEquivalenceClasses.consolidate(equivalenceClass, rValEquivalenceClass);
-                  }
-               }
-            }
-         }
-         return null;
-      }
-
-      public LiveRangeEquivalenceClassSet getPhiEquivalenceClasses() {
-         return phiEquivalenceClasses;
-      }
-   }
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3StatementInfos.java b/src/main/java/dk/camelot64/kickc/passes/Pass3StatementInfos.java
index 684a78ff2..69ac1a3b2 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3StatementInfos.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3StatementInfos.java
@@ -20,8 +20,8 @@ public class Pass3StatementInfos extends Pass2Base {
    public void generateStatementInfos() {
       LinkedHashMap<Integer, LabelRef> stmtBlocks = new LinkedHashMap<>();
       LinkedHashMap<Integer, Statement> stmtIdx = new LinkedHashMap<>();
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             stmtBlocks.put(statement.getIndex(), block.getLabel());
             stmtIdx.put(statement.getIndex(), statement);
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3SymbolInfos.java b/src/main/java/dk/camelot64/kickc/passes/Pass3SymbolInfos.java
index ee339bcf0..97c261d6d 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3SymbolInfos.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3SymbolInfos.java
@@ -25,7 +25,7 @@ public class Pass3SymbolInfos extends Pass2Base {
    }
 
    private void generateCache(LinkedHashMap<SymbolRef, Symbol> symbolCache, Scope scope) {
-      for (Symbol symbol : scope.getAllSymbols()) {
+      for(Symbol symbol : scope.getAllSymbols()) {
          symbolCache.put(symbol.getRef(), symbol);
          if(symbol instanceof Scope) {
             generateCache(symbolCache, (Scope) symbol);
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass3VariableRegisterWeightAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass3VariableRegisterWeightAnalysis.java
index 8a9822714..a0d5bb5c8 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass3VariableRegisterWeightAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass3VariableRegisterWeightAnalysis.java
@@ -30,30 +30,30 @@ public class Pass3VariableRegisterWeightAnalysis extends Pass2Base {
       loopSet = getProgram().getLoopSet();
       liveRangeVariables = getProgram().getLiveRangeVariables();
 
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (statement instanceof StatementPhiBlock) {
-               for (StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(statement instanceof StatementPhiBlock) {
+               for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
                   // Add weights for the definition of the phi variable
                   VariableRef philVariable = phiVariable.getVariable();
-                  for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-                     if (phiRValue.getrValue() instanceof VariableRef) {
+                  for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                     if(phiRValue.getrValue() instanceof VariableRef) {
                         double w = addWeight(philVariable, phiRValue.getPredecessor());
                         //log.append("Definition of " + philVariable + " w+:" + w + " - [" + statement.getIndex()+"]");
                      }
                   }
                   // Add weights for each usage of a variable
-                  for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+                  for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
                      addUsageWeightRValue(phiRValue.getrValue(), statement, phiRValue.getPredecessor());
                   }
                }
-            } else if (statement instanceof StatementAssignment) {
+            } else if(statement instanceof StatementAssignment) {
                // Add weights for the definition of the variable
                addUsageWeightRValue(((StatementAssignment) statement).getlValue(), statement, block.getLabel());
                // Add weights for each usage of variables
                addUsageWeightRValue(((StatementAssignment) statement).getrValue1(), statement, block.getLabel());
                addUsageWeightRValue(((StatementAssignment) statement).getrValue2(), statement, block.getLabel());
-            } else if (statement instanceof StatementConditionalJump) {
+            } else if(statement instanceof StatementConditionalJump) {
                // Add weights for each usage of variables
                addUsageWeightRValue(((StatementConditionalJump) statement).getrValue1(), statement, block.getLabel());
                addUsageWeightRValue(((StatementConditionalJump) statement).getrValue2(), statement, block.getLabel());
@@ -66,7 +66,7 @@ public class Pass3VariableRegisterWeightAnalysis extends Pass2Base {
    }
 
    private void addUsageWeightRValue(Value rValue, Statement statement, LabelRef block) {
-      if (rValue instanceof VariableRef) {
+      if(rValue instanceof VariableRef) {
          double w = addWeight((VariableRef) rValue, block);
          //log.append("Usage of " + rValue + " w+:" + w + " - [" + statement.getIndex()+"]");
       } else if(rValue instanceof PointerDereferenceSimple) {
@@ -83,11 +83,11 @@ public class Pass3VariableRegisterWeightAnalysis extends Pass2Base {
       double w = 1.0 + Math.pow(10.0, depth);
       LiveRange liveRange = liveRangeVariables.getLiveRange(variable);
       double s = liveRange.size();
-      if(s<0.01) {
+      if(s < 0.01) {
          s = 0.1;
       }
-      variableRegisterWeights.addWeight(variable, w/s);
-      return w/s;
+      variableRegisterWeights.addWeight(variable, w / s);
+      return w / s;
    }
 
 
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4AssertNoCpuClobber.java b/src/main/java/dk/camelot64/kickc/passes/Pass4AssertNoCpuClobber.java
index e8804fcb6..0e81f846c 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4AssertNoCpuClobber.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4AssertNoCpuClobber.java
@@ -1,11 +1,13 @@
 package dk.camelot64.kickc.passes;
 
+import dk.camelot64.kickc.asm.AsmClobber;
 import dk.camelot64.kickc.asm.AsmProgram;
 import dk.camelot64.kickc.asm.AsmSegment;
-import dk.camelot64.kickc.asm.AsmClobber;
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /*** Ensures that no statement clobbers a CPU register used by an alive variable - and that assigning statements clobber the CPU registers they assign to */
 public class Pass4AssertNoCpuClobber extends Pass2Base {
@@ -14,11 +16,31 @@ public class Pass4AssertNoCpuClobber extends Pass2Base {
       super(program);
    }
 
+   /**
+    * Get all CPU registers clobbered by the ASM generated from a specific statement in the program
+    *
+    * @param clobber The clobber
+    * @return The clobbered CPU registers
+    */
+   public static Collection<Registers.Register> getClobberRegisters(AsmClobber clobber) {
+      List<Registers.Register> clobberRegisters = new ArrayList<>();
+      if(clobber.isClobberA()) {
+         clobberRegisters.add(Registers.getRegisterA());
+      }
+      if(clobber.isClobberX()) {
+         clobberRegisters.add(Registers.getRegisterX());
+      }
+      if(clobber.isClobberY()) {
+         clobberRegisters.add(Registers.getRegisterY());
+      }
+      return clobberRegisters;
+   }
+
    /**
     * Check that no statement clobbers a CPU register used by an alive variable
     */
    public void check() {
-      if (hasClobberProblem(true)) {
+      if(hasClobberProblem(true)) {
          throw new RuntimeException("CLOBBER ERROR! See log for more info.");
       }
    }
@@ -31,8 +53,8 @@ public class Pass4AssertNoCpuClobber extends Pass2Base {
    public boolean hasClobberProblem(boolean verbose) {
       AsmProgram asm = getProgram().getAsm();
       boolean clobberProblem = false;
-      for (AsmSegment asmSegment : asm.getSegments()) {
-         if (asmSegment.getStatementIdx() != null) {
+      for(AsmSegment asmSegment : asm.getSegments()) {
+         if(asmSegment.getStatementIdx() != null) {
             // Find the ICL statement
             int statementIdx = asmSegment.getStatementIdx();
             Statement statement = getProgram().getStatementInfos().getStatement(statementIdx);
@@ -46,15 +68,15 @@ public class Pass4AssertNoCpuClobber extends Pass2Base {
             List<VariableRef> aliveVars = new ArrayList<>(getProgram().getLiveRangeVariablesEffective().getAliveEffective(statement));
 
             // If the segment is an assignment in a phi transition, examine the later phi transition assignments and update alive variables alive and variables assigned
-            if(asmSegment.getPhiTransitionId()!=null && asmSegment.getPhiTransitionAssignmentIdx()!=null) {
+            if(asmSegment.getPhiTransitionId() != null && asmSegment.getPhiTransitionAssignmentIdx() != null) {
                String phiTransitionId = asmSegment.getPhiTransitionId();
                int transitionAssignmentIdx = asmSegment.getPhiTransitionAssignmentIdx();
                ControlFlowBlock statementBlock = getProgram().getStatementInfos().getBlock(statementIdx);
                PhiTransitions phiTransitions = new PhiTransitions(getProgram(), statementBlock);
                PhiTransitions.PhiTransition phiTransition = phiTransitions.getTransition(phiTransitionId);
-               for (PhiTransitions.PhiTransition.PhiAssignment phiAssignment : phiTransition.getAssignments()) {
+               for(PhiTransitions.PhiTransition.PhiAssignment phiAssignment : phiTransition.getAssignments()) {
                   // IF the assignment is later than the current one
-                  if(phiAssignment.getAssignmentIdx()>transitionAssignmentIdx) {
+                  if(phiAssignment.getAssignmentIdx() > transitionAssignmentIdx) {
                      RValue rValue = phiAssignment.getrValue();
                      Collection<VariableRef> alive = VariableReferenceInfos.getReferencedVars(rValue);
                      aliveVars.addAll(alive);
@@ -66,20 +88,20 @@ public class Pass4AssertNoCpuClobber extends Pass2Base {
             }
 
             // Non-assigned alive variables must not be clobbered
-            for (VariableRef aliveVar : aliveVars) {
+            for(VariableRef aliveVar : aliveVars) {
                Variable variable = getProgram().getSymbolInfos().getVariable(aliveVar);
                Registers.Register aliveVarRegister = variable.getAllocation();
-               if (aliveVarRegister.isZp()) {
+               if(aliveVarRegister.isZp()) {
                   // No need to check a zp-register - here we are only interested in CPU registers
                   continue;
                }
-               if (assignedVars.contains(aliveVar)) {
+               if(assignedVars.contains(aliveVar)) {
                   // No need to register that is assigned by the statement - it will be clobbered
                   continue;
                }
                // Alive and not assigned to - clobber not allowed!
-               if (clobberRegisters.contains(aliveVarRegister)) {
-                  if (verbose) {
+               if(clobberRegisters.contains(aliveVarRegister)) {
+                  if(verbose) {
                      getLog().append("Error! Alive variable " + aliveVar + " register " + aliveVarRegister + " clobbered by the ASM generated by statement " + statement);
                   }
                   clobberProblem = true;
@@ -93,24 +115,4 @@ public class Pass4AssertNoCpuClobber extends Pass2Base {
       return clobberProblem;
    }
 
-   /**
-    * Get all CPU registers clobbered by the ASM generated from a specific statement in the program
-    *
-    * @param clobber The clobber
-    * @return The clobbered CPU registers
-    */
-   public static Collection<Registers.Register> getClobberRegisters(AsmClobber clobber) {
-      List<Registers.Register> clobberRegisters = new ArrayList<>();
-      if (clobber.isClobberA()) {
-         clobberRegisters.add(Registers.getRegisterA());
-      }
-      if (clobber.isClobberX()) {
-         clobberRegisters.add(Registers.getRegisterX());
-      }
-      if (clobber.isClobberY()) {
-         clobberRegisters.add(Registers.getRegisterY());
-      }
-      return clobberRegisters;
-   }
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java
index 4bc5edf2d..20636df49 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java
@@ -11,10 +11,15 @@ import java.util.*;
  */
 public class Pass4CodeGeneration {
 
-   private Program program;
-
    /** Should the generated ASM contain verbose alive info for the statements (costs a bit more to generate). */
    boolean verboseAliveInfo;
+   private Program program;
+   /**
+    * Keeps track of the phi transitions into blocks during code generation.
+    * Used to ensure that duplicate transitions are only code generated once.
+    * Maps to-blocks to the transition information for the block
+    */
+   private Map<ControlFlowBlock, PhiTransitions> blockTransitions = new LinkedHashMap<>();
 
    public Pass4CodeGeneration(Program program, boolean verboseAliveInfo) {
       this.program = program;
@@ -42,9 +47,9 @@ public class Pass4CodeGeneration {
       asm.startSegment(null, "Global Constants & labels");
       addConstants(asm, currentScope);
       addZpLabels(asm, currentScope);
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
-         if (!block.getScope().equals(currentScope)) {
-            if (!ScopeRef.ROOT.equals(currentScope)) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
+         if(!block.getScope().equals(currentScope)) {
+            if(!ScopeRef.ROOT.equals(currentScope)) {
                addData(asm, currentScope);
                asm.addScopeEnd();
             }
@@ -57,7 +62,7 @@ public class Pass4CodeGeneration {
          }
          // Generate entry points (if needed)
          genBlockEntryPoints(asm, block);
-         if (!block.isProcedureEntry(program)) {
+         if(!block.isProcedureEntry(program)) {
             // Generate label
             asm.startSegment(null, block.getLabel().getFullName());
             asm.addLabel(block.getLabel().getLocalName().replace('@', 'b').replace(':', '_'));
@@ -66,10 +71,10 @@ public class Pass4CodeGeneration {
          genStatements(asm, block);
          // Generate exit
          ControlFlowBlock defaultSuccessor = getGraph().getDefaultSuccessor(block);
-         if (defaultSuccessor != null) {
-            if (defaultSuccessor.hasPhiBlock()) {
+         if(defaultSuccessor != null) {
+            if(defaultSuccessor.hasPhiBlock()) {
                PhiTransitions.PhiTransition transition = getTransitions(defaultSuccessor).getTransition(block);
-               if (!transition.isGenerated()) {
+               if(!transition.isGenerated()) {
                   genBlockPhiTransition(asm, block, defaultSuccessor, defaultSuccessor.getScope());
                   String label = defaultSuccessor.getLabel().getLocalName().replace('@', 'b').replace(':', '_');
                   asm.addInstruction("JMP", AsmAddressingMode.ABS, label, false);
@@ -83,7 +88,7 @@ public class Pass4CodeGeneration {
             }
          }
       }
-      if (!ScopeRef.ROOT.equals(currentScope)) {
+      if(!ScopeRef.ROOT.equals(currentScope)) {
          addData(asm, currentScope);
          asm.addScopeEnd();
       }
@@ -94,17 +99,17 @@ public class Pass4CodeGeneration {
    /**
     * Add constant declarations for all scope constants
     *
-    * @param asm      The ASM program
+    * @param asm The ASM program
     * @param scopeRef The scope
     */
    private void addConstants(AsmProgram asm, ScopeRef scopeRef) {
       Scope scope = program.getScope().getScope(scopeRef);
       Collection<ConstantVar> scopeConstants = scope.getAllConstants(false);
       Set<String> added = new LinkedHashSet<>();
-      for (ConstantVar constantVar : scopeConstants) {
-         if(!(constantVar.getValue() instanceof ConstantArrayList || constantVar.getValue() instanceof ConstantArrayFilled|| constantVar.getType().equals(SymbolType.STRING))) {
+      for(ConstantVar constantVar : scopeConstants) {
+         if(!(constantVar.getValue() instanceof ConstantArrayList || constantVar.getValue() instanceof ConstantArrayFilled || constantVar.getType().equals(SymbolType.STRING))) {
             String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
-            if (asmName != null && !added.contains(asmName)) {
+            if(asmName != null && !added.contains(asmName)) {
                asm.addConstant(asmName.replace("#", "_").replace("$", "_"), AsmFormat.getAsmConstant(program, constantVar.getValue(), 99, scopeRef));
                added.add(asmName);
             }
@@ -115,25 +120,25 @@ public class Pass4CodeGeneration {
    /**
     * Add data directives for constants declarations
     *
-    * @param asm      The ASM program
+    * @param asm The ASM program
     * @param scopeRef The scope
     */
    private void addData(AsmProgram asm, ScopeRef scopeRef) {
       Scope scope = program.getScope().getScope(scopeRef);
       Collection<ConstantVar> scopeConstants = scope.getAllConstants(false);
       Set<String> added = new LinkedHashSet<>();
-      for (ConstantVar constantVar : scopeConstants) {
+      for(ConstantVar constantVar : scopeConstants) {
          Integer declaredAlignment = constantVar.getDeclaredAlignment();
-         if(declaredAlignment !=null) {
+         if(declaredAlignment != null) {
             String alignment = AsmFormat.getAsmNumber(declaredAlignment);
             asm.addDataAlignment(alignment);
          }
          if(constantVar.getValue() instanceof ConstantArrayList) {
             ConstantArrayList constantArrayList = (ConstantArrayList) constantVar.getValue();
             String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
-            if (asmName != null && !added.contains(asmName)) {
+            if(asmName != null && !added.contains(asmName)) {
                List<String> asmElements = new ArrayList<>();
-               for (ConstantValue element : constantArrayList.getElements()) {
+               for(ConstantValue element : constantArrayList.getElements()) {
                   String asmElement = AsmFormat.getAsmConstant(program, element, 99, scopeRef);
                   asmElements.add(asmElement);
                }
@@ -141,7 +146,7 @@ public class Pass4CodeGeneration {
                   asm.addDataNumeric(asmName.replace("#", "_").replace("$", "_"), AsmDataNumeric.Type.BYTE, asmElements);
                   added.add(asmName);
                } else {
-                  throw new RuntimeException("Unhandled constant array element type "+ constantArrayList.toString(program));
+                  throw new RuntimeException("Unhandled constant array element type " + constantArrayList.toString(program));
                }
             }
          } else if(constantVar.getValue() instanceof ConstantArrayFilled) {
@@ -151,7 +156,7 @@ public class Pass4CodeGeneration {
                asm.addDataFilled(asmName.replace("#", "_").replace("$", "_"), AsmDataNumeric.Type.BYTE, constantArrayFilled.getSize(), "0");
                added.add(asmName);
             } else {
-               throw new RuntimeException("Unhandled constant array element type "+ constantArrayFilled.toString(program));
+               throw new RuntimeException("Unhandled constant array element type " + constantArrayFilled.toString(program));
             }
          } else if(constantVar.getType().equals(SymbolType.STRING)) {
             String asmName = constantVar.getAsmName() == null ? constantVar.getLocalName() : constantVar.getAsmName();
@@ -162,23 +167,21 @@ public class Pass4CodeGeneration {
       }
    }
 
-
-
    /**
     * Add label declarations for all scope variables assigned to ZP registers
     *
-    * @param asm   The ASM program
+    * @param asm The ASM program
     * @param scope The scope
     */
    private void addZpLabels(AsmProgram asm, ScopeRef scope) {
       Collection<Variable> scopeVars = program.getScope().getScope(scope).getAllVariables(false);
       Set<String> added = new LinkedHashSet<>();
-      for (Variable scopeVar : scopeVars) {
+      for(Variable scopeVar : scopeVars) {
          Registers.Register register = scopeVar.getAllocation();
-         if (register != null && register.isZp()) {
+         if(register != null && register.isZp()) {
             Registers.RegisterZp registerZp = (Registers.RegisterZp) register;
             String asmName = scopeVar.getAsmName();
-            if (asmName != null && !added.contains(asmName)) {
+            if(asmName != null && !added.contains(asmName)) {
                asm.addLabelDecl(asmName.replace("#", "_").replace("$", "_"), registerZp.getZp());
                added.add(asmName);
             }
@@ -189,9 +192,9 @@ public class Pass4CodeGeneration {
    private void genStatements(AsmProgram asm, ControlFlowBlock block) {
       Iterator<Statement> statementsIt = block.getStatements().iterator();
       AsmCodegenAluState aluState = new AsmCodegenAluState();
-      while (statementsIt.hasNext()) {
+      while(statementsIt.hasNext()) {
          Statement statement = statementsIt.next();
-         if (!(statement instanceof StatementPhiBlock)) {
+         if(!(statement instanceof StatementPhiBlock)) {
             generateStatementAsm(asm, block, statement, aluState, true);
          }
       }
@@ -200,20 +203,20 @@ public class Pass4CodeGeneration {
    /**
     * Generate ASM code for a single statement
     *
-    * @param asm       The ASM program to generate into
-    * @param block     The block containing the statement
+    * @param asm The ASM program to generate into
+    * @param block The block containing the statement
     * @param statement The statement to generate ASM code for
-    * @param aluState  State of the special ALU register. Used to generate composite fragments when two consecutive statements can be executed effectively.
-    *                  For example ADC $1100,x combines two statements $0 = $1100 staridx X, A = A+$0 .
+    * @param aluState State of the special ALU register. Used to generate composite fragments when two consecutive statements can be executed effectively.
+    * For example ADC $1100,x combines two statements $0 = $1100 staridx X, A = A+$0 .
     */
    public void generateStatementAsm(AsmProgram asm, ControlFlowBlock block, Statement statement, AsmCodegenAluState aluState, boolean genCallPhiEntry) {
 
       asm.startSegment(statement.getIndex(), statement.toString(program, verboseAliveInfo));
 
       // IF the previous statement was added to the ALU register - generate the composite ASM fragment
-      if (aluState.hasAluAssignment()) {
+      if(aluState.hasAluAssignment()) {
          StatementAssignment assignmentAlu = aluState.getAluAssignment();
-         if (!(statement instanceof StatementAssignment)) {
+         if(!(statement instanceof StatementAssignment)) {
             throw new AsmFragment.AluNotApplicableException();
          }
          StatementAssignment assignment = (StatementAssignment) statement;
@@ -225,23 +228,23 @@ public class Pass4CodeGeneration {
          return;
       }
 
-      if (!(statement instanceof StatementPhiBlock)) {
-         if (statement instanceof StatementAssignment) {
+      if(!(statement instanceof StatementPhiBlock)) {
+         if(statement instanceof StatementAssignment) {
             StatementAssignment assignment = (StatementAssignment) statement;
             LValue lValue = assignment.getlValue();
             boolean isAlu = false;
-            if (lValue instanceof VariableRef) {
+            if(lValue instanceof VariableRef) {
                VariableRef lValueRef = (VariableRef) lValue;
                Registers.Register lValRegister = program.getSymbolInfos().getVariable(lValueRef).getAllocation();
-               if (lValRegister.getType().equals(Registers.RegisterType.REG_ALU)) {
+               if(lValRegister.getType().equals(Registers.RegisterType.REG_ALU)) {
                   asm.addComment(statement + "  //  ALU");
                   StatementAssignment assignmentAlu = assignment;
                   aluState.setAluAssignment(assignmentAlu);
                   isAlu = true;
                }
             }
-            if (!isAlu) {
-               if (assignment.getOperator() == null && assignment.getrValue1() == null && isRegisterCopy(lValue, assignment.getrValue2())) {
+            if(!isAlu) {
+               if(assignment.getOperator() == null && assignment.getrValue1() == null && isRegisterCopy(lValue, assignment.getrValue2())) {
                   asm.addComment(lValue.toString(program) + " = " + assignment.getrValue2().toString(program) + "  // register copy " + getRegister(lValue));
                } else {
                   AsmFragmentSignature asmFragmentSignature = new AsmFragmentSignature(assignment, program);
@@ -250,27 +253,27 @@ public class Pass4CodeGeneration {
                   asmFragment.generate(asm);
                }
             }
-         } else if (statement instanceof StatementConditionalJump) {
+         } else if(statement instanceof StatementConditionalJump) {
             AsmFragmentSignature asmSignature = new AsmFragmentSignature((StatementConditionalJump) statement, block, program, getGraph());
             AsmFragment asmFragment = AsmFragmentManager.getFragment(asmSignature, program.getLog());
             asm.getCurrentSegment().setFragment(asmFragment.getFragmentName());
             asmFragment.generate(asm);
-         } else if (statement instanceof StatementCall) {
+         } else if(statement instanceof StatementCall) {
             StatementCall call = (StatementCall) statement;
-            if (genCallPhiEntry) {
+            if(genCallPhiEntry) {
                ControlFlowBlock callSuccessor = getGraph().getCallSuccessor(block);
-               if (callSuccessor != null && callSuccessor.hasPhiBlock()) {
+               if(callSuccessor != null && callSuccessor.hasPhiBlock()) {
                   PhiTransitions.PhiTransition transition = getTransitions(callSuccessor).getTransition(block);
-                  if (transition.isGenerated()) {
+                  if(transition.isGenerated()) {
                      throw new RuntimeException("Error! JSR transition already generated. Must modify PhiTransitions code to ensure this does not happen.");
                   }
                   genBlockPhiTransition(asm, block, callSuccessor, block.getScope());
                }
             }
             asm.addInstruction("jsr", AsmAddressingMode.ABS, call.getProcedure().getFullName(), false);
-         } else if (statement instanceof StatementReturn) {
+         } else if(statement instanceof StatementReturn) {
             asm.addInstruction("rts", AsmAddressingMode.NON, null, false);
-         } else if (statement instanceof StatementAsm) {
+         } else if(statement instanceof StatementAsm) {
             StatementAsm statementAsm = (StatementAsm) statement;
             HashMap<String, Value> bindings = new HashMap<>();
             AsmFragment asmFragment = new AsmFragment(program, "inline", block.getScope(), new AsmFragmentTemplate(statementAsm.getAsmLines()), bindings);
@@ -281,41 +284,17 @@ public class Pass4CodeGeneration {
       }
    }
 
-   /**
-    * Contains previous assignment added to the ALU register between calls to generateStatementAsm
-    */
-   public static class AsmCodegenAluState {
-
-      private StatementAssignment aluAssignment;
-
-      public void setAluAssignment(StatementAssignment aluAssignment) {
-         this.aluAssignment = aluAssignment;
-      }
-
-      public StatementAssignment getAluAssignment() {
-         return aluAssignment;
-      }
-
-      public boolean hasAluAssignment() {
-         return aluAssignment != null;
-      }
-
-      public void clear() {
-         aluAssignment = null;
-      }
-   }
-
    /**
     * Generate all block entry points (phi transitions) which have not already been generated.
     *
-    * @param asm     The ASM program to generate into
+    * @param asm The ASM program to generate into
     * @param toBlock The block to generate remaining entry points for.
     */
    private void genBlockEntryPoints(AsmProgram asm, ControlFlowBlock toBlock) {
       PhiTransitions transitions = getTransitions(toBlock);
-      for (ControlFlowBlock fromBlock : transitions.getFromBlocks()) {
+      for(ControlFlowBlock fromBlock : transitions.getFromBlocks()) {
          PhiTransitions.PhiTransition transition = transitions.getTransition(fromBlock);
-         if (!transition.isGenerated() && toBlock.getLabel().equals(fromBlock.getConditionalSuccessor())) {
+         if(!transition.isGenerated() && toBlock.getLabel().equals(fromBlock.getConditionalSuccessor())) {
             genBlockPhiTransition(asm, fromBlock, toBlock, toBlock.getScope());
             asm.addInstruction("JMP", AsmAddressingMode.ABS, toBlock.getLabel().getLocalName().replace('@', 'b').replace(':', '_'), false);
          }
@@ -327,30 +306,30 @@ public class Pass4CodeGeneration {
     * The transition can be inserted either at the start of the to-block (used for conditional jumps)
     * or at the end of the from-block ( used at default block transitions and before JMP/JSR)
     *
-    * @param asm       The ASP program to generate the transition into.
+    * @param asm The ASP program to generate the transition into.
     * @param fromBlock The from-block
-    * @param toBlock   The to-block
-    * @param scope     The scope where the ASM code is being inserted. Used to ensure that labels inserted in the code reference the right variables.
-    *                  If the transition code is inserted in the to-block, this is the scope of the to-block.
-    *                  If the transition code is inserted in the from-block this is the scope of the from-block.
+    * @param toBlock The to-block
+    * @param scope The scope where the ASM code is being inserted. Used to ensure that labels inserted in the code reference the right variables.
+    * If the transition code is inserted in the to-block, this is the scope of the to-block.
+    * If the transition code is inserted in the from-block this is the scope of the from-block.
     */
    private void genBlockPhiTransition(AsmProgram asm, ControlFlowBlock fromBlock, ControlFlowBlock toBlock, ScopeRef scope) {
       PhiTransitions transitions = getTransitions(toBlock);
       PhiTransitions.PhiTransition transition = transitions.getTransition(fromBlock);
-      if (!transition.isGenerated()) {
+      if(!transition.isGenerated()) {
          Statement toFirstStatement = toBlock.getStatements().get(0);
          String segmentSrc = "[" + toFirstStatement.getIndex() + "] phi from ";
-         for (ControlFlowBlock fBlock : transition.getFromBlocks()) {
+         for(ControlFlowBlock fBlock : transition.getFromBlocks()) {
             segmentSrc += fBlock.getLabel().getFullName() + " ";
          }
          segmentSrc += "to " + toBlock.getLabel().getFullName();
          asm.startSegment(toFirstStatement.getIndex(), segmentSrc);
          asm.getCurrentSegment().setPhiTransitionId(transition.getTransitionId());
-         for (ControlFlowBlock fBlock : transition.getFromBlocks()) {
+         for(ControlFlowBlock fBlock : transition.getFromBlocks()) {
             asm.addLabel((toBlock.getLabel().getLocalName() + "_from_" + fBlock.getLabel().getLocalName()).replace('@', 'b').replace(':', '_'));
          }
          List<PhiTransitions.PhiTransition.PhiAssignment> assignments = transition.getAssignments();
-         for (PhiTransitions.PhiTransition.PhiAssignment assignment : assignments) {
+         for(PhiTransitions.PhiTransition.PhiAssignment assignment : assignments) {
             LValue lValue = assignment.getVariable();
             RValue rValue = assignment.getrValue();
             Statement statement = assignment.getPhiBlock();
@@ -358,7 +337,7 @@ public class Pass4CodeGeneration {
             asm.startSegment(statement.getIndex(), "[" + statement.getIndex() + "] phi " + lValue.toString(program) + " = " + rValue.toString(program));
             asm.getCurrentSegment().setPhiTransitionId(transition.getTransitionId());
             asm.getCurrentSegment().setPhiTransitionAssignmentIdx(assignment.getAssignmentIdx());
-            if (isRegisterCopy(lValue, rValue)) {
+            if(isRegisterCopy(lValue, rValue)) {
                asm.getCurrentSegment().setFragment("register_copy");
             } else {
                AsmFragmentSignature asmSignature = new AsmFragmentSignature(lValue, rValue, program, scope);
@@ -373,14 +352,6 @@ public class Pass4CodeGeneration {
       }
    }
 
-
-   /**
-    * Keeps track of the phi transitions into blocks during code generation.
-    * Used to ensure that duplicate transitions are only code generated once.
-    * Maps to-blocks to the transition information for the block
-    */
-   private Map<ControlFlowBlock, PhiTransitions> blockTransitions = new LinkedHashMap<>();
-
    /**
     * Get phi transitions for a specific to-block.
     *
@@ -389,7 +360,7 @@ public class Pass4CodeGeneration {
     */
    private PhiTransitions getTransitions(ControlFlowBlock toBlock) {
       PhiTransitions transitions = this.blockTransitions.get(toBlock);
-      if (transitions == null) {
+      if(transitions == null) {
          transitions = new PhiTransitions(program, toBlock);
          this.blockTransitions.put(toBlock, transitions);
       }
@@ -397,7 +368,7 @@ public class Pass4CodeGeneration {
    }
 
    private Registers.Register getRegister(RValue rValue) {
-      if (rValue instanceof VariableRef) {
+      if(rValue instanceof VariableRef) {
          VariableRef rValueRef = (VariableRef) rValue;
          return program.getSymbolInfos().getVariable(rValueRef).getAllocation();
       } else {
@@ -412,4 +383,28 @@ public class Pass4CodeGeneration {
                   getRegister(lValue).equals(getRegister(rValue));
    }
 
+   /**
+    * Contains previous assignment added to the ALU register between calls to generateStatementAsm
+    */
+   public static class AsmCodegenAluState {
+
+      private StatementAssignment aluAssignment;
+
+      public StatementAssignment getAluAssignment() {
+         return aluAssignment;
+      }
+
+      public void setAluAssignment(StatementAssignment aluAssignment) {
+         this.aluAssignment = aluAssignment;
+      }
+
+      public boolean hasAluAssignment() {
+         return aluAssignment != null;
+      }
+
+      public void clear() {
+         aluAssignment = null;
+      }
+   }
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4LiveRangeEquivalenceClassesFinalize.java b/src/main/java/dk/camelot64/kickc/passes/Pass4LiveRangeEquivalenceClassesFinalize.java
index 5b6ed6cf5..e16394813 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4LiveRangeEquivalenceClassesFinalize.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4LiveRangeEquivalenceClassesFinalize.java
@@ -21,7 +21,7 @@ public class Pass4LiveRangeEquivalenceClassesFinalize extends Pass2Base {
       equivalenceClassPhiInitializer.visitGraph(getGraph());
       LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet = equivalenceClassPhiInitializer.getPhiEquivalenceClasses();
       getLog().append("Initial phi equivalence classes");
-      for (LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
          getLog().append(liveRangeEquivalenceClass.toString());
       }
 
@@ -29,7 +29,7 @@ public class Pass4LiveRangeEquivalenceClassesFinalize extends Pass2Base {
       EquivalenceClassAdder equivalenceClassAdder = new EquivalenceClassAdder(liveRangeEquivalenceClassSet);
       equivalenceClassAdder.visitGraph(getGraph());
       getLog().append("Complete equivalence classes");
-      for (LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass liveRangeEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
          getLog().append(liveRangeEquivalenceClass.toString());
       }
 
@@ -49,7 +49,7 @@ public class Pass4LiveRangeEquivalenceClassesFinalize extends Pass2Base {
 
       @Override
       public Void visitAssignment(StatementAssignment assignment) {
-         if (assignment.getlValue() instanceof VariableRef) {
+         if(assignment.getlValue() instanceof VariableRef) {
             VariableRef lValVar = (VariableRef) assignment.getlValue();
             List<VariableRef> preferences = new ArrayList<>();
             addToEquivalenceClassSet(lValVar, preferences);
@@ -61,17 +61,17 @@ public class Pass4LiveRangeEquivalenceClassesFinalize extends Pass2Base {
          LiveRangeVariables liveRangeVariables = getProgram().getLiveRangeVariables();
          LiveRangeEquivalenceClass lValEquivalenceClass =
                liveRangeEquivalenceClassSet.getEquivalenceClass(lValVar);
-         if (lValEquivalenceClass == null) {
+         if(lValEquivalenceClass == null) {
             LiveRange lValLiveRange = liveRangeVariables.getLiveRange(lValVar);
             // Variable in need of an equivalence class - Look through preferences
             LiveRangeEquivalenceClass chosen = null;
-            for (VariableRef preference : preferences) {
+            for(VariableRef preference : preferences) {
                LiveRangeEquivalenceClass preferenceEquivalenceClass = liveRangeEquivalenceClassSet.getEquivalenceClass(preference);
-               if (preferenceEquivalenceClass != null) {
+               if(preferenceEquivalenceClass != null) {
                   Variable potentialVariable = getProgram().getSymbolInfos().getVariable(preference);
                   Variable lValVariable = getProgram().getSymbolInfos().getVariable(lValVar);
-                  if (lValVariable.getType().equals(potentialVariable.getType())) {
-                     if (!lValLiveRange.overlaps(preferenceEquivalenceClass.getLiveRange())) {
+                  if(lValVariable.getType().equals(potentialVariable.getType())) {
+                     if(!lValLiveRange.overlaps(preferenceEquivalenceClass.getLiveRange())) {
                         chosen = preferenceEquivalenceClass;
                         chosen.addVariable(lValVar);
                         break;
@@ -79,7 +79,7 @@ public class Pass4LiveRangeEquivalenceClassesFinalize extends Pass2Base {
                   }
                }
             }
-            if (chosen == null) {
+            if(chosen == null) {
                // No preference usable - create a new one
                chosen = liveRangeEquivalenceClassSet.getOrCreateEquivalenceClass(lValVar);
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftCombinations.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftCombinations.java
index c4e7ee025..d0a2ac57a 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftCombinations.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftCombinations.java
@@ -1,8 +1,8 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.fragment.AsmFragment;
 import dk.camelot64.kickc.asm.AsmProgram;
 import dk.camelot64.kickc.asm.AsmSegment;
+import dk.camelot64.kickc.fragment.AsmFragment;
 import dk.camelot64.kickc.fragment.AsmFragmentManager;
 import dk.camelot64.kickc.model.*;
 
@@ -15,37 +15,15 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       super(program);
    }
 
-   public void performUplift(int maxCombinations) {
-      // Test uplift combinations to find the best one.
-      Set<String> unknownFragments = new LinkedHashSet<>();
-      List<RegisterUpliftScope> registerUpliftScopes = getProgram().getRegisterUpliftProgram().getRegisterUpliftScopes();
-      for (RegisterUpliftScope upliftScope : registerUpliftScopes) {
-         RegisterCombinationIterator combinationIterator = upliftScope.getCombinationIterator(getProgram().getRegisterPotentials());
-         chooseBestUpliftCombination(
-               combinationIterator,
-               maxCombinations,
-               unknownFragments,
-               upliftScope.getScopeRef(),
-               getProgram());
-      }
-
-      if (unknownFragments.size() > 0) {
-         getLog().append("MISSING FRAGMENTS");
-         for (String unknownFragment : unknownFragments) {
-            getLog().append("  " + unknownFragment);
-         }
-      }
-   }
-
    /**
     * Iterate combinations and choose the combination that provides the best ASM score.
     * Stores the best combination directly in the {@link LiveRangeEquivalenceClassSet}.
     *
     * @param combinationIterator The combination iterator used for supplying different register allocations to test
-    * @param maxCombinations     The maximal number of combinations to test. It the iterator has more combinations he rest is skipped (and a message logged)
-    * @param unknownFragments    Receives any unknown ASM fragments encountered during the combinsation search
-    * @param scope               The scope where the variables are being tested. (Only used for logging)
-    * @param program             The program to test (used for accessing global data structures)
+    * @param maxCombinations The maximal number of combinations to test. It the iterator has more combinations he rest is skipped (and a message logged)
+    * @param unknownFragments Receives any unknown ASM fragments encountered during the combinsation search
+    * @param scope The scope where the variables are being tested. (Only used for logging)
+    * @param program The program to test (used for accessing global data structures)
     */
    static void chooseBestUpliftCombination(
          RegisterCombinationIterator combinationIterator, int maxCombinations,
@@ -56,35 +34,35 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       int bestScore = Integer.MAX_VALUE;
       RegisterCombination bestCombination = null;
       int countCombinations = 0;
-      while (combinationIterator.hasNext() && countCombinations < maxCombinations) {
+      while(combinationIterator.hasNext() && countCombinations < maxCombinations) {
          countCombinations++;
-         if (countCombinations % 10000 == 0) {
+         if(countCombinations % 10000 == 0) {
             program.getLog().append("Uplift attempts [" + scope + "] " + countCombinations + "/" + combinationIterator.getNumIterations() + " (limiting to " + maxCombinations + ")");
          }
          RegisterCombination combination = combinationIterator.next();
-         if (!generateCombinationAsm(combination, program, unknownFragments, scope)) {
+         if(!generateCombinationAsm(combination, program, unknownFragments, scope)) {
             continue;
          }
          // If no clobber - Find value of the resulting allocation
          int combinationScore = getAsmScore(program);
-         if (program.getLog().isVerboseUplift()) {
+         if(program.getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Uplift attempt [" + scope + "] ");
             msg.append(combinationScore);
             msg.append(" allocation: ").append(combination.toString());
             program.getLog().append(msg.toString());
          }
-         if (combinationScore < bestScore) {
+         if(combinationScore < bestScore) {
             bestScore = combinationScore;
             bestCombination = combination;
          }
       }
-      if (bestCombination != null) {
+      if(bestCombination != null) {
          // Save the best combination in the equivalence class
          bestCombination.store(program.getLiveRangeEquivalenceClassSet());
          program.getLog().append("Uplifting [" + scope + "] best " + bestScore + " combination " + bestCombination.toString());
       }
-      if (combinationIterator.hasNext()) {
+      if(combinationIterator.hasNext()) {
          program.getLog().append("Limited combination testing to " + countCombinations + " combinations of " + combinationIterator.getNumIterations() + " possible.");
       }
    }
@@ -99,9 +77,9 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
     * <li>the ALU register is used in a non-applicable way</li>
     * </ul>
     *
-    * @param combination      The register allocation combination
+    * @param combination The register allocation combination
     * @param unknownFragments Will receive any AsmFragments that can not be found during the ASM code generation
-    * @param scope            The scope where the combination is tested. (Only used for logging)
+    * @param scope The scope where the combination is tested. (Only used for logging)
     * @return true if the generation was successful
     */
    public static boolean generateCombinationAsm(
@@ -114,8 +92,8 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       // Apply the uplift combination
       combination.allocate(program);
       // Check the register allocation for whether a is register being allocated to two variables with overlapping live ranges
-      if (isAllocationOverlapping(program)) {
-         if (program.getLog().isVerboseUplift()) {
+      if(isAllocationOverlapping(program)) {
+         if(program.getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Uplift attempt [" + (scope == null ? "" : scope) + "] ");
             msg.append("overlapping");
@@ -128,9 +106,9 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       // Generate ASM
       try {
          new Pass4CodeGeneration(program, false).generate();
-      } catch (AsmFragmentManager.UnknownFragmentException e) {
+      } catch(AsmFragmentManager.UnknownFragmentException e) {
          unknownFragments.add(e.getFragmentSignature());
-         if (program.getLog().isVerboseUplift()) {
+         if(program.getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Uplift attempt [" + (scope == null ? "" : scope) + "] ");
             msg.append("missing fragment " + e.getFragmentSignature());
@@ -138,8 +116,8 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
             program.getLog().append(msg.toString());
          }
          return false;
-      } catch (AsmFragment.AluNotApplicableException e) {
-         if (program.getLog().isVerboseUplift()) {
+      } catch(AsmFragment.AluNotApplicableException e) {
+         if(program.getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Uplift attempt [" + (scope == null ? "" : scope) + "] ");
             msg.append("alu not applicable");
@@ -149,8 +127,8 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
          return false;
       }
       boolean hasClobberProblem = new Pass4AssertNoCpuClobber(program).hasClobberProblem(false);
-      if (hasClobberProblem) {
-         if (program.getLog().isVerboseUplift()) {
+      if(hasClobberProblem) {
+         if(program.getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Uplift attempt [" + (scope == null ? "" : scope) + "] ");
             msg.append("clobber");
@@ -175,12 +153,12 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       int score = 0;
       AsmProgram asm = program.getAsm();
       NaturalLoopSet loopSet = program.getLoopSet();
-      for (AsmSegment asmSegment : asm.getSegments()) {
+      for(AsmSegment asmSegment : asm.getSegments()) {
          double asmSegmentCycles = asmSegment.getCycles();
-         if (asmSegmentCycles > 0) {
+         if(asmSegmentCycles > 0) {
             Integer statementIdx = asmSegment.getStatementIdx();
             int maxLoopDepth = 1;
-            if (statementIdx != null) {
+            if(statementIdx != null) {
                ControlFlowBlock block = program.getStatementInfos().getBlock(statementIdx);
                maxLoopDepth = loopSet.getMaxLoopDepth(block.getLabel());
             }
@@ -197,9 +175,9 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
     * @return true if the register allocation contains an overlapping allocation. false otherwise.
     */
    public static boolean isAllocationOverlapping(Program program) {
-      for (ControlFlowBlock block : program.getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
-            if (isStatementAllocationOverlapping(program, statement)) {
+      for(ControlFlowBlock block : program.getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
+            if(isStatementAllocationOverlapping(program, statement)) {
                return true;
             }
          }
@@ -210,34 +188,34 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
    /**
     * Determine if a statement has an overlapping register allocation
     *
-    * @param program       The program
-    * @param statement     The statement to check
+    * @param program The program
+    * @param statement The statement to check
     * @return true if there is an overlapping register allocation
     */
    private static boolean isStatementAllocationOverlapping(Program program, Statement statement) {
       ProgramScope programScope = program.getScope();
       LiveRangeVariablesEffective.AliveCombinations aliveCombinations = program.getLiveRangeVariablesEffective().getAliveCombinations(statement);
-      for (LiveRangeVariablesEffective.CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
+      for(LiveRangeVariablesEffective.CallPath callPath : aliveCombinations.getCallPaths().getCallPaths()) {
          LinkedHashMap<Registers.Register, LiveRangeEquivalenceClass> usedRegisters = new LinkedHashMap<>();
          Collection<VariableRef> alive = aliveCombinations.getEffectiveAliveAtStmt(callPath);
          Pass2AliasElimination.Aliases callPathAliases = aliveCombinations.getEffectiveAliasesAtStmt(callPath);
-         for (VariableRef varRef : alive) {
+         for(VariableRef varRef : alive) {
             Variable var = program.getSymbolInfos().getVariable(varRef);
             Registers.Register allocation = var.getAllocation();
             LiveRangeEquivalenceClass allocationClass = usedRegisters.get(allocation);
-            if (allocationClass != null && !allocationClass.contains(varRef)) {
+            if(allocationClass != null && !allocationClass.contains(varRef)) {
                // Examine if the var is an alias of a var in the allocation class
                boolean overlap = true;
                Pass2AliasElimination.AliasSet aliasSet = callPathAliases.findAliasSet(varRef);
-               if(aliasSet!=null) {
-                  for (VariableRef aliasVar : aliasSet.getVars()) {
+               if(aliasSet != null) {
+                  for(VariableRef aliasVar : aliasSet.getVars()) {
                      if(allocationClass.contains(aliasVar)) {
                         overlap = false;
                      }
                   }
                }
                if(overlap) {
-                  if (program.getLog().isVerboseUplift()) {
+                  if(program.getLog().isVerboseUplift()) {
                      StringBuilder msg = new StringBuilder();
                      msg.append("Overlap register " + allocation + " in " + statement.toString(program, true));
                      program.getLog().append(msg.toString());
@@ -254,4 +232,26 @@ public class Pass4RegisterUpliftCombinations extends Pass2Base {
       return false;
    }
 
+   public void performUplift(int maxCombinations) {
+      // Test uplift combinations to find the best one.
+      Set<String> unknownFragments = new LinkedHashSet<>();
+      List<RegisterUpliftScope> registerUpliftScopes = getProgram().getRegisterUpliftProgram().getRegisterUpliftScopes();
+      for(RegisterUpliftScope upliftScope : registerUpliftScopes) {
+         RegisterCombinationIterator combinationIterator = upliftScope.getCombinationIterator(getProgram().getRegisterPotentials());
+         chooseBestUpliftCombination(
+               combinationIterator,
+               maxCombinations,
+               unknownFragments,
+               upliftScope.getScopeRef(),
+               getProgram());
+      }
+
+      if(unknownFragments.size() > 0) {
+         getLog().append("MISSING FRAGMENTS");
+         for(String unknownFragment : unknownFragments) {
+            getLog().append("  " + unknownFragment);
+         }
+      }
+   }
+
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialAluAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialAluAnalysis.java
index 38d075757..1ce42907e 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialAluAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialAluAnalysis.java
@@ -28,28 +28,28 @@ public class Pass4RegisterUpliftPotentialAluAnalysis extends Pass2Base {
       RegisterPotentials registerPotentials = getProgram().getRegisterPotentials();
       this.liveRangeEquivalenceClassSet = getProgram().getLiveRangeEquivalenceClassSet();
 
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
 
          VariableRef potentialAluVar = null;
 
-         for (Statement statement : block.getStatements()) {
-            if (potentialAluVar != null) {
+         for(Statement statement : block.getStatements()) {
+            if(potentialAluVar != null) {
                // Previous assignment has ALU potential - check if current statement can use it
-               if (statement instanceof StatementAssignment) {
+               if(statement instanceof StatementAssignment) {
                   StatementAssignment assignment = (StatementAssignment) statement;
-                  if (assignment.getOperator()!=null && "-".equals(assignment.getOperator().getOperator())) {
+                  if(assignment.getOperator() != null && "-".equals(assignment.getOperator().getOperator())) {
                      // ALU applicable if the variable is the second lValue and the first lValue is non-null
-                     if (assignment.getrValue2().equals(potentialAluVar) && assignment.getrValue1() != null) {
+                     if(assignment.getrValue2().equals(potentialAluVar) && assignment.getrValue1() != null) {
                         // The variable has ALU potential
                         setHasAluPotential(registerPotentials, potentialAluVar);
                      }
-                  } else if (assignment.getOperator()!=null && (Operator.PLUS.equals(assignment.getOperator()) || Operator.BOOL_OR.equals(assignment.getOperator())|| Operator.WORD.equals(assignment.getOperator()))) {
+                  } else if(assignment.getOperator() != null && (Operator.PLUS.equals(assignment.getOperator()) || Operator.BOOL_OR.equals(assignment.getOperator()) || Operator.WORD.equals(assignment.getOperator()))) {
                      // ALU applicable if the variable is one of the two values
-                     if (assignment.getrValue2().equals(potentialAluVar) && assignment.getrValue1() != null) {
+                     if(assignment.getrValue2().equals(potentialAluVar) && assignment.getrValue1() != null) {
                         // The variable has ALU potential
                         setHasAluPotential(registerPotentials, potentialAluVar);
                      }
-                     if (assignment.getrValue1().equals(potentialAluVar) && assignment.getrValue2() != null) {
+                     if(assignment.getrValue1().equals(potentialAluVar) && assignment.getrValue2() != null) {
                         // The variable has ALU potential
                         setHasAluPotential(registerPotentials, potentialAluVar);
                      }
@@ -57,18 +57,18 @@ public class Pass4RegisterUpliftPotentialAluAnalysis extends Pass2Base {
                }
             }
             potentialAluVar = null;
-            if (statement instanceof StatementAssignment) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
-               if (assignment.getOperator()!=null && "*".equals(assignment.getOperator().getOperator()) && assignment.getrValue1() == null) {
+               if(assignment.getOperator() != null && "*".equals(assignment.getOperator().getOperator()) && assignment.getrValue1() == null) {
                   potentialAluVar = findAluPotential(assignment);
                }
-               if (assignment.getOperator()!=null && "*idx".equals(assignment.getOperator().getOperator())) {
+               if(assignment.getOperator() != null && "*idx".equals(assignment.getOperator().getOperator())) {
                   potentialAluVar = findAluPotential(assignment);
                }
-               if (assignment.getOperator()!=null && Operator.LOWBYTE.equals(assignment.getOperator()) && assignment.getrValue1()==null) {
+               if(assignment.getOperator() != null && Operator.LOWBYTE.equals(assignment.getOperator()) && assignment.getrValue1() == null) {
                   potentialAluVar = findAluPotential(assignment);
                }
-               if (assignment.getOperator()!=null && Operator.HIBYTE.equals(assignment.getOperator()) && assignment.getrValue1()==null) {
+               if(assignment.getOperator() != null && Operator.HIBYTE.equals(assignment.getOperator()) && assignment.getrValue1() == null) {
                   potentialAluVar = findAluPotential(assignment);
                }
             }
@@ -78,13 +78,13 @@ public class Pass4RegisterUpliftPotentialAluAnalysis extends Pass2Base {
 
    private VariableRef findAluPotential(StatementAssignment assignment) {
       VariableRef potentialAluVar = null;
-      if (assignment.getlValue() instanceof VariableRef) {
+      if(assignment.getlValue() instanceof VariableRef) {
          VariableRef var = (VariableRef) assignment.getlValue();
          LiveRangeEquivalenceClass varEquivalenceClass = liveRangeEquivalenceClassSet.getEquivalenceClass(var);
-         if (varEquivalenceClass.getVariables().size() == 1) {
+         if(varEquivalenceClass.getVariables().size() == 1) {
             // Alone in equivalence class
             LiveRange liveRange = varEquivalenceClass.getLiveRange();
-            if (liveRange.size() == 1) {
+            if(liveRange.size() == 1) {
                // Only used in the following statement
                potentialAluVar = var;
             }
@@ -96,7 +96,7 @@ public class Pass4RegisterUpliftPotentialAluAnalysis extends Pass2Base {
    private void setHasAluPotential(RegisterPotentials registerPotentials, VariableRef ref) {
       LiveRangeEquivalenceClass potentialAluEquivalenceClass = liveRangeEquivalenceClassSet.getEquivalenceClass(ref);
       registerPotentials.addPotentialRegister(potentialAluEquivalenceClass, Registers.getRegisterALU());
-      getLog().append("Equivalence Class "+potentialAluEquivalenceClass+" has ALU potential.");
+      getLog().append("Equivalence Class " + potentialAluEquivalenceClass + " has ALU potential.");
    }
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialInitialize.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialInitialize.java
index 57acf50af..71a72d152 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialInitialize.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialInitialize.java
@@ -20,10 +20,10 @@ public class Pass4RegisterUpliftPotentialInitialize extends Pass2Base {
    public void initPotentialRegisters() {
       LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet = getProgram().getLiveRangeEquivalenceClassSet();
       RegisterPotentials registerPotentials = new RegisterPotentials();
-      for (LiveRangeEquivalenceClass equivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
          Registers.Register defaultRegister = equivalenceClass.getRegister();
          Registers.RegisterType registerType = defaultRegister.getType();
-         if (registerType.equals(Registers.RegisterType.ZP_BYTE)) {
+         if(registerType.equals(Registers.RegisterType.ZP_BYTE)) {
             List<Registers.Register> potentials = Arrays.asList(
                   defaultRegister,
                   Registers.getRegisterA(),
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialRegisterAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialRegisterAnalysis.java
index 32b2a2fc9..c4e2eb227 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialRegisterAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftPotentialRegisterAnalysis.java
@@ -1,8 +1,8 @@
 package dk.camelot64.kickc.passes;
 
-import dk.camelot64.kickc.fragment.AsmFragment;
-import dk.camelot64.kickc.asm.AsmProgram;
 import dk.camelot64.kickc.asm.AsmClobber;
+import dk.camelot64.kickc.asm.AsmProgram;
+import dk.camelot64.kickc.fragment.AsmFragment;
 import dk.camelot64.kickc.fragment.AsmFragmentManager;
 import dk.camelot64.kickc.model.*;
 
@@ -20,6 +20,66 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
       super(program);
    }
 
+   /**
+    * Get all variables referenced (or assigned) in a statement.
+    *
+    * @param statement The statement
+    * @return All variables referenced (or assigned) in the statement
+    */
+   public static Set<VariableRef> getReferencedVars(Statement statement) {
+      Set<VariableRef> referenced = new LinkedHashSet<>();
+      if(statement instanceof StatementAssignment) {
+         addReferenced(referenced, ((StatementAssignment) statement).getlValue());
+         addReferenced(referenced, ((StatementAssignment) statement).getrValue1());
+         addReferenced(referenced, ((StatementAssignment) statement).getrValue2());
+      } else if(statement instanceof StatementPhiBlock) {
+         for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
+            addReferenced(referenced, phiVariable.getVariable());
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+               addReferenced(referenced, phiRValue.getrValue());
+            }
+         }
+      } else if(statement instanceof StatementConditionalJump) {
+         addReferenced(referenced, ((StatementConditionalJump) statement).getrValue1());
+         addReferenced(referenced, ((StatementConditionalJump) statement).getrValue2());
+      }
+      return referenced;
+   }
+
+   private static void addReferenced(Set<VariableRef> referenced, RValue rValue) {
+      if(rValue instanceof VariableRef) {
+         referenced.add((VariableRef) rValue);
+      } else if(rValue instanceof PointerDereferenceSimple) {
+         addReferenced(referenced, ((PointerDereferenceSimple) rValue).getPointer());
+      } else if(rValue instanceof PointerDereferenceIndexed) {
+         addReferenced(referenced, ((PointerDereferenceIndexed) rValue).getPointer());
+         addReferenced(referenced, ((PointerDereferenceIndexed) rValue).getIndex());
+      }
+   }
+
+   /**
+    * Get all variables assigned a value in a statement
+    *
+    * @param statement The statement
+    * @return The variables assigned a value in the statement
+    */
+   public static Set<VariableRef> getAssignedVars(Statement statement) {
+      LinkedHashSet<VariableRef> variableRefs = new LinkedHashSet<>();
+      if(statement instanceof StatementPhiBlock) {
+         List<StatementPhiBlock.PhiVariable> phiVariables = ((StatementPhiBlock) statement).getPhiVariables();
+         for(StatementPhiBlock.PhiVariable phiVariable : phiVariables) {
+            variableRefs.add(phiVariable.getVariable());
+         }
+         return variableRefs;
+      } else if(statement instanceof StatementAssignment) {
+         LValue lValue = ((StatementAssignment) statement).getlValue();
+         if(lValue instanceof VariableRef) {
+            variableRefs.add((VariableRef) lValue);
+         }
+      }
+      return variableRefs;
+   }
+
    /***
     * For each statement - try out all potential register combinations and examine the clobber
     *
@@ -33,8 +93,8 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
       RegisterPotentials registerPotentials = getProgram().getRegisterPotentials();
 
       VariableReferenceInfos referenceInfo = getProgram().getVariableReferenceInfos();
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
 
             // Find all variables referenced/assigned in the statement
             Set<VariableRef> referencedVars = new HashSet<>(referenceInfo.getReferencedVars(statement));
@@ -42,16 +102,16 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
 
             // Find referenced/assigned live range equivalence classes
             Set<LiveRangeEquivalenceClass> assignedClasses = new LinkedHashSet<>();
-            for (VariableRef var : assignedVars) {
+            for(VariableRef var : assignedVars) {
                assignedClasses.add(liveRangeEquivalenceClassSet.getEquivalenceClass(var));
             }
             Set<LiveRangeEquivalenceClass> referencedClasses = new LinkedHashSet<>();
-            for (VariableRef var : referencedVars) {
+            for(VariableRef var : referencedVars) {
                referencedClasses.add(liveRangeEquivalenceClassSet.getEquivalenceClass(var));
             }
 
             // If statement assigns to an ALU potential equivalence class then always clobbered is empty
-            for (LiveRangeEquivalenceClass assignedClass : assignedClasses) {
+            for(LiveRangeEquivalenceClass assignedClass : assignedClasses) {
                if(registerPotentials.getPotentialRegisters(assignedClass).contains(Registers.getRegisterALU())) {
                   continue;
                }
@@ -64,14 +124,14 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
             // For each combination generate the ASM and examine the clobber of all alive variables
             // Find the registers clobbered by all combinations!
             Set<Registers.Register> alwaysClobbered = findAlwaysClobberedRegisters(block, statement, combinationIterator);
-            if (alwaysClobbered.isEmpty()) {
+            if(alwaysClobbered.isEmpty()) {
                // No registers are always clobbered - move on to the next statement
                continue;
             } else {
                StringBuilder msg = new StringBuilder();
                msg.append("Statement ").append(statement.toString(getProgram(), true));
                msg.append(" always clobbers ");
-               for (Registers.Register register : alwaysClobbered) {
+               for(Registers.Register register : alwaysClobbered) {
                   msg.append(register).append(" ");
                }
                getLog().append(msg.toString());
@@ -79,15 +139,15 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
 
             // For all non-assigned live variables: remove always clobbered registers from their potential allocation
             Collection<VariableRef> aliveVars = getProgram().getLiveRangeVariablesEffective().getAliveEffective(statement);
-            for (VariableRef aliveVar : aliveVars) {
+            for(VariableRef aliveVar : aliveVars) {
                LiveRangeEquivalenceClass aliveClass = liveRangeEquivalenceClassSet.getEquivalenceClass(aliveVar);
-               if (assignedClasses.contains(aliveClass)) {
+               if(assignedClasses.contains(aliveClass)) {
                   // Assigned registers are allowed to be be clobbered
                   continue;
                }
                List<Registers.Register> alivePotentialRegisters = registerPotentials.getPotentialRegisters(aliveClass);
-               for (Registers.Register clobberedRegister : alwaysClobbered) {
-                  if (alivePotentialRegisters.contains(clobberedRegister)) {
+               for(Registers.Register clobberedRegister : alwaysClobbered) {
+                  if(alivePotentialRegisters.contains(clobberedRegister)) {
                      registerPotentials.removePotentialRegister(aliveClass, clobberedRegister);
                      StringBuilder msg = new StringBuilder();
                      msg.append("Removing always clobbered register " + clobberedRegister + " as potential for " + aliveClass);
@@ -109,8 +169,8 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
     * Find the registers clobbered by all register allocation combinations.
     * For each combination generate the ASM and examine the clobber of all alive variables.
     *
-    * @param block        The block containins the statement
-    * @param statement    The statement to examine
+    * @param block The block containins the statement
+    * @param statement The statement to examine
     * @param combinations The regsiter combinations to test
     * @return A set with registers that are clobbered by all different register assignments in the combination
     */
@@ -124,7 +184,7 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
 
       Set<String> unknownFragments = new LinkedHashSet<>();
 
-      while (combinations.hasNext()) {
+      while(combinations.hasNext()) {
          RegisterCombination combination = combinations.next();
          // Reset register allocation to original zero page allocation
          new Pass4RegistersFinalize(getProgram()).allocate(false);
@@ -136,16 +196,16 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
          Pass4CodeGeneration.AsmCodegenAluState aluState = new Pass4CodeGeneration.AsmCodegenAluState();
          try {
             (new Pass4CodeGeneration(getProgram(), false)).generateStatementAsm(asm, block, statement, aluState, false);
-         } catch (AsmFragmentManager.UnknownFragmentException e) {
+         } catch(AsmFragmentManager.UnknownFragmentException e) {
             unknownFragments.add(e.getFragmentSignature());
             StringBuilder msg = new StringBuilder();
-            msg.append("Potential register analysis " + statement );
+            msg.append("Potential register analysis " + statement);
             msg.append(" missing fragment " + e.getFragmentSignature());
             msg.append(" allocation: ").append(combination.toString());
             getLog().append(msg.toString());
             continue;
-         } catch (AsmFragment.AluNotApplicableException e) {
-            if (getProgram().getLog().isVerboseUplift()) {
+         } catch(AsmFragment.AluNotApplicableException e) {
+            if(getProgram().getLog().isVerboseUplift()) {
                StringBuilder msg = new StringBuilder();
                msg.append("Potential register analysis ");
                msg.append("alu not applicable");
@@ -157,21 +217,21 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
          AsmClobber clobber = asm.getClobber();
          Collection<Registers.Register> clobberRegisters = Pass4AssertNoCpuClobber.getClobberRegisters(clobber);
          Iterator<Registers.Register> alwaysClobberIt = alwaysClobbered.iterator();
-         while (alwaysClobberIt.hasNext()) {
+         while(alwaysClobberIt.hasNext()) {
             Registers.Register alwaysClobberRegister = alwaysClobberIt.next();
-            if (!clobberRegisters.contains(alwaysClobberRegister)) {
+            if(!clobberRegisters.contains(alwaysClobberRegister)) {
                alwaysClobberIt.remove();
             }
          }
-         if (alwaysClobbered.isEmpty()) {
+         if(alwaysClobbered.isEmpty()) {
             // No register is always clobbered - abort combination search
             break;
          }
       }
 
-      if (unknownFragments.size() > 0) {
+      if(unknownFragments.size() > 0) {
          getLog().append("MISSING FRAGMENTS");
-         for (String unknownFragment : unknownFragments) {
+         for(String unknownFragment : unknownFragments) {
             getLog().append("  " + unknownFragment);
          }
          //throw new RuntimeException("Missing fragments!");
@@ -181,65 +241,4 @@ public class Pass4RegisterUpliftPotentialRegisterAnalysis extends Pass2Base {
    }
 
 
-   /**
-    * Get all variables referenced (or assigned) in a statement.
-    *
-    * @param statement The statement
-    * @return All variables referenced (or assigned) in the statement
-    */
-   public static Set<VariableRef> getReferencedVars(Statement statement) {
-      Set<VariableRef> referenced = new LinkedHashSet<>();
-      if (statement instanceof StatementAssignment) {
-         addReferenced(referenced, ((StatementAssignment) statement).getlValue());
-         addReferenced(referenced, ((StatementAssignment) statement).getrValue1());
-         addReferenced(referenced, ((StatementAssignment) statement).getrValue2());
-      } else if (statement instanceof StatementPhiBlock) {
-         for (StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
-            addReferenced(referenced, phiVariable.getVariable());
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-               addReferenced(referenced, phiRValue.getrValue());
-            }
-         }
-      } else if (statement instanceof StatementConditionalJump) {
-         addReferenced(referenced, ((StatementConditionalJump) statement).getrValue1());
-         addReferenced(referenced, ((StatementConditionalJump) statement).getrValue2());
-      }
-      return referenced;
-   }
-
-   private static void addReferenced(Set<VariableRef> referenced, RValue rValue) {
-      if (rValue instanceof VariableRef) {
-         referenced.add((VariableRef) rValue);
-      } else if (rValue instanceof PointerDereferenceSimple) {
-         addReferenced(referenced, ((PointerDereferenceSimple) rValue).getPointer());
-      } else if (rValue instanceof PointerDereferenceIndexed) {
-         addReferenced(referenced, ((PointerDereferenceIndexed) rValue).getPointer());
-         addReferenced(referenced, ((PointerDereferenceIndexed) rValue).getIndex());
-      }
-   }
-
-   /**
-    * Get all variables assigned a value in a statement
-    *
-    * @param statement The statement
-    * @return The variables assigned a value in the statement
-    */
-   public static Set<VariableRef> getAssignedVars(Statement statement) {
-      LinkedHashSet<VariableRef> variableRefs = new LinkedHashSet<>();
-      if (statement instanceof StatementPhiBlock) {
-         List<StatementPhiBlock.PhiVariable> phiVariables = ((StatementPhiBlock) statement).getPhiVariables();
-         for (StatementPhiBlock.PhiVariable phiVariable : phiVariables) {
-            variableRefs.add(phiVariable.getVariable());
-         }
-         return variableRefs;
-      } else if (statement instanceof StatementAssignment) {
-         LValue lValue = ((StatementAssignment) statement).getlValue();
-         if (lValue instanceof VariableRef) {
-            variableRefs.add((VariableRef) lValue);
-         }
-      }
-      return variableRefs;
-   }
-
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftRemains.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftRemains.java
index 242641e6a..e5cafb65c 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftRemains.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftRemains.java
@@ -25,9 +25,9 @@ public class Pass4RegisterUpliftRemains extends Pass2Base {
 
       Set<String> unknownFragments = new LinkedHashSet<>();
 
-      for (LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
-         if (equivalenceClass.getRegister().getType().equals(Registers.RegisterType.ZP_BYTE)) {
-            getLog().append("Attempting to uplift remaining variables in"+equivalenceClass);
+      for(LiveRangeEquivalenceClass equivalenceClass : equivalenceClasses) {
+         if(equivalenceClass.getRegister().getType().equals(Registers.RegisterType.ZP_BYTE)) {
+            getLog().append("Attempting to uplift remaining variables in" + equivalenceClass);
             RegisterCombinationIterator combinationIterator = new RegisterCombinationIterator(Arrays.asList(equivalenceClass), getProgram().getRegisterPotentials());
             VariableRef variableRef = equivalenceClass.getVariables().get(0);
             Scope testedScope = getProgram().getSymbolInfos().getVariable(variableRef).getScope();
@@ -35,9 +35,9 @@ public class Pass4RegisterUpliftRemains extends Pass2Base {
          }
       }
 
-      if (unknownFragments.size() > 0) {
+      if(unknownFragments.size() > 0) {
          getLog().append("MISSING FRAGMENTS");
-         for (String unknownFragment : unknownFragments) {
+         for(String unknownFragment : unknownFragments) {
             getLog().append("  " + unknownFragment);
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftScopeAnalysis.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftScopeAnalysis.java
index 0bbb6a16a..503f9cd76 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftScopeAnalysis.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftScopeAnalysis.java
@@ -2,7 +2,10 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /*** Find the variable equivalence classes to attempt to uplift in each scope */
 public class Pass4RegisterUpliftScopeAnalysis extends Pass2Base {
@@ -21,15 +24,15 @@ public class Pass4RegisterUpliftScopeAnalysis extends Pass2Base {
 
       Collection<Scope> allScopes = getProgram().getScope().getAllScopes(true);
       allScopes.add(getSymbols());
-      for (Scope scope : allScopes) {
+      for(Scope scope : allScopes) {
          ScopeRef scopeRef = scope.getRef();
          RegisterUpliftScope registerUpliftScope = registerUpliftProgram.addRegisterUpliftScope(scopeRef);
 
          // Find live range equivalence classes for the scope
          List<LiveRangeEquivalenceClass> equivalenceClasses = new ArrayList<>();
-         for (LiveRangeEquivalenceClass equivalenceClass : equivalenceClassSet.getEquivalenceClasses()) {
+         for(LiveRangeEquivalenceClass equivalenceClass : equivalenceClassSet.getEquivalenceClasses()) {
             VariableRef variableRef = equivalenceClass.getVariables().get(0);
-            if (variableRef.getScopeNames().equals(scopeRef.getFullName())) {
+            if(variableRef.getScopeNames().equals(scopeRef.getFullName())) {
                equivalenceClasses.add(equivalenceClass);
             }
          }
@@ -39,7 +42,7 @@ public class Pass4RegisterUpliftScopeAnalysis extends Pass2Base {
 
 
       List<RegisterUpliftScope> upliftScopes = registerUpliftProgram.getRegisterUpliftScopes();
-      Collections.sort(upliftScopes, (o1, o2) -> Double.compare(registerWeights.getTotalWeights(o2),registerWeights.getTotalWeights(o1)));
+      Collections.sort(upliftScopes, (o1, o2) -> Double.compare(registerWeights.getTotalWeights(o2), registerWeights.getTotalWeights(o1)));
       registerUpliftProgram.setRegisterUpliftScopes(upliftScopes);
 
       getProgram().setRegisterUpliftProgram(registerUpliftProgram);
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftStatic.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftStatic.java
index 143be94ea..fffc542e6 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftStatic.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegisterUpliftStatic.java
@@ -90,10 +90,10 @@ public class Pass4RegisterUpliftStatic extends Pass2Base {
             new HashSet<String>(),
             null);
 
-      if (success) {
+      if(success) {
          // If no clobber - Find value of the resulting allocation
          int combinationScore = Pass4RegisterUpliftCombinations.getAsmScore(getProgram());
-         if (getLog().isVerboseUplift()) {
+         if(getLog().isVerboseUplift()) {
             StringBuilder msg = new StringBuilder();
             msg.append("Static Uplift ");
             msg.append(combinationScore);
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4RegistersFinalize.java b/src/main/java/dk/camelot64/kickc/passes/Pass4RegistersFinalize.java
index 7f43be33c..b3d3095cd 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4RegistersFinalize.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4RegistersFinalize.java
@@ -2,7 +2,9 @@ package dk.camelot64.kickc.passes;
 
 import dk.camelot64.kickc.model.*;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Move register allocation from equivalence classes to RegisterAllocation.
@@ -10,17 +12,22 @@ import java.util.*;
  */
 public class Pass4RegistersFinalize extends Pass2Base {
 
+   /**
+    * The current zero page used to create new registers when needed.
+    */
+   private int currentZp = 2;
+
    public Pass4RegistersFinalize(Program program) {
       super(program);
    }
 
    public void allocate(boolean reallocateZp) {
       LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet = getProgram().getLiveRangeEquivalenceClassSet();
-      if (reallocateZp) {
+      if(reallocateZp) {
          reallocateZpRegisters(liveRangeEquivalenceClassSet);
       }
       liveRangeEquivalenceClassSet.storeRegisterAllocation();
-      if (reallocateZp) {
+      if(reallocateZp) {
          shortenZpRegisterNames();
       }
    }
@@ -31,36 +38,36 @@ public class Pass4RegistersFinalize extends Pass2Base {
    private void shortenZpRegisterNames() {
       Collection<Scope> allScopes = getProgram().getScope().getAllScopes(true);
       allScopes.add(getProgram().getScope());
-      for (Scope scope : allScopes) {
+      for(Scope scope : allScopes) {
          // Create initial short names - and remember the ones without "#"
-         for (Variable variable : scope.getAllVariables(false)) {
-            if (variable.getAllocation() != null && variable.getAllocation().isZp()) {
+         for(Variable variable : scope.getAllVariables(false)) {
+            if(variable.getAllocation() != null && variable.getAllocation().isZp()) {
                variable.setAsmName(variable.getLocalName());
             } else {
                variable.setAsmName(null);
             }
          }
-         for (ConstantVar constantVar : scope.getAllConstants(false)) {
+         for(ConstantVar constantVar : scope.getAllConstants(false)) {
             constantVar.setAsmName(constantVar.getLocalName());
          }
 
          // Find short asm names for all variables if possible
          Map<String, Registers.Register> shortNames = new LinkedHashMap<>();
 
-         for (Variable variable : scope.getAllVariables(false)) {
+         for(Variable variable : scope.getAllVariables(false)) {
             Registers.Register allocation = variable.getAllocation();
-            if (allocation != null && allocation.isZp()) {
+            if(allocation != null && allocation.isZp()) {
                String asmName = variable.getAsmName();
-               if (asmName.contains("#")) {
+               if(asmName.contains("#")) {
                   String shortName = asmName.substring(0, asmName.indexOf("#"));
-                  if (shortNames.get(shortName) == null || shortNames.get(shortName).equals(allocation)) {
+                  if(shortNames.get(shortName) == null || shortNames.get(shortName).equals(allocation)) {
                      // Short name is usable!
                      variable.setAsmName(shortName);
                      shortNames.put(shortName, allocation);
                      continue;
                   }
                }
-               if (shortNames.get(asmName) == null || shortNames.get(asmName).equals(allocation)) {
+               if(shortNames.get(asmName) == null || shortNames.get(asmName).equals(allocation)) {
                   // Try the full name instead
                   variable.setAsmName(asmName);
                   shortNames.put(asmName, allocation);
@@ -72,19 +79,19 @@ public class Pass4RegistersFinalize extends Pass2Base {
             }
          }
 
-         for (ConstantVar constantVar : scope.getAllConstants(false)) {
+         for(ConstantVar constantVar : scope.getAllConstants(false)) {
             String asmName = constantVar.getAsmName();
             Registers.Register allocation = new Registers.RegisterConstant(constantVar.getValue());
-            if (asmName.contains("#")) {
+            if(asmName.contains("#")) {
                String shortName = asmName.substring(0, asmName.indexOf("#"));
-               if (shortNames.get(shortName) == null || shortNames.get(shortName).equals(allocation)) {
+               if(shortNames.get(shortName) == null || shortNames.get(shortName).equals(allocation)) {
                   // Short name is usable!
                   constantVar.setAsmName(shortName);
                   shortNames.put(shortName, allocation);
                   continue;
                }
             }
-            if (shortNames.get(asmName) == null || shortNames.get(asmName).equals(allocation)) {
+            if(shortNames.get(asmName) == null || shortNames.get(asmName).equals(allocation)) {
                // Try the full name instead
                constantVar.setAsmName(asmName);
                shortNames.put(asmName, allocation);
@@ -105,55 +112,50 @@ public class Pass4RegistersFinalize extends Pass2Base {
     * @param liveRangeEquivalenceClassSet The
     */
    private void reallocateZpRegisters(LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet) {
-      for (LiveRangeEquivalenceClass equivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+      for(LiveRangeEquivalenceClass equivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
          Registers.Register register = equivalenceClass.getRegister();
-         if (register == null || register.isZp()) {
+         if(register == null || register.isZp()) {
             String before = register == null ? null : register.toString();
             VariableRef variableRef = equivalenceClass.getVariables().get(0);
             Variable variable = getProgram().getSymbolInfos().getVariable(variableRef);
             register = allocateNewRegisterZp(variable);
             equivalenceClass.setRegister(register);
-            if (before == null || !before.equals(register.toString())) {
+            if(before == null || !before.equals(register.toString())) {
                getLog().append("Allocated " + (before == null ? "" : ("(was " + before + ") ")) + equivalenceClass.toString());
             }
          }
       }
    }
 
-   /**
-    * The current zero page used to create new registers when needed.
-    */
-   private int currentZp = 2;
-
    /**
     * Create a new register for a specific variable type.
     *
     * @param variable The variable to create a register for.
-    *                 The register type created uses one or more zero page locations based on the variable type
+    * The register type created uses one or more zero page locations based on the variable type
     * @return The new zeropage register
     */
    private Registers.Register allocateNewRegisterZp(Variable variable) {
       SymbolType varType = variable.getType();
-      if (SymbolType.isByte(varType)) {
+      if(SymbolType.isByte(varType)) {
          return new Registers.RegisterZpByte(currentZp++);
-      } else if (SymbolType.isSByte(varType)) {
+      } else if(SymbolType.isSByte(varType)) {
          return new Registers.RegisterZpByte(currentZp++);
-      } else if (SymbolType.isWord(varType)) {
+      } else if(SymbolType.isWord(varType)) {
          Registers.RegisterZpWord registerZpWord =
                new Registers.RegisterZpWord(currentZp);
          currentZp = currentZp + 2;
          return registerZpWord;
-      } else if (SymbolType.isSWord(varType)) {
+      } else if(SymbolType.isSWord(varType)) {
          Registers.RegisterZpWord registerZpWord =
                new Registers.RegisterZpWord(currentZp);
          currentZp = currentZp + 2;
          return registerZpWord;
-      } else if (varType.equals(SymbolType.BOOLEAN)) {
+      } else if(varType.equals(SymbolType.BOOLEAN)) {
          return new Registers.RegisterZpBool(currentZp++);
-      } else if (varType.equals(SymbolType.VOID)) {
+      } else if(varType.equals(SymbolType.VOID)) {
          // No need to setRegister register for VOID value
          return null;
-      } else if (varType instanceof SymbolTypePointer) {
+      } else if(varType instanceof SymbolTypePointer) {
          Registers.RegisterZpWord registerZpWord =
                new Registers.RegisterZpWord(currentZp);
          currentZp = currentZp + 2;
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4ZeroPageCoalesce.java b/src/main/java/dk/camelot64/kickc/passes/Pass4ZeroPageCoalesce.java
index 4db393bc6..ac8827a56 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass4ZeroPageCoalesce.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass4ZeroPageCoalesce.java
@@ -18,7 +18,7 @@ public class Pass4ZeroPageCoalesce extends Pass2Base {
       boolean change;
       do {
          change = coalesce(liveRangeEquivalenceClassSet);
-      } while (change);
+      } while(change);
 
    }
 
@@ -29,10 +29,10 @@ public class Pass4ZeroPageCoalesce extends Pass2Base {
     * @return true if any classes were coalesced. False otherwise.
     */
    private boolean coalesce(LiveRangeEquivalenceClassSet liveRangeEquivalenceClassSet) {
-      for (LiveRangeEquivalenceClass myEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
-         for (LiveRangeEquivalenceClass otherEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
-            if (!myEquivalenceClass.equals(otherEquivalenceClass)) {
-               if (canCoalesce(myEquivalenceClass, otherEquivalenceClass)) {
+      for(LiveRangeEquivalenceClass myEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+         for(LiveRangeEquivalenceClass otherEquivalenceClass : liveRangeEquivalenceClassSet.getEquivalenceClasses()) {
+            if(!myEquivalenceClass.equals(otherEquivalenceClass)) {
+               if(canCoalesce(myEquivalenceClass, otherEquivalenceClass)) {
                   getLog().append("Coalescing zero page register [ " + myEquivalenceClass + " ] with [ " + otherEquivalenceClass + " ]");
                   liveRangeEquivalenceClassSet.consolidate(myEquivalenceClass, otherEquivalenceClass);
                   // Reset the program register allocation
@@ -53,20 +53,20 @@ public class Pass4ZeroPageCoalesce extends Pass2Base {
       // Types match
       Registers.Register myRegister = myEquivalenceClass.getRegister();
       Registers.Register otherRegister = otherEquivalenceClass.getRegister();
-      if (myRegister.isZp() && otherRegister.isZp()) {
+      if(myRegister.isZp() && otherRegister.isZp()) {
          // Both registers are on Zero Page
 
-         if (myRegister.getType().equals(otherRegister.getType())) {
+         if(myRegister.getType().equals(otherRegister.getType())) {
             // Both registers have the same Zero Page size
 
             // Reset the program register allocation to the one specified in the equivalence class set
             getProgram().getLiveRangeEquivalenceClassSet().storeRegisterAllocation();
             // Try out the coalesce to test if it works
-            for (VariableRef var : otherEquivalenceClass.getVariables()) {
+            for(VariableRef var : otherEquivalenceClass.getVariables()) {
                Variable variable = getProgram().getSymbolInfos().getVariable(var);
                variable.setAllocation(myRegister);
             }
-            if (!Pass4RegisterUpliftCombinations.isAllocationOverlapping(getProgram())) {
+            if(!Pass4RegisterUpliftCombinations.isAllocationOverlapping(getProgram())) {
                // Live ranges do not overlap
                // Perform coalesce!
                return true;
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5AsmOptimization.java b/src/main/java/dk/camelot64/kickc/passes/Pass5AsmOptimization.java
index 21fd29dcc..bb7acafdc 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5AsmOptimization.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5AsmOptimization.java
@@ -44,10 +44,10 @@ public abstract class Pass5AsmOptimization {
 
    public void remove(List<AsmLine> remove) {
       Collection<AsmSegment> segments = getAsmProgram().getSegments();
-      for (AsmSegment segment : segments) {
-         for (Iterator<AsmLine> iterator = segment.getLines().iterator(); iterator.hasNext(); ) {
+      for(AsmSegment segment : segments) {
+         for(Iterator<AsmLine> iterator = segment.getLines().iterator(); iterator.hasNext(); ) {
             AsmLine line = iterator.next();
-            if (remove.contains(line)) {
+            if(remove.contains(line)) {
                getLog().append("Removing instruction " + line.getAsm());
                iterator.remove();
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
index ec3e78509..d36d1cb90 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5DoubleJumpElimination.java
@@ -3,9 +3,7 @@ package dk.camelot64.kickc.passes;
 import dk.camelot64.kickc.asm.*;
 import dk.camelot64.kickc.model.Program;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,25 +22,25 @@ public class Pass5DoubleJumpElimination extends Pass5AsmOptimization {
       String currentScope = "";
       String currentLabel = null;
       Map<String, String> immediateJumps = new LinkedHashMap<>();
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
-            if (line instanceof AsmScopeBegin) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
+            if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
                currentLabel = null;
-            } else if (line instanceof AsmScopeEnd) {
+            } else if(line instanceof AsmScopeEnd) {
                currentScope = "";
                currentLabel = null;
-            } else if (line instanceof AsmLabel) {
+            } else if(line instanceof AsmLabel) {
                currentLabel = ((AsmLabel) line).getLabel();
-            } else if (line instanceof AsmComment || line instanceof AsmConstant || line instanceof AsmLabelDecl) {
+            } else if(line instanceof AsmComment || line instanceof AsmConstant || line instanceof AsmLabelDecl) {
                // ignore
-            } else if (line instanceof AsmBasicUpstart || line instanceof AsmDataNumeric || line instanceof AsmDataFill || line instanceof AsmDataString || line instanceof AsmDataAlignment || line instanceof AsmSetPc) {
+            } else if(line instanceof AsmBasicUpstart || line instanceof AsmDataNumeric || line instanceof AsmDataFill || line instanceof AsmDataString || line instanceof AsmDataAlignment || line instanceof AsmSetPc) {
                currentLabel = null;
-            } else if (line instanceof AsmInstruction) {
-               if (currentLabel != null) {
+            } else if(line instanceof AsmInstruction) {
+               if(currentLabel != null) {
                   AsmInstruction asmInstruction = (AsmInstruction) line;
                   AsmInstructionType jmpType = AsmInstructionSet.getInstructionType("jmp", AsmAddressingMode.ABS, false);
-                  if (asmInstruction.getType().equals(jmpType)) {
+                  if(asmInstruction.getType().equals(jmpType)) {
                      immediateJumps.put(currentScope + "::" + currentLabel, asmInstruction.getParameter());
                   }
                }
@@ -54,18 +52,18 @@ public class Pass5DoubleJumpElimination extends Pass5AsmOptimization {
       }
 
       // Look through the code for double-jumps
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
-            if (line instanceof AsmScopeBegin) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
+            if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
-            } else if (line instanceof AsmScopeEnd) {
+            } else if(line instanceof AsmScopeEnd) {
                currentScope = "";
-            } else if (line instanceof AsmInstruction) {
+            } else if(line instanceof AsmInstruction) {
                AsmInstruction asmInstruction = (AsmInstruction) line;
-               if (asmInstruction.getType().isJump()) {
+               if(asmInstruction.getType().isJump()) {
                   String immediateJmpTarget = immediateJumps.get(currentScope + "::" + asmInstruction.getParameter());
-                  if(immediateJmpTarget!=null) {
-                     getLog().append("Skipping double jump to "+immediateJmpTarget+" in "+asmInstruction.toString());
+                  if(immediateJmpTarget != null) {
+                     getLog().append("Skipping double jump to " + immediateJmpTarget + " in " + asmInstruction.toString());
                      asmInstruction.setParameter(immediateJmpTarget);
                      optimized = true;
                   }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5NextJumpElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5NextJumpElimination.java
index 36c10fbf0..eb1fc05fd 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5NextJumpElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5NextJumpElimination.java
@@ -18,22 +18,22 @@ public class Pass5NextJumpElimination extends Pass5AsmOptimization {
    public boolean optimize() {
       List<AsmLine> removeLines = new ArrayList<>();
       AsmInstruction candidate = null;
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
             if(line instanceof AsmScopeBegin || line instanceof AsmScopeEnd) {
                candidate = null;
             }
-            if (candidate != null) {
-               if (line instanceof AsmLabel) {
-                  if (((AsmLabel) line).getLabel().equals(candidate.getParameter())) {
+            if(candidate != null) {
+               if(line instanceof AsmLabel) {
+                  if(((AsmLabel) line).getLabel().equals(candidate.getParameter())) {
                      removeLines.add(candidate);
                   }
                }
             }
-            if (line instanceof AsmInstruction) {
+            if(line instanceof AsmInstruction) {
                candidate = null;
                AsmInstruction instruction = (AsmInstruction) line;
-               if (instruction.getType().isJump() && !instruction.getType().getMnemnonic().equals("jsr")) {
+               if(instruction.getType().isJump() && !instruction.getType().getMnemnonic().equals("jsr")) {
                   candidate = instruction;
                }
             }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5RedundantLabelElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5RedundantLabelElimination.java
index 847cd85ca..c5759dbe3 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5RedundantLabelElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5RedundantLabelElimination.java
@@ -23,21 +23,21 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
 
       List<AsmLine> removeLines = new ArrayList<>();
       String currentScope = "";
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
             if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
             } else if(line instanceof AsmScopeEnd) {
                currentScope = "";
-            } else if (line instanceof AsmInstruction) {
+            } else if(line instanceof AsmInstruction) {
                AsmInstruction instruction = (AsmInstruction) line;
-               if (instruction.getType().isJump()) {
+               if(instruction.getType().isJump()) {
                   String labelStr = instruction.getParameter();
-                  if (!labelStr.contains("!")) {
+                  if(!labelStr.contains("!")) {
                      // If redundant - Replace with the shortest
-                     for (RedundantLabels redundantLabels : redundantLabelSet) {
-                        if (redundantLabels.getScope().equals(currentScope) && redundantLabels.isRedundant(labelStr)) {
-                           getLog().append("Replacing label "+labelStr+" with "+redundantLabels.getKeep());
+                     for(RedundantLabels redundantLabels : redundantLabelSet) {
+                        if(redundantLabels.getScope().equals(currentScope) && redundantLabels.isRedundant(labelStr)) {
+                           getLog().append("Replacing label " + labelStr + " with " + redundantLabels.getKeep());
                            instruction.setParameter(redundantLabels.getKeep());
                         }
                      }
@@ -47,7 +47,7 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
                AsmLabel label = (AsmLabel) line;
                String labelStr = label.getLabel();
                if(!labelStr.contains("!")) {
-                  for (RedundantLabels redundantLabels : redundantLabelSet) {
+                  for(RedundantLabels redundantLabels : redundantLabelSet) {
                      if(redundantLabels.getScope().equals(currentScope) && redundantLabels.isRedundant(labelStr)) {
                         removeLines.add(label);
                      }
@@ -70,8 +70,8 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
       List<RedundantLabels> redundantLabelSet = new ArrayList<>();
       RedundantLabels current = null;
       String currentScope = "";
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
             boolean handled = false;
             if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
@@ -81,7 +81,7 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
                AsmLabel label = (AsmLabel) line;
                String labelStr = label.getLabel();
                if(!labelStr.contains("!")) {
-                  if(current==null) {
+                  if(current == null) {
                      current = new RedundantLabels(currentScope, labelStr);
                   } else {
                      current.add(labelStr);
@@ -90,7 +90,7 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
                }
             }
             if(!handled) {
-               if(current!=null && current.size()>1) {
+               if(current != null && current.size() > 1) {
                   redundantLabelSet.add(current);
                }
                current = null;
@@ -116,7 +116,7 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
       }
 
       public void add(String label) {
-         if (keep.length() < label.length()) {
+         if(keep.length() < label.length()) {
             redundant.add(label);
          } else {
             redundant.add(keep);
@@ -125,7 +125,7 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
       }
 
       public int size() {
-         return redundant.size()+1;
+         return redundant.size() + 1;
       }
 
       public String getScope() {
@@ -142,7 +142,4 @@ public class Pass5RedundantLabelElimination extends Pass5AsmOptimization {
    }
 
 
-
-
-
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5RelabelLongLabels.java b/src/main/java/dk/camelot64/kickc/passes/Pass5RelabelLongLabels.java
index 4e4135223..8ecbbae63 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5RelabelLongLabels.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5RelabelLongLabels.java
@@ -24,16 +24,16 @@ public class Pass5RelabelLongLabels extends Pass5AsmOptimization {
       // Scope->Set<Labels>
       Map<String, Set<String>> allLabels = new LinkedHashMap<>();
       String currentScope = "";
-      for (AsmSegment asmSegment : getAsmProgram().getSegments()) {
-         for (AsmLine asmLine : asmSegment.getLines()) {
-            if (asmLine instanceof AsmScopeBegin) {
+      for(AsmSegment asmSegment : getAsmProgram().getSegments()) {
+         for(AsmLine asmLine : asmSegment.getLines()) {
+            if(asmLine instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) asmLine).getLabel();
-            } else if (asmLine instanceof AsmScopeEnd) {
+            } else if(asmLine instanceof AsmScopeEnd) {
                currentScope = "";
-            } else if (asmLine instanceof AsmLabel) {
+            } else if(asmLine instanceof AsmLabel) {
                AsmLabel asmLabel = (AsmLabel) asmLine;
                Set<String> scopeLabels = allLabels.get(currentScope);
-               if (scopeLabels == null) {
+               if(scopeLabels == null) {
                   scopeLabels = new LinkedHashSet<>();
                   allLabels.put(currentScope, scopeLabels);
                }
@@ -47,26 +47,26 @@ public class Pass5RelabelLongLabels extends Pass5AsmOptimization {
       // Find relabels for all long labels
       // Scope->(Label->NewLabel)
       Map<String, Map<String, String>> relabels = new LinkedHashMap<>();
-      for (AsmSegment asmSegment : getAsmProgram().getSegments()) {
-         for (AsmLine asmLine : asmSegment.getLines()) {
-            if (asmLine instanceof AsmScopeBegin) {
+      for(AsmSegment asmSegment : getAsmProgram().getSegments()) {
+         for(AsmLine asmLine : asmSegment.getLines()) {
+            if(asmLine instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) asmLine).getLabel();
-            } else if (asmLine instanceof AsmScopeEnd) {
+            } else if(asmLine instanceof AsmScopeEnd) {
                currentScope = "";
-            } else if (asmLine instanceof AsmLabel) {
+            } else if(asmLine instanceof AsmLabel) {
                AsmLabel asmLabel = (AsmLabel) asmLine;
-               if (asmLabel.getLabel().contains("_from_")) {
+               if(asmLabel.getLabel().contains("_from_")) {
                   // Found a long label
                   Set<String> scopeLabels = allLabels.get(currentScope);
                   Map<String, String> scopeRelabels = relabels.get(currentScope);
-                  if (scopeRelabels == null) {
+                  if(scopeRelabels == null) {
                      scopeRelabels = new LinkedHashMap<>();
                      relabels.put(currentScope, scopeRelabels);
                   }
                   // Find new short unused label
                   int labelIdx = 1;
                   String newLabel = "b" + labelIdx;
-                  while (scopeLabels.contains(newLabel) || scopeRelabels.containsValue(newLabel)) {
+                  while(scopeLabels.contains(newLabel) || scopeRelabels.containsValue(newLabel)) {
                      newLabel = "b" + labelIdx++;
                   }
                   getLog().append("Relabelling long label " + asmLabel.getLabel() + " to " + newLabel);
@@ -78,29 +78,29 @@ public class Pass5RelabelLongLabels extends Pass5AsmOptimization {
       }
 
       // Execute relabelling
-      for (AsmSegment asmSegment : getAsmProgram().getSegments()) {
-         for (AsmLine asmLine : asmSegment.getLines()) {
-            if (asmLine instanceof AsmScopeBegin) {
+      for(AsmSegment asmSegment : getAsmProgram().getSegments()) {
+         for(AsmLine asmLine : asmSegment.getLines()) {
+            if(asmLine instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) asmLine).getLabel();
-            } else if (asmLine instanceof AsmScopeEnd) {
+            } else if(asmLine instanceof AsmScopeEnd) {
                currentScope = "";
-            } else if (asmLine instanceof AsmLabel) {
+            } else if(asmLine instanceof AsmLabel) {
                AsmLabel asmLabel = (AsmLabel) asmLine;
                Map<String, String> scopeRelabels = relabels.get(currentScope);
-               if (scopeRelabels != null) {
+               if(scopeRelabels != null) {
                   String newLabel = scopeRelabels.get(asmLabel.getLabel());
-                  if (newLabel != null) {
+                  if(newLabel != null) {
                      asmLabel.setLabel(newLabel);
                   }
                }
-            } else if (asmLine instanceof AsmInstruction) {
+            } else if(asmLine instanceof AsmInstruction) {
                AsmInstruction asmInstruction = (AsmInstruction) asmLine;
-               if (asmInstruction.getType().isJump()) {
+               if(asmInstruction.getType().isJump()) {
                   String parameter = asmInstruction.getParameter();
                   Map<String, String> scopeRelabels = relabels.get(currentScope);
-                  if (scopeRelabels != null) {
+                  if(scopeRelabels != null) {
                      String newLabel = scopeRelabels.get(parameter);
-                     if (newLabel != null) {
+                     if(newLabel != null) {
                         asmInstruction.setParameter(newLabel);
                      }
                   }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5UnnecesaryLoadElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5UnnecesaryLoadElimination.java
index a83385e13..07b54758d 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5UnnecesaryLoadElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5UnnecesaryLoadElimination.java
@@ -21,98 +21,98 @@ public class Pass5UnnecesaryLoadElimination extends Pass5AsmOptimization {
       //List<AsmLine> removes = new ArrayList<>();
       boolean modified = false;
 
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
          List<AsmLine> lines = segment.getLines();
          ListIterator<AsmLine> lineIt = lines.listIterator();
-         while (lineIt.hasNext()) {
+         while(lineIt.hasNext()) {
             AsmLine line = lineIt.next();
-            if (line instanceof AsmInstruction) {
+            if(line instanceof AsmInstruction) {
                AsmInstruction instruction = (AsmInstruction) line;
                AsmInstructionType instructionType = instruction.getType();
 
-               if (instructionType.getMnemnonic().equals("lda") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
+               if(instructionType.getMnemnonic().equals("lda") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
                   String immValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
+                  if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
                      modified = remove(lineIt);
-                  } else if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getX(), immValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TXA");
+                  } else if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getX(), immValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TXA");
                      instruction.setType(AsmInstructionSet.getInstructionType("txa", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
-                  } else if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getY(), immValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TYA");
+                  } else if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getY(), immValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TYA");
                      instruction.setType(AsmInstructionSet.getInstructionType("tya", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("lda") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP)||instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
+               if(instructionType.getMnemnonic().equals("lda") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP) || instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
                   String memValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
+                  if(instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
                      modified = remove(lineIt);
-                  } else if (instructionValues.getxMem() != null && instructionValues.getxMem().equals(memValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TXA");
+                  } else if(instructionValues.getxMem() != null && instructionValues.getxMem().equals(memValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TXA");
                      instruction.setType(AsmInstructionSet.getInstructionType("txa", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
-                  } else if (instructionValues.getyMem() != null && instructionValues.getyMem().equals(memValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TYA");
+                  } else if(instructionValues.getyMem() != null && instructionValues.getyMem().equals(memValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TYA");
                      instruction.setType(AsmInstructionSet.getInstructionType("tya", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("ldx") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
+               if(instructionType.getMnemnonic().equals("ldx") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
                   String immValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getX(), immValue)) {
+                  if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getX(), immValue)) {
                      modified = remove(lineIt);
-                  } else if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TAX");
+                  } else if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TAX");
                      instruction.setType(AsmInstructionSet.getInstructionType("tax", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("ldx") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP)||instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
+               if(instructionType.getMnemnonic().equals("ldx") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP) || instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
                   String memValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (instructionValues.getxMem() != null && instructionValues.getxMem().equals(memValue)) {
+                  if(instructionValues.getxMem() != null && instructionValues.getxMem().equals(memValue)) {
                      modified = remove(lineIt);
-                  } else if (instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TAX");
+                  } else if(instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TAX");
                      instruction.setType(AsmInstructionSet.getInstructionType("tax", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("ldy") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
+               if(instructionType.getMnemnonic().equals("ldy") && instructionType.getAddressingMode().equals(AsmAddressingMode.IMM)) {
                   String immValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getY(), immValue)) {
+                  if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getY(), immValue)) {
                      modified = remove(lineIt);
-                  } else if (AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TAY");
+                  } else if(AsmProgramStaticRegisterValues.matchImm(instructionValues.getA(), immValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TAY");
                      instruction.setType(AsmInstructionSet.getInstructionType("tay", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("ldy") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP)||instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
+               if(instructionType.getMnemnonic().equals("ldy") && (instructionType.getAddressingMode().equals(AsmAddressingMode.ZP) || instructionType.getAddressingMode().equals(AsmAddressingMode.ABS))) {
                   String memValue = instruction.getParameter();
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (instructionValues.getyMem() != null && instructionValues.getyMem().equals(memValue)) {
+                  if(instructionValues.getyMem() != null && instructionValues.getyMem().equals(memValue)) {
                      modified = remove(lineIt);
-                  } else  if (instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
-                     getLog().append("Replacing instruction "+instruction+" with TAY");
+                  } else if(instructionValues.getaMem() != null && instructionValues.getaMem().equals(memValue)) {
+                     getLog().append("Replacing instruction " + instruction + " with TAY");
                      instruction.setType(AsmInstructionSet.getInstructionType("tay", AsmAddressingMode.NON, false));
                      instruction.setParameter(null);
                   }
                }
-               if (instructionType.getMnemnonic().equals("clc")) {
+               if(instructionType.getMnemnonic().equals("clc")) {
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (Boolean.FALSE.equals(instructionValues.getC())) {
+                  if(Boolean.FALSE.equals(instructionValues.getC())) {
                      modified = remove(lineIt);
                   }
                }
-               if (instructionType.getMnemnonic().equals("sec")) {
+               if(instructionType.getMnemnonic().equals("sec")) {
                   AsmProgramStaticRegisterValues.AsmRegisterValues instructionValues = staticValues.getValues(instruction);
-                  if (Boolean.TRUE.equals(instructionValues.getC())) {
+                  if(Boolean.TRUE.equals(instructionValues.getC())) {
                      modified = remove(lineIt);
                   }
                }
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5UnreachableCodeElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5UnreachableCodeElimination.java
index 9295304f6..cb4370db0 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5UnreachableCodeElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5UnreachableCodeElimination.java
@@ -23,22 +23,22 @@ public class Pass5UnreachableCodeElimination extends Pass5AsmOptimization {
 
       // Find RTS/JMP followed by code
       boolean afterExit = false;
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
          ListIterator<AsmLine> lineIt = segment.getLines().listIterator();
-         while (lineIt.hasNext()) {
+         while(lineIt.hasNext()) {
             AsmLine line = lineIt.next();
-            if (line instanceof AsmInstruction) {
-               if (afterExit) {
-                  getLog().append("Removing unreachable instruction "+line.toString());
+            if(line instanceof AsmInstruction) {
+               if(afterExit) {
+                  getLog().append("Removing unreachable instruction " + line.toString());
                   lineIt.remove();
                   optimized = true;
                } else {
                   AsmInstruction asmInstruction = (AsmInstruction) line;
-                  if (asmInstruction.getType().getMnemnonic().equals("rts") || asmInstruction.getType().getMnemnonic().equals("jmp")) {
+                  if(asmInstruction.getType().getMnemnonic().equals("rts") || asmInstruction.getType().getMnemnonic().equals("jmp")) {
                      afterExit = true;
                   }
                }
-            } else if(line instanceof AsmComment ) {
+            } else if(line instanceof AsmComment) {
                // ignore comments
             } else {
                afterExit = false;
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java
index e2c4a0c4e..a24da778b 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java
@@ -22,8 +22,8 @@ public class Pass5UnusedLabelElimination extends Pass5AsmOptimization {
    public boolean optimize() {
       Set<String> usedLabels = new LinkedHashSet<>();
       String currentScope = "";
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
-         for (AsmLine line : segment.getLines()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
+         for(AsmLine line : segment.getLines()) {
             if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
             } else if(line instanceof AsmScopeEnd) {
@@ -31,30 +31,30 @@ public class Pass5UnusedLabelElimination extends Pass5AsmOptimization {
             } else if(line instanceof AsmInstruction) {
                AsmInstruction instruction = (AsmInstruction) line;
                if(instruction.getType().isJump()) {
-                  String labelStr = currentScope+"::"+instruction.getParameter();
+                  String labelStr = currentScope + "::" + instruction.getParameter();
                   usedLabels.add(labelStr);
                }
             }
          }
       }
       List<AsmLine> removeLines = new ArrayList<>();
-      for (AsmSegment segment : getAsmProgram().getSegments()) {
+      for(AsmSegment segment : getAsmProgram().getSegments()) {
          Integer statementIdx = segment.getStatementIdx();
-         if(statementIdx!=null) {
+         if(statementIdx != null) {
             Statement statement = getProgram().getStatementInfos().getStatement(statementIdx);
             if(statement instanceof StatementAsm) {
                // Skip ASM statement
                continue;
             }
          }
-         for (AsmLine line : segment.getLines()) {
+         for(AsmLine line : segment.getLines()) {
             if(line instanceof AsmScopeBegin) {
                currentScope = ((AsmScopeBegin) line).getLabel();
             } else if(line instanceof AsmScopeEnd) {
                currentScope = "";
             } else if(line instanceof AsmLabel) {
                AsmLabel label = (AsmLabel) line;
-               String labelStr = currentScope+"::"+label.getLabel();
+               String labelStr = currentScope + "::" + label.getLabel();
                if(!labelStr.contains("!") && !usedLabels.contains(labelStr)) {
                   removeLines.add(label);
                }
diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNEliminateUnusedVars.java b/src/main/java/dk/camelot64/kickc/passes/PassNEliminateUnusedVars.java
index 8f8f2002e..80e9fa6a5 100644
--- a/src/main/java/dk/camelot64/kickc/passes/PassNEliminateUnusedVars.java
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNEliminateUnusedVars.java
@@ -20,15 +20,15 @@ public class PassNEliminateUnusedVars extends Pass2SsaOptimization {
       new PassNVariableReferenceInfos(getProgram()).generateVariableReferenceInfos();
       VariableReferenceInfos referenceInfos = getProgram().getVariableReferenceInfos();
       boolean modified = false;
-      for (ControlFlowBlock block : getGraph().getAllBlocks()) {
+      for(ControlFlowBlock block : getGraph().getAllBlocks()) {
          ListIterator<Statement> stmtIt = block.getStatements().listIterator();
-         while (stmtIt.hasNext()) {
+         while(stmtIt.hasNext()) {
             Statement statement = stmtIt.next();
-            if (statement instanceof StatementAssignment) {
+            if(statement instanceof StatementAssignment) {
                StatementAssignment assignment = (StatementAssignment) statement;
                LValue lValue = assignment.getlValue();
-               if (lValue instanceof VariableRef && referenceInfos.isUnused((VariableRef) lValue)) {
-                  getLog().append("Eliminating unused variable "+ lValue.toString(getProgram()) + " and assignment "+ assignment.toString(getProgram(), false));
+               if(lValue instanceof VariableRef && referenceInfos.isUnused((VariableRef) lValue)) {
+                  getLog().append("Eliminating unused variable " + lValue.toString(getProgram()) + " and assignment " + assignment.toString(getProgram(), false));
                   stmtIt.remove();
                   Variable variable = getScope().getVariable((VariableRef) lValue);
                   variable.getScope().remove(variable);
@@ -38,7 +38,7 @@ public class PassNEliminateUnusedVars extends Pass2SsaOptimization {
                StatementCall call = (StatementCall) statement;
                LValue lValue = call.getlValue();
                if(lValue instanceof VariableRef && referenceInfos.isUnused((VariableRef) lValue)) {
-                  getLog().append("Eliminating unused variable - keeping the call "+ lValue.toString(getProgram()));
+                  getLog().append("Eliminating unused variable - keeping the call " + lValue.toString(getProgram()));
                   Variable variable = getScope().getVariable((VariableRef) lValue);
                   variable.getScope().remove(variable);
                   call.setlValue(null);
@@ -51,7 +51,7 @@ public class PassNEliminateUnusedVars extends Pass2SsaOptimization {
       Collection<ConstantVar> allConstants = getScope().getAllConstants(true);
       for(ConstantVar constant : allConstants) {
          if(referenceInfos.isUnused(constant.getRef())) {
-            getLog().append("Eliminating unused constant "+ constant.toString(getProgram()));
+            getLog().append("Eliminating unused constant " + constant.toString(getProgram()));
             constant.getScope().remove(constant);
             modified = true;
          }
diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNStatementIndices.java b/src/main/java/dk/camelot64/kickc/passes/PassNStatementIndices.java
index dd54a0db1..4fe653fd9 100644
--- a/src/main/java/dk/camelot64/kickc/passes/PassNStatementIndices.java
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNStatementIndices.java
@@ -4,7 +4,9 @@ package dk.camelot64.kickc.passes;
  * Identify the alive intervals for all variables. Add the intervals to the ProgramScope.
  */
 
-import dk.camelot64.kickc.model.*;
+import dk.camelot64.kickc.model.ControlFlowBlock;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.Statement;
 
 public class PassNStatementIndices extends Pass2Base {
 
@@ -17,8 +19,8 @@ public class PassNStatementIndices extends Pass2Base {
     */
    public void generateStatementIndices() {
       int currentIdx = 0;
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             statement.setIndex(currentIdx++);
          }
       }
@@ -28,8 +30,8 @@ public class PassNStatementIndices extends Pass2Base {
     * Clear index numbers for all statements in the control flow graph.
     */
    public void clearStatementIndices() {
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         for (Statement statement : block.getStatements()) {
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         for(Statement statement : block.getStatements()) {
             statement.setIndex(null);
          }
       }
diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNVariableReferenceInfos.java b/src/main/java/dk/camelot64/kickc/passes/PassNVariableReferenceInfos.java
index c4a2b09b6..1a3a34cce 100644
--- a/src/main/java/dk/camelot64/kickc/passes/PassNVariableReferenceInfos.java
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNVariableReferenceInfos.java
@@ -13,245 +13,9 @@ public class PassNVariableReferenceInfos extends Pass2Base {
       super(program);
    }
 
-   /** Create defined/referenced maps */
-   public void generateVariableReferenceInfos() {
-      LinkedHashMap<LabelRef, Collection<VariableRef>> blockReferencedVars = new LinkedHashMap<>();
-      LinkedHashMap<LabelRef, Collection<VariableRef>> blockUsedVars = new LinkedHashMap<>();
-      LinkedHashMap<Integer, Collection<VariableRef>> stmtReferenced = new LinkedHashMap<>();
-      LinkedHashMap<Integer, Collection<VariableRef>> stmtDefined = new LinkedHashMap<>();
-      LinkedHashMap<VariableRef, Integer> varDefineStmts = new LinkedHashMap<>();
-      LinkedHashMap<VariableRef, Collection<Integer>> varRefStmts = new LinkedHashMap<>();
-      LinkedHashMap<ConstantRef, Collection<Integer>> constStmts = new LinkedHashMap<>();
-      for (ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
-         LabelRef blockLabel = block.getLabel();
-         blockReferencedVars.put(blockLabel, getReferencedVars(blockLabel, new ArrayList<>()));
-         blockUsedVars.put(blockLabel, getUsedVars(blockLabel, new ArrayList<>()));
-         for (Statement statement : block.getStatements()) {
-            Collection<VariableRef> defined = getDefinedVars(statement);
-            Collection<VariableRef> referencedVars = getReferencedVars(statement);
-            // Add variable definitions to the statement
-            stmtDefined.put(statement.getIndex(), defined);
-            // Add variable reference to the statement
-            stmtReferenced.put(statement.getIndex(), referencedVars);
-            // Identify statement defining variables
-            for (VariableRef variableRef : defined) {
-               varDefineStmts.put(variableRef, statement.getIndex());
-            }
-            // Gather statements referencing variables
-            for (VariableRef variableRef : referencedVars) {
-               Collection<Integer> stmts = varRefStmts.get(variableRef);
-               if(stmts==null) {
-                  stmts = new LinkedHashSet<>();
-                  varRefStmts.put(variableRef, stmts);
-               }
-               stmts.add(statement.getIndex());
-            }
-            // Gather statements referencing constants
-            Collection<ConstantRef> referencedConsts = getReferencedConsts(statement);
-            for(ConstantRef constantRef : referencedConsts) {
-               Collection<Integer> stmts = constStmts.get(constantRef);
-               if(stmts==null) {
-                  stmts = new LinkedHashSet<>();
-                  constStmts.put(constantRef, stmts);
-               }
-               stmts.add(statement.getIndex());
-            }
-         }
-      }
-      // Gather constants referencing other constants
-      LinkedHashMap<ConstantRef, Collection<ConstantRef>> constRefConsts = new LinkedHashMap<>();
-      for(ConstantVar constantVar : getSymbols().getAllConstants(true)) {
-         Collection<ConstantRef> referencedConsts = getReferencedConsts(constantVar.getValue());
-         for(ConstantRef constantRef : referencedConsts) {
-            Collection<ConstantRef> consts = constRefConsts.get(constantRef);
-            if(consts==null) {
-               consts = new LinkedHashSet<>();
-               constRefConsts.put(constantRef, consts);
-            }
-            consts.add(constantVar.getRef());
-         }
-      }
-      getProgram().setVariableReferenceInfos(new VariableReferenceInfos(blockReferencedVars, blockUsedVars, stmtReferenced, stmtDefined, varDefineStmts, varRefStmts, constStmts, constRefConsts));
-   }
-
-   /**
-    * Get all variables used inside a block and its successors (including any called method)
-    * @param labelRef The block to examine
-    * @param  visited The blocks already visited during the search. Used to stop infinite recursion
-    * @return All used variables
-    */
-   private Collection<VariableRef> getUsedVars(LabelRef labelRef, Collection<LabelRef> visited) {
-      if (labelRef == null) {
-         return new ArrayList<>();
-      }
-      if (visited.contains(labelRef)) {
-         return new ArrayList<>();
-      }
-      visited.add(labelRef);
-      ControlFlowBlock block = getProgram().getGraph().getBlock(labelRef);
-      if (block == null) {
-         return new ArrayList<>();
-      }
-      LinkedHashSet<VariableRef> used = new LinkedHashSet<>();
-      for (Statement statement : block.getStatements()) {
-         used.addAll(getUsedVars(statement));
-         if (statement instanceof StatementCall) {
-            ProcedureRef procedure = ((StatementCall) statement).getProcedure();
-            used.addAll(getUsedVars(procedure.getLabelRef(), visited));
-         }
-      }
-      used.addAll(getUsedVars(block.getDefaultSuccessor(), visited));
-      used.addAll(getUsedVars(block.getConditionalSuccessor(), visited));
-      return used;
-   }
-
-   /**
-    * Get all variables used or defined inside a block and its successors (including any called method)
-    * @param labelRef The block to examine
-    * @param  visited The blocks already visited during the search. Used to stop infinite recursion
-    * @return All used variables
-    */
-   private Collection<VariableRef> getReferencedVars(LabelRef labelRef, Collection<LabelRef> visited) {
-      if (labelRef == null) {
-         return new ArrayList<>();
-      }
-      if (visited.contains(labelRef)) {
-         return new ArrayList<>();
-      }
-      visited.add(labelRef);
-      ControlFlowBlock block = getProgram().getGraph().getBlock(labelRef);
-      if (block == null) {
-         return new ArrayList<>();
-      }
-      LinkedHashSet<VariableRef> referenced = new LinkedHashSet<>();
-      for (Statement statement : block.getStatements()) {
-         referenced.addAll(getReferencedVars(statement));
-         if (statement instanceof StatementCall) {
-            ProcedureRef procedure = ((StatementCall) statement).getProcedure();
-            referenced.addAll(getReferencedVars(procedure.getLabelRef(), visited));
-         }
-      }
-      referenced.addAll(getReferencedVars(block.getDefaultSuccessor(), visited));
-      referenced.addAll(getReferencedVars(block.getConditionalSuccessor(), visited));
-      return referenced;
-   }
-
-   /**
-    * Get the variables defined by a statement
-    * @param stmt The statement
-    * @return Variables defined by the statement
-    */
-   private Collection<VariableRef> getDefinedVars(Statement stmt) {
-      if (stmt instanceof StatementAssignment) {
-         StatementAssignment assignment = (StatementAssignment) stmt;
-         LValue lValue = assignment.getlValue();
-         if (lValue instanceof VariableRef) {
-            return Arrays.asList((VariableRef) lValue);
-         }
-      } else if (stmt instanceof StatementPhiBlock) {
-         List<VariableRef> defined = new ArrayList<>();
-         StatementPhiBlock phi = (StatementPhiBlock) stmt;
-         for (StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
-            defined.add(phiVariable.getVariable());
-         }
-         return defined;
-      } else if (stmt instanceof StatementCall) {
-         List<VariableRef> defined = new ArrayList<>();
-         if(((StatementCall) stmt).getlValue() instanceof VariableRef) {
-            defined.add((VariableRef) ((StatementCall) stmt).getlValue());
-         }
-         return defined;
-      }
-      return new ArrayList<>();
-   }
-
-   /**
-    * Get the variables used, but not defined, in a statement
-    * @param statement The statement to examine
-    * @return The used variables (not including defined variables)
-    */
-   private  Collection<VariableRef> getUsedVars(Statement statement) {
-      LinkedHashSet<VariableRef> used = new LinkedHashSet<>();
-      used.addAll(getReferencedVars(statement));
-      used.removeAll(getDefinedVars(statement));
-      return used;
-   }
-
-   /**
-    * Get the variables referenced (used or defined) in a statement
-    * @param statement The statement to examine
-    * @return The referenced variables
-    */
-   private  Collection<VariableRef> getReferencedVars(Statement statement) {
-      LinkedHashSet<VariableRef> referencedVars = new LinkedHashSet<>();
-      for(SymbolRef symbolRef : getReferenced(statement)) {
-         if(symbolRef instanceof VariableRef) {
-            referencedVars.add((VariableRef) symbolRef);
-         }
-      }
-      return referencedVars;
-   }
-
-   /**
-    * Get the constants referenced (used or defined) in a statement
-    * @param statement The statement to examine
-    * @return The referenced constants
-    */
-   private  Collection<ConstantRef> getReferencedConsts(Statement statement) {
-      LinkedHashSet<ConstantRef> referencedConsts = new LinkedHashSet<>();
-      for(SymbolRef symbolRef : getReferenced(statement)) {
-         if(symbolRef instanceof ConstantRef) {
-            referencedConsts.add((ConstantRef) symbolRef);
-         }
-      }
-      return referencedConsts;
-   }
-
-   /**
-    * Get the variables / constants referenced (used or defined) in a statement
-    * @param statement The statement to examine
-    * @return The referenced variables / constants (VariableRef / ConstantRef)
-    */
-   private Collection<SymbolRef> getReferenced(Statement statement) {
-      LinkedHashSet<SymbolRef> referenced = new LinkedHashSet<>();
-      if (statement instanceof StatementPhiBlock) {
-         StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
-         for (StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
-            referenced.add(phiVariable.getVariable());
-            for (StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
-               referenced.addAll(getReferenced(phiRValue.getrValue()));
-            }
-         }
-      } else if (statement instanceof StatementAssignment) {
-         StatementAssignment assignment = (StatementAssignment) statement;
-         referenced.addAll(getReferenced(assignment.getlValue()));
-         referenced.addAll(getReferenced(assignment.getrValue1()));
-         referenced.addAll(getReferenced(assignment.getrValue2()));
-      } else if (statement instanceof StatementConditionalJump) {
-         StatementConditionalJump conditionalJump = (StatementConditionalJump) statement;
-         referenced.addAll(getReferenced(conditionalJump.getrValue1()));
-         referenced.addAll(getReferenced(conditionalJump.getrValue2()));
-      } else if (statement instanceof StatementCall) {
-         StatementCall call = (StatementCall) statement;
-         referenced.addAll(getReferenced(call.getlValue()));
-         if (call.getParameters() != null) {
-            for (RValue param : call.getParameters()) {
-               referenced.addAll(getReferenced(param));
-            }
-         }
-      } else if (statement instanceof StatementReturn) {
-         StatementReturn statementReturn = (StatementReturn) statement;
-         referenced.addAll(getReferenced(statementReturn.getValue()));
-      } else if (statement instanceof StatementAsm) {
-         // No references in ASM atm.
-      } else {
-         throw new RuntimeException("Unknown statement type " + statement);
-      }
-      return referenced;
-   }
-
    /**
     * Get all variables referenced in an rValue
+    *
     * @param rValue The rValue
     * @return All referenced variables
     */
@@ -267,6 +31,7 @@ public class PassNVariableReferenceInfos extends Pass2Base {
 
    /**
     * Get all constants referenced in an rValue
+    *
     * @param rValue The rValue
     * @return All referenced constants
     */
@@ -282,49 +47,50 @@ public class PassNVariableReferenceInfos extends Pass2Base {
 
    /**
     * Get all variables /constants referenced in an rValue
+    *
     * @param rValue The rValue
     * @return All referenced variables / constants
     */
    private static Collection<SymbolRef> getReferenced(RValue rValue) {
-      if (rValue == null) {
+      if(rValue == null) {
          return new ArrayList<>();
-      } else if (rValue instanceof ConstantBinary) {
+      } else if(rValue instanceof ConstantBinary) {
          Collection<SymbolRef> used = new LinkedHashSet<>();
          used.addAll(getReferenced(((ConstantBinary) rValue).getLeft()));
          used.addAll(getReferenced(((ConstantBinary) rValue).getRight()));
          return used;
-      } else if (rValue instanceof ConstantArrayList) {
+      } else if(rValue instanceof ConstantArrayList) {
          Collection<SymbolRef> used = new LinkedHashSet<>();
          for(ConstantValue elem : ((ConstantArrayList) rValue).getElements()) {
             used.addAll(getReferenced(elem));
          }
          return used;
-      } else if (rValue instanceof ConstantArrayFilled) {
+      } else if(rValue instanceof ConstantArrayFilled) {
          return new ArrayList<>();
-      } else if (rValue instanceof ConstantUnary) {
+      } else if(rValue instanceof ConstantUnary) {
          return getReferenced(((ConstantUnary) rValue).getOperand());
-      } else if (rValue instanceof ConstantRef) {
+      } else if(rValue instanceof ConstantRef) {
          return Arrays.asList((SymbolRef) rValue);
-      } else if (rValue instanceof ConstantString) {
+      } else if(rValue instanceof ConstantString) {
          return new ArrayList<>();
-      } else if (rValue instanceof ConstantInteger) {
+      } else if(rValue instanceof ConstantInteger) {
          return new ArrayList<>();
-      } else if (rValue instanceof ConstantBool) {
+      } else if(rValue instanceof ConstantBool) {
          return new ArrayList<>();
-      } else if (rValue instanceof ConstantChar) {
+      } else if(rValue instanceof ConstantChar) {
          return new ArrayList<>();
-      } else if (rValue instanceof PointerDereferenceSimple) {
+      } else if(rValue instanceof PointerDereferenceSimple) {
          return getReferenced(((PointerDereferenceSimple) rValue).getPointer());
-      } else if (rValue instanceof PointerDereferenceIndexed) {
+      } else if(rValue instanceof PointerDereferenceIndexed) {
          Collection<SymbolRef> used = new LinkedHashSet<>();
          used.addAll(getReferenced(((PointerDereferenceIndexed) rValue).getPointer()));
          used.addAll(getReferenced(((PointerDereferenceIndexed) rValue).getIndex()));
          return used;
-      } else if (rValue instanceof VariableRef) {
+      } else if(rValue instanceof VariableRef) {
          return Arrays.asList((SymbolRef) rValue);
-      } else if (rValue instanceof ValueList) {
+      } else if(rValue instanceof ValueList) {
          LinkedHashSet<SymbolRef> used = new LinkedHashSet<>();
-         for (RValue value : ((ValueList) rValue).getList()) {
+         for(RValue value : ((ValueList) rValue).getList()) {
             used.addAll(getReferenced(value));
          }
          return used;
@@ -333,5 +99,249 @@ public class PassNVariableReferenceInfos extends Pass2Base {
       }
    }
 
+   /** Create defined/referenced maps */
+   public void generateVariableReferenceInfos() {
+      LinkedHashMap<LabelRef, Collection<VariableRef>> blockReferencedVars = new LinkedHashMap<>();
+      LinkedHashMap<LabelRef, Collection<VariableRef>> blockUsedVars = new LinkedHashMap<>();
+      LinkedHashMap<Integer, Collection<VariableRef>> stmtReferenced = new LinkedHashMap<>();
+      LinkedHashMap<Integer, Collection<VariableRef>> stmtDefined = new LinkedHashMap<>();
+      LinkedHashMap<VariableRef, Integer> varDefineStmts = new LinkedHashMap<>();
+      LinkedHashMap<VariableRef, Collection<Integer>> varRefStmts = new LinkedHashMap<>();
+      LinkedHashMap<ConstantRef, Collection<Integer>> constStmts = new LinkedHashMap<>();
+      for(ControlFlowBlock block : getProgram().getGraph().getAllBlocks()) {
+         LabelRef blockLabel = block.getLabel();
+         blockReferencedVars.put(blockLabel, getReferencedVars(blockLabel, new ArrayList<>()));
+         blockUsedVars.put(blockLabel, getUsedVars(blockLabel, new ArrayList<>()));
+         for(Statement statement : block.getStatements()) {
+            Collection<VariableRef> defined = getDefinedVars(statement);
+            Collection<VariableRef> referencedVars = getReferencedVars(statement);
+            // Add variable definitions to the statement
+            stmtDefined.put(statement.getIndex(), defined);
+            // Add variable reference to the statement
+            stmtReferenced.put(statement.getIndex(), referencedVars);
+            // Identify statement defining variables
+            for(VariableRef variableRef : defined) {
+               varDefineStmts.put(variableRef, statement.getIndex());
+            }
+            // Gather statements referencing variables
+            for(VariableRef variableRef : referencedVars) {
+               Collection<Integer> stmts = varRefStmts.get(variableRef);
+               if(stmts == null) {
+                  stmts = new LinkedHashSet<>();
+                  varRefStmts.put(variableRef, stmts);
+               }
+               stmts.add(statement.getIndex());
+            }
+            // Gather statements referencing constants
+            Collection<ConstantRef> referencedConsts = getReferencedConsts(statement);
+            for(ConstantRef constantRef : referencedConsts) {
+               Collection<Integer> stmts = constStmts.get(constantRef);
+               if(stmts == null) {
+                  stmts = new LinkedHashSet<>();
+                  constStmts.put(constantRef, stmts);
+               }
+               stmts.add(statement.getIndex());
+            }
+         }
+      }
+      // Gather constants referencing other constants
+      LinkedHashMap<ConstantRef, Collection<ConstantRef>> constRefConsts = new LinkedHashMap<>();
+      for(ConstantVar constantVar : getSymbols().getAllConstants(true)) {
+         Collection<ConstantRef> referencedConsts = getReferencedConsts(constantVar.getValue());
+         for(ConstantRef constantRef : referencedConsts) {
+            Collection<ConstantRef> consts = constRefConsts.get(constantRef);
+            if(consts == null) {
+               consts = new LinkedHashSet<>();
+               constRefConsts.put(constantRef, consts);
+            }
+            consts.add(constantVar.getRef());
+         }
+      }
+      getProgram().setVariableReferenceInfos(new VariableReferenceInfos(blockReferencedVars, blockUsedVars, stmtReferenced, stmtDefined, varDefineStmts, varRefStmts, constStmts, constRefConsts));
+   }
+
+   /**
+    * Get all variables used inside a block and its successors (including any called method)
+    *
+    * @param labelRef The block to examine
+    * @param visited The blocks already visited during the search. Used to stop infinite recursion
+    * @return All used variables
+    */
+   private Collection<VariableRef> getUsedVars(LabelRef labelRef, Collection<LabelRef> visited) {
+      if(labelRef == null) {
+         return new ArrayList<>();
+      }
+      if(visited.contains(labelRef)) {
+         return new ArrayList<>();
+      }
+      visited.add(labelRef);
+      ControlFlowBlock block = getProgram().getGraph().getBlock(labelRef);
+      if(block == null) {
+         return new ArrayList<>();
+      }
+      LinkedHashSet<VariableRef> used = new LinkedHashSet<>();
+      for(Statement statement : block.getStatements()) {
+         used.addAll(getUsedVars(statement));
+         if(statement instanceof StatementCall) {
+            ProcedureRef procedure = ((StatementCall) statement).getProcedure();
+            used.addAll(getUsedVars(procedure.getLabelRef(), visited));
+         }
+      }
+      used.addAll(getUsedVars(block.getDefaultSuccessor(), visited));
+      used.addAll(getUsedVars(block.getConditionalSuccessor(), visited));
+      return used;
+   }
+
+   /**
+    * Get all variables used or defined inside a block and its successors (including any called method)
+    *
+    * @param labelRef The block to examine
+    * @param visited The blocks already visited during the search. Used to stop infinite recursion
+    * @return All used variables
+    */
+   private Collection<VariableRef> getReferencedVars(LabelRef labelRef, Collection<LabelRef> visited) {
+      if(labelRef == null) {
+         return new ArrayList<>();
+      }
+      if(visited.contains(labelRef)) {
+         return new ArrayList<>();
+      }
+      visited.add(labelRef);
+      ControlFlowBlock block = getProgram().getGraph().getBlock(labelRef);
+      if(block == null) {
+         return new ArrayList<>();
+      }
+      LinkedHashSet<VariableRef> referenced = new LinkedHashSet<>();
+      for(Statement statement : block.getStatements()) {
+         referenced.addAll(getReferencedVars(statement));
+         if(statement instanceof StatementCall) {
+            ProcedureRef procedure = ((StatementCall) statement).getProcedure();
+            referenced.addAll(getReferencedVars(procedure.getLabelRef(), visited));
+         }
+      }
+      referenced.addAll(getReferencedVars(block.getDefaultSuccessor(), visited));
+      referenced.addAll(getReferencedVars(block.getConditionalSuccessor(), visited));
+      return referenced;
+   }
+
+   /**
+    * Get the variables defined by a statement
+    *
+    * @param stmt The statement
+    * @return Variables defined by the statement
+    */
+   private Collection<VariableRef> getDefinedVars(Statement stmt) {
+      if(stmt instanceof StatementAssignment) {
+         StatementAssignment assignment = (StatementAssignment) stmt;
+         LValue lValue = assignment.getlValue();
+         if(lValue instanceof VariableRef) {
+            return Arrays.asList((VariableRef) lValue);
+         }
+      } else if(stmt instanceof StatementPhiBlock) {
+         List<VariableRef> defined = new ArrayList<>();
+         StatementPhiBlock phi = (StatementPhiBlock) stmt;
+         for(StatementPhiBlock.PhiVariable phiVariable : phi.getPhiVariables()) {
+            defined.add(phiVariable.getVariable());
+         }
+         return defined;
+      } else if(stmt instanceof StatementCall) {
+         List<VariableRef> defined = new ArrayList<>();
+         if(((StatementCall) stmt).getlValue() instanceof VariableRef) {
+            defined.add((VariableRef) ((StatementCall) stmt).getlValue());
+         }
+         return defined;
+      }
+      return new ArrayList<>();
+   }
+
+   /**
+    * Get the variables used, but not defined, in a statement
+    *
+    * @param statement The statement to examine
+    * @return The used variables (not including defined variables)
+    */
+   private Collection<VariableRef> getUsedVars(Statement statement) {
+      LinkedHashSet<VariableRef> used = new LinkedHashSet<>();
+      used.addAll(getReferencedVars(statement));
+      used.removeAll(getDefinedVars(statement));
+      return used;
+   }
+
+   /**
+    * Get the variables referenced (used or defined) in a statement
+    *
+    * @param statement The statement to examine
+    * @return The referenced variables
+    */
+   private Collection<VariableRef> getReferencedVars(Statement statement) {
+      LinkedHashSet<VariableRef> referencedVars = new LinkedHashSet<>();
+      for(SymbolRef symbolRef : getReferenced(statement)) {
+         if(symbolRef instanceof VariableRef) {
+            referencedVars.add((VariableRef) symbolRef);
+         }
+      }
+      return referencedVars;
+   }
+
+   /**
+    * Get the constants referenced (used or defined) in a statement
+    *
+    * @param statement The statement to examine
+    * @return The referenced constants
+    */
+   private Collection<ConstantRef> getReferencedConsts(Statement statement) {
+      LinkedHashSet<ConstantRef> referencedConsts = new LinkedHashSet<>();
+      for(SymbolRef symbolRef : getReferenced(statement)) {
+         if(symbolRef instanceof ConstantRef) {
+            referencedConsts.add((ConstantRef) symbolRef);
+         }
+      }
+      return referencedConsts;
+   }
+
+   /**
+    * Get the variables / constants referenced (used or defined) in a statement
+    *
+    * @param statement The statement to examine
+    * @return The referenced variables / constants (VariableRef / ConstantRef)
+    */
+   private Collection<SymbolRef> getReferenced(Statement statement) {
+      LinkedHashSet<SymbolRef> referenced = new LinkedHashSet<>();
+      if(statement instanceof StatementPhiBlock) {
+         StatementPhiBlock phiBlock = (StatementPhiBlock) statement;
+         for(StatementPhiBlock.PhiVariable phiVariable : phiBlock.getPhiVariables()) {
+            referenced.add(phiVariable.getVariable());
+            for(StatementPhiBlock.PhiRValue phiRValue : phiVariable.getValues()) {
+               referenced.addAll(getReferenced(phiRValue.getrValue()));
+            }
+         }
+      } else if(statement instanceof StatementAssignment) {
+         StatementAssignment assignment = (StatementAssignment) statement;
+         referenced.addAll(getReferenced(assignment.getlValue()));
+         referenced.addAll(getReferenced(assignment.getrValue1()));
+         referenced.addAll(getReferenced(assignment.getrValue2()));
+      } else if(statement instanceof StatementConditionalJump) {
+         StatementConditionalJump conditionalJump = (StatementConditionalJump) statement;
+         referenced.addAll(getReferenced(conditionalJump.getrValue1()));
+         referenced.addAll(getReferenced(conditionalJump.getrValue2()));
+      } else if(statement instanceof StatementCall) {
+         StatementCall call = (StatementCall) statement;
+         referenced.addAll(getReferenced(call.getlValue()));
+         if(call.getParameters() != null) {
+            for(RValue param : call.getParameters()) {
+               referenced.addAll(getReferenced(param));
+            }
+         }
+      } else if(statement instanceof StatementReturn) {
+         StatementReturn statementReturn = (StatementReturn) statement;
+         referenced.addAll(getReferenced(statementReturn.getValue()));
+      } else if(statement instanceof StatementAsm) {
+         // No references in ASM atm.
+      } else {
+         throw new RuntimeException("Unknown statement type " + statement);
+      }
+      return referenced;
+   }
+
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/passes/ValueReplacer.java b/src/main/java/dk/camelot64/kickc/passes/ValueReplacer.java
index 12f06e3e8..8b08fb2d2 100644
--- a/src/main/java/dk/camelot64/kickc/passes/ValueReplacer.java
+++ b/src/main/java/dk/camelot64/kickc/passes/ValueReplacer.java
@@ -11,18 +11,6 @@ import java.util.ListIterator;
  */
 public class ValueReplacer {
 
-   /** A replacer that receives a replaceable value and has the potential to replace the value or recurse into sub-values. */
-   public interface Replacer {
-      /**
-       * Execute replacement of a replaceable value.
-       * @param replaceable The replaceable value
-       * @param currentStmt The statement iterator - just past the current statement that the value is a part of. Current statment can be retrieved by calling
-       * @param stmtIt The statement iterator - just past the current statement. Can be used for modifying the control flow block.
-       * @param currentBlock The current block that the value is a part of
-       */
-      void execute(ReplaceableValue replaceable, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock);
-   }
-
    /**
     * Execute a replacer on all replaceable values in the program control flow graph
     *
@@ -30,33 +18,33 @@ public class ValueReplacer {
     * @param replacer The replacer to execute
     */
    public static void executeAll(ControlFlowGraph graph, Replacer replacer) {
-      for (ControlFlowBlock block : graph.getAllBlocks()) {
+      for(ControlFlowBlock block : graph.getAllBlocks()) {
          ListIterator<Statement> statementsIt = block.getStatements().listIterator();
          while(statementsIt.hasNext()) {
             Statement statement = statementsIt.next();
-            if (statement instanceof StatementAssignment) {
+            if(statement instanceof StatementAssignment) {
                executeAll(new ReplaceableLValue((StatementLValue) statement), replacer, statement, statementsIt, block);
                executeAll(new ReplaceableRValue1((StatementAssignment) statement), replacer, statement, statementsIt, block);
-               executeAll(new ReplaceableRValue2((StatementAssignment) statement), replacer, statement,statementsIt, block);
-            } else if (statement instanceof StatementCall) {
+               executeAll(new ReplaceableRValue2((StatementAssignment) statement), replacer, statement, statementsIt, block);
+            } else if(statement instanceof StatementCall) {
                executeAll(new ReplaceableLValue((StatementLValue) statement), replacer, statement, statementsIt, block);
                StatementCall call = (StatementCall) statement;
-               if (call.getParameters() != null) {
+               if(call.getParameters() != null) {
                   int size = call.getParameters().size();
-                  for (int i = 0; i < size; i++) {
+                  for(int i = 0; i < size; i++) {
                      executeAll(new ReplaceableCallParameter(call, i), replacer, statement, statementsIt, block);
                   }
                }
-            } else if (statement instanceof StatementConditionalJump) {
+            } else if(statement instanceof StatementConditionalJump) {
                executeAll(new ReplaceableCondRValue1((StatementConditionalJump) statement), replacer, statement, statementsIt, block);
                executeAll(new ReplaceableCondRValue2((StatementConditionalJump) statement), replacer, statement, statementsIt, block);
-            } else if (statement instanceof StatementReturn) {
+            } else if(statement instanceof StatementReturn) {
                executeAll(new ReplaceableReturn((StatementReturn) statement), replacer, statement, statementsIt, block);
-            } else if (statement instanceof StatementPhiBlock) {
-               for (StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
+            } else if(statement instanceof StatementPhiBlock) {
+               for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
                   executeAll(new ReplaceablePhiVariable(phiVariable), replacer, statement, statementsIt, block);
                   int size = phiVariable.getValues().size();
-                  for (int i = 0; i < size; i++) {
+                  for(int i = 0; i < size; i++) {
                      executeAll(new ReplaceablePhiValue(phiVariable, i), replacer, statement, statementsIt, block);
                   }
                }
@@ -67,16 +55,30 @@ public class ValueReplacer {
 
    /**
     * Execute the a replacer on a replaceable value and all sub-values of the value.
+    *
     * @param replaceable The replaceable value
     * @param replacer The value replacer
     */
-   public static void executeAll(ReplaceableValue replaceable, Replacer replacer, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock ) {
+   public static void executeAll(ReplaceableValue replaceable, Replacer replacer, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock) {
       replacer.execute(replaceable, currentStmt, stmtIt, currentBlock);
-      for (ReplaceableValue subValue : replaceable.getSubValues()) {
+      for(ReplaceableValue subValue : replaceable.getSubValues()) {
          executeAll(subValue, replacer, currentStmt, stmtIt, currentBlock);
       }
    }
 
+   /** A replacer that receives a replaceable value and has the potential to replace the value or recurse into sub-values. */
+   public interface Replacer {
+      /**
+       * Execute replacement of a replaceable value.
+       *
+       * @param replaceable The replaceable value
+       * @param currentStmt The statement iterator - just past the current statement that the value is a part of. Current statment can be retrieved by calling
+       * @param stmtIt The statement iterator - just past the current statement. Can be used for modifying the control flow block.
+       * @param currentBlock The current block that the value is a part of
+       */
+      void execute(ReplaceableValue replaceable, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock);
+   }
+
    /**
     * Interface representing an RValue that can be replaced.
     * The value may have sub-values that can also be replaced.
@@ -90,15 +92,15 @@ public class ValueReplacer {
       public Collection<ReplaceableValue> getSubValues() {
          RValue value = get();
          ArrayList<ReplaceableValue> subValues = new ArrayList<>();
-         if (value instanceof PointerDereferenceIndexed) {
+         if(value instanceof PointerDereferenceIndexed) {
             subValues.add(new ReplaceablePointer((PointerDereference) value));
             subValues.add(new ReplaceablePointerIndex((PointerDereferenceIndexed) value));
-         } else if (value instanceof PointerDereferenceSimple) {
+         } else if(value instanceof PointerDereferenceSimple) {
             subValues.add(new ReplaceablePointer((PointerDereference) value));
-         } else if (value instanceof ValueList) {
+         } else if(value instanceof ValueList) {
             ValueList valueList = (ValueList) value;
             int size = valueList.getList().size();
-            for (int i = 0; i < size; i++) {
+            for(int i = 0; i < size; i++) {
                subValues.add(new ReplaceableListElement(valueList, i));
             }
          }