diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorAddressOf.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorAddressOf.java
index 84f0088b4..5dc6e5acb 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorAddressOf.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorAddressOf.java
@@ -11,7 +11,7 @@ public class OperatorAddressOf extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       throw new CompileError("Not implemented");
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBinary.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBinary.java
index f648d84db..578c440f0 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBinary.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBinary.java
@@ -9,6 +9,6 @@ public abstract class OperatorBinary extends Operator {
       super(operator, asmOperator, Type.BINARY, precedence);
    }
 
-   public abstract ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right);
+   public abstract ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right);
 
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolAnd.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolAnd.java
index 6595addf4..711292d6b 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolAnd.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolAnd.java
@@ -13,7 +13,7 @@ public class OperatorBoolAnd extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() & ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolNot.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolNot.java
index 6b7fa2262..d2004fd4e 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolNot.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolNot.java
@@ -12,7 +12,7 @@ public class OperatorBoolNot extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left) {
       if(left instanceof ConstantInteger) {
          return new ConstantInteger(~((ConstantInteger) left).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolOr.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolOr.java
index 4f167b723..3f63a3077 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolOr.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolOr.java
@@ -12,7 +12,7 @@ public class OperatorBoolOr extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() | ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolXor.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolXor.java
index f4bb5c199..1acdaf77f 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolXor.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorBoolXor.java
@@ -12,7 +12,7 @@ public class OperatorBoolXor extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() ^ ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastByte.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastByte.java
index b8a190fb1..ff61846f1 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastByte.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastByte.java
@@ -13,7 +13,7 @@ public class OperatorCastByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xff & ((ConstantInteger) value).getValue());
       } else if(value instanceof ConstantPointer) {
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastDWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastDWord.java
index 478b5d424..de0b3dcea 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastDWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastDWord.java
@@ -12,7 +12,7 @@ public class OperatorCastDWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffffffffL & ((ConstantInteger) value).getValue());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastPtrByte.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastPtrByte.java
index 32505d8f6..578727c6a 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastPtrByte.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastPtrByte.java
@@ -14,7 +14,7 @@ public class OperatorCastPtrByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantPointer(((ConstantInteger) value).getInteger(), SymbolType.BYTE);
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSByte.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSByte.java
index c72ba160d..f7f645131 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSByte.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSByte.java
@@ -12,7 +12,7 @@ public class OperatorCastSByte extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xff & ((ConstantInteger) value).getValue());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSDWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSDWord.java
index ab36f4b0e..64011b49b 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSDWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSDWord.java
@@ -12,7 +12,7 @@ public class OperatorCastSDWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffffffffL & ((ConstantInteger) value).getValue());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSWord.java
index b2b5d81ee..90dccbc54 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastSWord.java
@@ -12,7 +12,7 @@ public class OperatorCastSWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffff & ((ConstantInteger) value).getValue());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastWord.java
index f3e057827..1083e467d 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorCastWord.java
@@ -13,7 +13,7 @@ public class OperatorCastWord extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral value) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral value) {
       if(value instanceof ConstantInteger) {
          return new ConstantInteger(0xffff & ((ConstantInteger) value).getValue());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java
index 2c60266ed..2c88bfcd4 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java
@@ -12,7 +12,7 @@ public class OperatorDWord extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(0x10000 * ((ConstantInteger) left).getInteger()  + ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDecrement.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDecrement.java
index 406a06d52..c41c8cc29 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDecrement.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDecrement.java
@@ -12,7 +12,7 @@ public class OperatorDecrement extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger ) {
          return new ConstantInteger(((ConstantInteger) operand).getInteger() -1);
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDeref.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDeref.java
index 43ab733a5..7e013d409 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDeref.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDeref.java
@@ -11,7 +11,7 @@ public class OperatorDeref extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       throw new CompileError("Not implemented");
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDerefIdx.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDerefIdx.java
index 2ca165c95..eb894d561 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDerefIdx.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDerefIdx.java
@@ -11,7 +11,7 @@ public class OperatorDerefIdx extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDivide.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDivide.java
index 0debcb216..cb6f80046 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorDivide.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorDivide.java
@@ -13,7 +13,7 @@ public class OperatorDivide extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() / ((ConstantInteger) right).getInteger());
       } else if(left instanceof ConstantPointer && right instanceof ConstantInteger) {
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorEqual.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorEqual.java
index ad16d62ce..877cea2ff 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorEqual.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorEqual.java
@@ -15,7 +15,7 @@ public class OperatorEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(Objects.equals(((ConstantInteger) left).getInteger(), ((ConstantInteger) right).getInteger()));
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java
index 53c7a56b1..f481ba9f0 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java
@@ -14,7 +14,7 @@ public class OperatorGetHigh extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          ConstantInteger operandInt = (ConstantInteger) operand;
          if(SymbolType.isWord(operandInt.getType())) {
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java
index 01f7ec1b1..1044d96f3 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java
@@ -14,7 +14,7 @@ public class OperatorGetLow extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          ConstantInteger operandInt = (ConstantInteger) operand;
          if(SymbolType.isWord(operandInt.getType())) {
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThan.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThan.java
index 525e9c102..387eb6399 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThan.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThan.java
@@ -13,7 +13,7 @@ public class OperatorGreaterThan extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() > ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThanEqual.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThanEqual.java
index 8fdc1df3d..c309b5d16 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThanEqual.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGreaterThanEqual.java
@@ -13,7 +13,7 @@ public class OperatorGreaterThanEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() >= ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorIncrement.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorIncrement.java
index b82b47b74..7a47132cf 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorIncrement.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorIncrement.java
@@ -12,7 +12,7 @@ public class OperatorIncrement extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger ) {
          return new ConstantInteger(((ConstantInteger) operand).getInteger() + 1);
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThan.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThan.java
index dfb89c128..2354f6165 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThan.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThan.java
@@ -13,7 +13,7 @@ public class OperatorLessThan extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() < ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThanEqual.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThanEqual.java
index b6f2b13cc..cbc67de89 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThanEqual.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLessThanEqual.java
@@ -13,7 +13,7 @@ public class OperatorLessThanEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(((ConstantInteger) left).getInteger() <= ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicAnd.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicAnd.java
index a4faba34d..4b1cba7a6 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicAnd.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicAnd.java
@@ -12,7 +12,7 @@ public class OperatorLogicAnd extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantBool && right instanceof ConstantBool) {
          return new ConstantBool(((ConstantBool) left).getBool() && ((ConstantBool) right).getBool());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicNot.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicNot.java
index ae8a7a0e5..44cf8e6b6 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicNot.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicNot.java
@@ -12,7 +12,7 @@ public class OperatorLogicNot extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left) {
       if(left instanceof ConstantBool) {
          return new ConstantBool(!((ConstantBool) left).getBool() );
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicOr.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicOr.java
index ad2c33db2..1f98809de 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicOr.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorLogicOr.java
@@ -12,7 +12,7 @@ public class OperatorLogicOr extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantBool && right instanceof ConstantBool) {
          return new ConstantBool(((ConstantBool) left).getBool() || ((ConstantBool) right).getBool());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java
index d1edb513c..76702eb0d 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java
@@ -12,7 +12,7 @@ public class OperatorMinus extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() - ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMultiply.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMultiply.java
index 37531f6fd..c10f557db 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMultiply.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMultiply.java
@@ -12,7 +12,7 @@ public class OperatorMultiply extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() * ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorNeg.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorNeg.java
index 46aee33a2..5db22f639 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorNeg.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorNeg.java
@@ -12,7 +12,7 @@ public class OperatorNeg extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          return new ConstantInteger(-((ConstantInteger)operand).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorNotEqual.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorNotEqual.java
index 28e5f566b..659340abf 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorNotEqual.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorNotEqual.java
@@ -15,7 +15,7 @@ public class OperatorNotEqual extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantBool(!Objects.equals(((ConstantInteger) left).getInteger(), ((ConstantInteger) right).getInteger()));
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java
index 9bca151b8..5786e4677 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java
@@ -12,7 +12,7 @@ public class OperatorPlus extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(((ConstantInteger) left).getInteger() + ((ConstantInteger) right).getInteger());
       } else if(left instanceof ConstantInteger && right instanceof ConstantChar) {
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPos.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPos.java
index 88bc3e662..45b7028a4 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPos.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPos.java
@@ -12,7 +12,7 @@ public class OperatorPos extends OperatorUnary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral operand) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral operand) {
       if(operand instanceof ConstantInteger) {
          return new ConstantInteger(+((ConstantInteger)operand).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetHigh.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetHigh.java
index f7adc5b35..e00228085 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetHigh.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetHigh.java
@@ -11,7 +11,7 @@ public class OperatorSetHigh extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetLow.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetLow.java
index 0d6a9d8a9..195ebcba9 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetLow.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorSetLow.java
@@ -11,7 +11,7 @@ public class OperatorSetLow extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       throw new CompileError("Not implemented");
    }
 
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftLeft.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftLeft.java
index 91a41060c..0d9a2bb25 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftLeft.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftLeft.java
@@ -13,7 +13,7 @@ public class OperatorShiftLeft extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger( ((ConstantInteger) left).getInteger() << ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftRight.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftRight.java
index b96f3df02..397949e3e 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftRight.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorShiftRight.java
@@ -12,7 +12,7 @@ public class OperatorShiftRight extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger( ((ConstantInteger) left).getInteger() >> ((ConstantInteger) right).getInteger());
       }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorUnary.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorUnary.java
index 4046e5e25..2b366e8df 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorUnary.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorUnary.java
@@ -9,5 +9,5 @@ public abstract class OperatorUnary extends Operator {
       super(operator, asmOperator, Type.UNARY, precedence);
    }
 
-   public abstract ConstantLiteral calculate(ConstantLiteral operand);
+   public abstract ConstantLiteral calculateLiteral(ConstantLiteral operand);
 }
diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java
index a47d12397..d45b39835 100644
--- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java
+++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java
@@ -12,7 +12,7 @@ public class OperatorWord extends OperatorBinary {
    }
 
    @Override
-   public ConstantLiteral calculate(ConstantLiteral left, ConstantLiteral right) {
+   public ConstantLiteral calculateLiteral(ConstantLiteral left, ConstantLiteral right) {
       if(left instanceof ConstantInteger && right instanceof ConstantInteger) {
          return new ConstantInteger(0x100 * ((ConstantInteger) left).getInteger()  + ((ConstantInteger) right).getInteger());
       }