diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index a3a4cf88..418b2a17 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1634,7 +1634,7 @@ Expression Expression(boolean prop, boolean pathprop) throws ParseException {Exp
 // that does not really help since this is done post-parsing.
 // To prevent (very common) cases such as "F<=t (b)", "F<=t (b)&(c)", etc.
 // being mis-parsed ("t(b)" would always be taken over "t"), we catch this case
-// separately (see TimeBound() production below for details).
+// separately (see BoundExpression() production below for details).
 // This means that more complex time-bounds, especially those that
 // start/end with an identifier should be parenthesised, e.g. "F<=(t1+t2)".
 
@@ -1644,6 +1644,8 @@ Expression Expression(boolean prop, boolean pathprop) throws ParseException {Exp
   static final public 
 Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         ExpressionTemporal exprTemp;
+        TemporalOperatorBound defaultBound = null;
+        TemporalOperatorBounds bounds = null;
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionTemporalUnary(prop, pathprop);
@@ -1676,16 +1678,39 @@ exprTemp.setOperator(ExpressionTemporal.P_R);
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACKET:
+      case LBRACE:
       case EQ:
       case LT:
       case GT:
       case LE:
-      case GE:{
-        TimeBound(exprTemp);
+      case GE:
+      case CARET:{
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LBRACKET:
+        case EQ:
+        case LT:
+        case GT:
+        case LE:
+        case GE:{
+          defaultBound = BoundExpression();
+exprTemp.getBounds().setDefaultBound(defaultBound);
+          break;
+          }
+        case LBRACE:
+        case CARET:{
+          bounds = TemporalOpBounds();
+exprTemp.setBounds(bounds);
+          break;
+          }
+        default:
+          jj_la1[39] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
         break;
         }
       default:
-        jj_la1[39] = jj_gen;
+        jj_la1[40] = jj_gen;
         ;
       }
       expr = ExpressionTemporalUnary(prop, pathprop);
@@ -1693,7 +1718,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
       break;
       }
     default:
-      jj_la1[40] = jj_gen;
+      jj_la1[41] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -1702,6 +1727,8 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
 
   static final public Expression ExpressionTemporalUnary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         ExpressionTemporal exprTemp;
+        TemporalOperatorBound defaultBound = null;
+        TemporalOperatorBounds bounds = null;
         Token begin = null;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case F:
@@ -1726,22 +1753,45 @@ exprTemp.setOperator(ExpressionTemporal.P_G);
         break;
         }
       default:
-        jj_la1[41] = jj_gen;
+        jj_la1[42] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACKET:
+      case LBRACE:
       case EQ:
       case LT:
       case GT:
       case LE:
-      case GE:{
-        TimeBound(exprTemp);
+      case GE:
+      case CARET:{
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LBRACKET:
+        case EQ:
+        case LT:
+        case GT:
+        case LE:
+        case GE:{
+          defaultBound = BoundExpression();
+exprTemp.getBounds().setDefaultBound(defaultBound);
+          break;
+          }
+        case LBRACE:
+        case CARET:{
+          bounds = TemporalOpBounds();
+exprTemp.setBounds(bounds);
+          break;
+          }
+        default:
+          jj_la1[43] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
         break;
         }
       default:
-        jj_la1[42] = jj_gen;
+        jj_la1[44] = jj_gen;
         ;
       }
       expr = ExpressionTemporalUnary(prop, pathprop);
@@ -1776,7 +1826,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
       break;
       }
     default:
-      jj_la1[43] = jj_gen;
+      jj_la1[45] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1784,10 +1834,10 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
     throw new Error("Missing return statement in function");
   }
 
-// Time bound for temporal operators
+// Bound expression for temporal operators
 // (see ExpressionTemporal production for lookahead explanation)
   static final public 
-void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lBound, uBound;
+TemporalOperatorBound BoundExpression() throws ParseException {Expression lBound, uBound;
         TemporalOperatorBound bound = new TemporalOperatorBound();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LE:{
@@ -1827,7 +1877,7 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB
           break;
           }
         default:
-          jj_la1[44] = jj_gen;
+          jj_la1[46] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1872,7 +1922,7 @@ bound.setUpperBound(uBound, false);
           break;
           }
         default:
-          jj_la1[45] = jj_gen;
+          jj_la1[47] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1917,7 +1967,7 @@ bound.setUpperBound(uBound, true);
           break;
           }
         default:
-          jj_la1[46] = jj_gen;
+          jj_la1[48] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1962,7 +2012,7 @@ bound.setLowerBound(lBound, false);
           break;
           }
         default:
-          jj_la1[47] = jj_gen;
+          jj_la1[49] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1986,11 +2036,96 @@ bound.setEqualBounds(lBound);
       break;
       }
     default:
-      jj_la1[48] = jj_gen;
+      jj_la1[50] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return bound;}
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public TemporalOperatorBounds TemporalOpBounds() throws ParseException {TemporalOperatorBounds bounds = new TemporalOperatorBounds();
+        TemporalOperatorBound bound;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case CARET:{
+      jj_consume_token(CARET);
+      break;
+      }
+    default:
+      jj_la1[51] = jj_gen;
+      ;
+    }
+    jj_consume_token(LBRACE);
+    bound = TemporalOpBound();
+bounds.addBound(bound);
+    label_18:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[52] = jj_gen;
+        break label_18;
+      }
+      jj_consume_token(COMMA);
+      bound = TemporalOpBound();
+bounds.addBound(bound);
+    }
+    jj_consume_token(RBRACE);
+{if ("" != null) return bounds;}
+    throw new Error("Missing return statement in function");
+  }
+
+  static final public TemporalOperatorBound TemporalOpBound() throws ParseException {TemporalOperatorBound bound = null;
+        Object rewardIndex = null;
+    if (jj_2_15(1)) {
+      if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("time")) {
+
+      } else {
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      Identifier();
+      bound = BoundExpression();
+bound.setBoundType(TemporalOperatorBound.BoundType.TIME_BOUND);
+    } else if (jj_2_16(1)) {
+      if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps")) {
+
+      } else {
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      Identifier();
+      bound = BoundExpression();
+bound.setBoundType(TemporalOperatorBound.BoundType.STEP_BOUND);
+    } else if (jj_2_17(1)) {
+      if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward")) {
+
+      } else {
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      Identifier();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACE:{
+        rewardIndex = RewardIndex();
+        break;
+        }
+      default:
+        jj_la1[53] = jj_gen;
+        ;
+      }
+      bound = BoundExpression();
+bound.setBoundType(TemporalOperatorBound.BoundType.REWARD_BOUND);
+                   bound.setRewardStructureIndex(rewardIndex);
+    } else {
       jj_consume_token(-1);
       throw new ParseException();
     }
-exprTemp.setBound(bound);
+{if ("" != null) return bound;}
+    throw new Error("Missing return statement in function");
   }
 
 // Expression: if-then-else, i.e. "cond ? then : else"
@@ -2009,7 +2144,7 @@ ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0));
       break;
       }
     default:
-      jj_la1[49] = jj_gen;
+      jj_la1[54] = jj_gen;
       ;
     }
 {if ("" != null) return ret;}
@@ -2022,7 +2157,7 @@ Expression ExpressionImplies(boolean prop, boolean pathprop) throws ParseExcepti
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionIff(prop, pathprop);
-    label_18:
+    label_19:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPLIES:{
@@ -2030,8 +2165,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[50] = jj_gen;
-        break label_18;
+        jj_la1[55] = jj_gen;
+        break label_19;
       }
       jj_consume_token(IMPLIES);
       expr = ExpressionIff(prop, pathprop);
@@ -2047,7 +2182,7 @@ Expression ExpressionIff(boolean prop, boolean pathprop) throws ParseException {
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionOr(prop, pathprop);
-    label_19:
+    label_20:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IFF:{
@@ -2055,8 +2190,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[51] = jj_gen;
-        break label_19;
+        jj_la1[56] = jj_gen;
+        break label_20;
       }
       jj_consume_token(IFF);
       expr = ExpressionOr(prop, pathprop);
@@ -2072,7 +2207,7 @@ Expression ExpressionOr(boolean prop, boolean pathprop) throws ParseException {E
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionAnd(prop, pathprop);
-    label_20:
+    label_21:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case OR:{
@@ -2080,8 +2215,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[52] = jj_gen;
-        break label_20;
+        jj_la1[57] = jj_gen;
+        break label_21;
       }
       jj_consume_token(OR);
       expr = ExpressionAnd(prop, pathprop);
@@ -2097,7 +2232,7 @@ Expression ExpressionAnd(boolean prop, boolean pathprop) throws ParseException {
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionNot(prop, pathprop);
-    label_21:
+    label_22:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND:{
@@ -2105,8 +2240,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[53] = jj_gen;
-        break label_21;
+        jj_la1[58] = jj_gen;
+        break label_22;
       }
       jj_consume_token(AND);
       expr = ExpressionNot(prop, pathprop);
@@ -2154,7 +2289,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin,
       break;
       }
     default:
-      jj_la1[54] = jj_gen;
+      jj_la1[59] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2169,7 +2304,7 @@ Expression ExpressionEquality(boolean prop, boolean pathprop) throws ParseExcept
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionRelop(prop, pathprop);
-    label_22:
+    label_23:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case EQ:
@@ -2178,8 +2313,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[55] = jj_gen;
-        break label_22;
+        jj_la1[60] = jj_gen;
+        break label_23;
       }
       op = EqNeq();
       expr = ExpressionRelop(prop, pathprop);
@@ -2196,7 +2331,7 @@ Expression ExpressionRelop(boolean prop, boolean pathprop) throws ParseException
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionPlusMinus(prop, pathprop);
-    label_23:
+    label_24:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LT:
@@ -2207,8 +2342,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[56] = jj_gen;
-        break label_23;
+        jj_la1[61] = jj_gen;
+        break label_24;
       }
       op = LtGt();
       expr = ExpressionPlusMinus(prop, pathprop);
@@ -2232,7 +2367,7 @@ Expression ExpressionPlusMinus(boolean prop, boolean pathprop) throws ParseExcep
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionTimesDivide(prop, pathprop);
-    label_24:
+    label_25:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:
@@ -2241,8 +2376,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[57] = jj_gen;
-        break label_24;
+        jj_la1[62] = jj_gen;
+        break label_25;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -2256,7 +2391,7 @@ op = ExpressionBinaryOp.MINUS;
         break;
         }
       default:
-        jj_la1[58] = jj_gen;
+        jj_la1[63] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2274,7 +2409,7 @@ Expression ExpressionTimesDivide(boolean prop, boolean pathprop) throws ParseExc
         Token begin = null;
 begin = getToken(1);
     ret = ExpressionUnaryMinus(prop, pathprop);
-    label_25:
+    label_26:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TIMES:
@@ -2283,8 +2418,8 @@ begin = getToken(1);
         break;
         }
       default:
-        jj_la1[59] = jj_gen;
-        break label_25;
+        jj_la1[64] = jj_gen;
+        break label_26;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TIMES:{
@@ -2298,7 +2433,7 @@ op = ExpressionBinaryOp.DIVIDE;
         break;
         }
       default:
-        jj_la1[60] = jj_gen;
+        jj_la1[65] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2346,7 +2481,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi
       break;
       }
     default:
-      jj_la1[61] = jj_gen;
+      jj_la1[66] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2421,7 +2556,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException
       break;
       }
     default:
-      jj_la1[62] = jj_gen;
+      jj_la1[67] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2453,7 +2588,7 @@ ret = new ExpressionFunc(s);
       break;
       }
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[68] = jj_gen;
       ;
     }
 ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
@@ -2477,7 +2612,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[64] = jj_gen;
+      jj_la1[69] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2512,7 +2647,7 @@ s = "max";
       break;
       }
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[70] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2529,7 +2664,7 @@ func.setPosition(begin, getToken(0)); {if ("" != null) return func;}
 void ExpressionFuncArgs(boolean prop, boolean pathprop, ExpressionFunc func) throws ParseException {Expression expr;
     expr = Expression(prop, pathprop);
 func.addOperand(expr);
-    label_26:
+    label_27:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2537,8 +2672,8 @@ func.addOperand(expr);
         break;
         }
       default:
-        jj_la1[66] = jj_gen;
-        break label_26;
+        jj_la1[71] = jj_gen;
+        break label_27;
       }
       jj_consume_token(COMMA);
       expr = Expression(prop, pathprop);
@@ -2589,7 +2724,7 @@ ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(false));
       break;
       }
     default:
-      jj_la1[67] = jj_gen;
+      jj_la1[72] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2635,7 +2770,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[68] = jj_gen;
+        jj_la1[73] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2669,7 +2804,7 @@ relOp = "max="; isBool = false;
         break;
         }
       default:
-        jj_la1[69] = jj_gen;
+        jj_la1[74] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2690,7 +2825,7 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[70] = jj_gen;
+      jj_la1[75] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2702,7 +2837,7 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[71] = jj_gen;
+      jj_la1[76] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -2730,7 +2865,7 @@ ret.setModifier(modifier == null ? null : modifier.getName());
 //  - a (possibly negated) HOA: ... automaton specification
   static final public Expression PathSpecification(boolean prop) throws ParseException {Expression result;
         ExpressionIdent kind = null;
-    if (jj_2_15(1)) {
+    if (jj_2_18(1)) {
       if (getToken(1).kind==REG_IDENT
                               && getToken(1).image.equals("HOA")
                               && getToken(2).kind==COLON) {
@@ -2744,7 +2879,7 @@ ret.setModifier(modifier == null ? null : modifier.getName());
       jj_consume_token(LBRACE);
       result = PathSpecificationHOA(prop);
       jj_consume_token(RBRACE);
-    } else if (jj_2_16(1)) {
+    } else if (jj_2_19(1)) {
       if (getToken(1).kind==NOT
                               && getToken(2).kind==REG_IDENT
                               && getToken(2).image.equals("HOA")
@@ -2761,7 +2896,7 @@ ret.setModifier(modifier == null ? null : modifier.getName());
       result = PathSpecificationHOA(prop);
       jj_consume_token(RBRACE);
 result = Expression.Not(result);
-    } else if (jj_2_17(1)) {
+    } else if (jj_2_20(1)) {
       if (getToken(1).kind==REG_IDENT
                                && getToken(2).kind==COLON) {
 
@@ -2804,7 +2939,7 @@ result = Expression.Not(result);
         break;
         }
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[77] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2820,7 +2955,7 @@ result = Expression.Not(result);
         String ap, label;
     hoaAutomatonFile = QuotedString();
 result = new ExpressionHOA(hoaAutomatonFile);
-    label_27:
+    label_28:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2828,8 +2963,8 @@ result = new ExpressionHOA(hoaAutomatonFile);
         break;
         }
       default:
-        jj_la1[73] = jj_gen;
-        break label_27;
+        jj_la1[78] = jj_gen;
+        break label_28;
       }
       jj_consume_token(COMMA);
       ap = QuotedIdentifier();
@@ -2850,7 +2985,7 @@ Filter Filter() throws ParseException {Filter filter;
     expr = Expression(true, false);
 filter = new Filter(expr);
     jj_consume_token(RBRACE);
-    label_28:
+    label_29:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACE:{
@@ -2858,8 +2993,8 @@ filter = new Filter(expr);
         break;
         }
       default:
-        jj_la1[74] = jj_gen;
-        break label_28;
+        jj_la1[79] = jj_gen;
+        break label_29;
       }
       jj_consume_token(LBRACE);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2874,7 +3009,7 @@ filter.setMaxRequested(true);
         break;
         }
       default:
-        jj_la1[75] = jj_gen;
+        jj_la1[80] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2912,7 +3047,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[76] = jj_gen;
+        jj_la1[81] = jj_gen;
         ;
       }
       r = LtGt();
@@ -2927,7 +3062,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[77] = jj_gen;
+      jj_la1[82] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2939,7 +3074,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[78] = jj_gen;
+      jj_la1[83] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -2984,16 +3119,16 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[84] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACE:{
-        RewardIndex(ret);
+        RewardSpecification(ret);
         break;
         }
       default:
-        jj_la1[80] = jj_gen;
+        jj_la1[85] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3027,7 +3162,7 @@ relOp = "max="; isBool = false;
         break;
         }
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[86] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3048,7 +3183,7 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[82] = jj_gen;
+      jj_la1[87] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3060,7 +3195,7 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[88] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3082,12 +3217,30 @@ ret.setModifier(modifier == null ? null : modifier.getName());
     throw new Error("Missing return statement in function");
   }
 
-// Reward struct index for R operator
+// Reward specification for R operator
   static final public 
-void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = null;
+void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object index = null;
         Object indexDiv = null;
+    index = RewardIndex();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case DIVIDE:{
+      jj_consume_token(DIVIDE);
+      indexDiv = RewardIndex();
+      break;
+      }
+    default:
+      jj_la1[89] = jj_gen;
+      ;
+    }
+exprRew.setRewardStructIndex(index);
+                if (indexDiv != null) {
+                        exprRew.setRewardStructIndexDiv(indexDiv);
+                }
+  }
+
+  static final public Object RewardIndex() throws ParseException {Object index = null;
     jj_consume_token(LBRACE);
-    if (jj_2_18(2147483647)) {
+    if (jj_2_21(2147483647)) {
       index = QuotedIdentifier();
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3122,67 +3275,14 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index =
         break;
         }
       default:
-        jj_la1[84] = jj_gen;
+        jj_la1[90] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
     jj_consume_token(RBRACE);
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DIVIDE:{
-      jj_consume_token(DIVIDE);
-      jj_consume_token(LBRACE);
-      if (jj_2_19(2147483647)) {
-        indexDiv = QuotedIdentifier();
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case A:
-        case E:
-        case FALSE:
-        case FILTER:
-        case FUNC:
-        case F:
-        case G:
-        case MAX:
-        case MIN:
-        case X:
-        case PMAX:
-        case PMIN:
-        case P:
-        case RMAX:
-        case RMIN:
-        case R:
-        case S:
-        case TRUE:
-        case NOT:
-        case LPARENTH:
-        case DLBRACKET:
-        case DLT:
-        case MINUS:
-        case REG_INT:
-        case REG_DOUBLE:
-        case REG_IDENT:
-        case REG_QUOTED_IDENT:{
-          indexDiv = Expression(false, false);
-          break;
-          }
-        default:
-          jj_la1[85] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      }
-      jj_consume_token(RBRACE);
-      break;
-      }
-    default:
-      jj_la1[86] = jj_gen;
-      ;
-    }
-exprRew.setRewardStructIndex(index);
-                if (indexDiv != null) {
-                        exprRew.setRewardStructIndexDiv(indexDiv);
-                }
+{if ("" != null) return index;}
+    throw new Error("Missing return statement in function");
   }
 
 // Contents of an R operator
@@ -3197,7 +3297,7 @@ Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws Parse
         Token begin;
         TemporalOperatorBound b = new TemporalOperatorBound();
 begin = getToken(1);
-    if (jj_2_20(2147483647)) {
+    if (jj_2_22(2147483647)) {
       expr = ExpressionSS(prop, true);
 ret = expr;
     } else {
@@ -3208,12 +3308,12 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
         }
       default:
-        jj_la1[87] = jj_gen;
-        if (jj_2_21(2147483647)) {
+        jj_la1[91] = jj_gen;
+        if (jj_2_23(2147483647)) {
           begin = jj_consume_token(C);
           jj_consume_token(LE);
           expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.getBounds().setDefaultBound(b); ret = exprTemp;
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case C:{
@@ -3225,7 +3325,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null);
             jj_consume_token(I);
             jj_consume_token(EQ);
             expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.getBounds().setDefaultBound(b); ret = exprTemp;
             break;
             }
           case A:
@@ -3260,7 +3360,7 @@ ret = expr;
             break;
             }
           default:
-            jj_la1[88] = jj_gen;
+            jj_la1[92] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3325,7 +3425,7 @@ ret = new ExpressionStrategy(false);
       break;
       }
     default:
-      jj_la1[89] = jj_gen;
+      jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3350,7 +3450,7 @@ ret = new ExpressionStrategy(false);
         break;
         }
       default:
-        jj_la1[90] = jj_gen;
+        jj_la1[94] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3363,7 +3463,7 @@ ret.addOperand(expr);
       break;
       }
     default:
-      jj_la1[91] = jj_gen;
+      jj_la1[95] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3383,13 +3483,13 @@ exprStrat.setCoalitionAllPlayers();
       break;
       }
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[98] = jj_gen;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
       case REG_IDENT:{
         s = ExpressionStrategyCoalitionPlayer();
 coalition.add(s);
-        label_29:
+        label_30:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case COMMA:{
@@ -3397,8 +3497,8 @@ coalition.add(s);
             break;
             }
           default:
-            jj_la1[92] = jj_gen;
-            break label_29;
+            jj_la1[96] = jj_gen;
+            break label_30;
           }
           jj_consume_token(COMMA);
           s = ExpressionStrategyCoalitionPlayer();
@@ -3407,7 +3507,7 @@ coalition.add(s);
         break;
         }
       default:
-        jj_la1[93] = jj_gen;
+        jj_la1[97] = jj_gen;
         ;
       }
 exprStrat.setCoalition(coalition);
@@ -3427,7 +3527,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
       break;
       }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[99] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3490,7 +3590,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[96] = jj_gen;
+      jj_la1[100] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3503,7 +3603,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[101] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -3567,7 +3667,7 @@ s = getToken(0).image;
       break;
       }
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[102] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3599,7 +3699,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3636,7 +3736,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[104] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3668,7 +3768,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[105] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3694,7 +3794,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[106] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -3875,268 +3975,271 @@ fl.setLHS(s);
     finally { jj_save(20, xla); }
   }
 
-  static private boolean jj_3R_152()
+  static private boolean jj_2_22(int xla)
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_22(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(21, xla); }
   }
 
-  static private boolean jj_3R_96()
+  static private boolean jj_2_23(int xla)
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_30()) return true;
-    return false;
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_23(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
   }
 
-  static private boolean jj_3R_158()
+  static private boolean jj_3R_198()
  {
-    if (jj_3R_32()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_227()) {
+    jj_scanpos = xsp;
+    if (jj_3R_228()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_213()
+  static private boolean jj_3R_197()
  {
-    if (jj_3R_154()) return true;
+    if (jj_scan_token(DLBRACKET)) return true;
+    if (jj_3R_226()) return true;
+    if (jj_scan_token(DRBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_169()
+  static private boolean jj_3R_175()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
   static private boolean jj_3R_163()
- {
-    if (jj_scan_token(FALSE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_162()
- {
-    if (jj_scan_token(TRUE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_228()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(85)) {
+    if (jj_3R_175()) {
+    jj_scanpos = xsp;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(88)) return true;
+    if (jj_3R_178()) return true;
+    }
+    }
     }
     return false;
   }
 
-  static private boolean jj_3R_44()
+  static private boolean jj_3R_196()
  {
-    if (jj_3R_52()) return true;
+    if (jj_scan_token(DLT)) return true;
+    if (jj_3R_226()) return true;
+    if (jj_scan_token(DGT)) return true;
     return false;
   }
 
-  static private boolean jj_3_4()
+  static private boolean jj_3R_99()
  {
-    if (jj_scan_token(LABEL)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_229()
+  static private boolean jj_3R_181()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_228()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_161()
+  static private boolean jj_3R_172()
  {
-    if (jj_scan_token(REG_DOUBLE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_198()) {
+    jj_scanpos = xsp;
+    if (jj_3R_199()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_223()
+  static private boolean jj_3R_182()
  {
-    if (jj_3R_228()) return true;
+    if (jj_3R_48()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_229()) { jj_scanpos = xsp; break; }
+      if (jj_3R_207()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_217()
+  static private boolean jj_3R_130()
+ {
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_166()
  {
+    if (jj_scan_token(FUNC)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_223()) jj_scanpos = xsp;
+    if (jj_3R_183()) {
+    jj_scanpos = xsp;
+    if (jj_3R_184()) {
+    jj_scanpos = xsp;
+    if (jj_3R_185()) return true;
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_182()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_3()
+  static private boolean jj_3R_48()
  {
-    if (jj_scan_token(LABEL)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  static private boolean jj_3R_216()
+  static private boolean jj_3R_171()
  {
-    if (jj_scan_token(TIMES)) return true;
+    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_211()
+  static private boolean jj_3_4()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_216()) {
-    jj_scanpos = xsp;
-    if (jj_3R_217()) return true;
-    }
+    if (jj_scan_token(LABEL)) return true;
     return false;
   }
 
-  static private boolean jj_3R_168()
+  static private boolean jj_3_3()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(LABEL)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_160()
+  static private boolean jj_3R_180()
  {
-    if (jj_scan_token(REG_INT)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_148()
+  static private boolean jj_3R_165()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_160()) {
-    jj_scanpos = xsp;
-    if (jj_3R_161()) {
+    if (jj_3R_180()) {
     jj_scanpos = xsp;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
-    }
-    }
+    if (jj_3R_181()) return true;
     }
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_182()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_85()
+  static private boolean jj_3R_90()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_34()) return true;
+    if (jj_3R_35()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_166()
+  static private boolean jj_3R_170()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(E)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_84()
+  static private boolean jj_3R_89()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_184()
+  static private boolean jj_3R_179()
  {
-    if (jj_3R_152()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_182()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_76()
+  static private boolean jj_3R_80()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_30()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_83()
- {
-    if (jj_3R_30()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_212()
+  static private boolean jj_3R_88()
  {
-    if (jj_3R_153()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_74()
+  static private boolean jj_3R_78()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_83()) {
+    if (jj_3R_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) {
+    if (jj_3R_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
+    if (jj_3R_90()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_183()
+  static private boolean jj_3R_164()
  {
+    if (jj_3R_31()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_212()) {
-    jj_scanpos = xsp;
-    if (jj_3R_213()) return true;
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_167()
- {
-    if (jj_3R_44()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_192()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_179()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_182()
+  static private boolean jj_3_23()
  {
-    if (jj_scan_token(DLBRACKET)) return true;
-    if (jj_3R_211()) return true;
-    if (jj_scan_token(DRBRACKET)) return true;
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_181()
+  static private boolean jj_3R_225()
  {
-    if (jj_scan_token(DLT)) return true;
-    if (jj_3R_211()) return true;
-    if (jj_scan_token(DGT)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_97()
+  static private boolean jj_3R_100()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_30()) return true;
+    if (jj_3R_31()) return true;
     if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_30()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_227()
- {
-    if (jj_3R_44()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -4148,356 +4251,315 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_157()
+  static private boolean jj_3_22()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_181()) {
-    jj_scanpos = xsp;
-    if (jj_3R_182()) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_183()) {
-    jj_scanpos = xsp;
-    if (jj_3R_184()) return true;
-    }
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_224()
  {
-    if (jj_scan_token(FUNC)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_168()) {
-    jj_scanpos = xsp;
-    if (jj_3R_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_170()) return true;
-    }
-    }
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(I)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_56()
+  static private boolean jj_3R_223()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_41()) return true;
+    if (jj_scan_token(C)) return true;
     return false;
   }
 
-  static private boolean jj_3R_87()
+  static private boolean jj_3R_222()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_30()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_97()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
   static private boolean jj_3R_221()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(S)) return true;
     return false;
   }
 
-  static private boolean jj_3R_165()
+  static private boolean jj_3R_162()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_3R_174()) return true;
     return false;
   }
 
-  static private boolean jj_3R_75()
+  static private boolean jj_3R_220()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
-    }
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_86()
- {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_30()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_96()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_156()
+  static private boolean jj_3R_161()
  {
-    if (jj_scan_token(A)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_173()) return true;
     return false;
   }
 
-  static private boolean jj_3R_150()
+  static private boolean jj_3R_60()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_165()) {
-    jj_scanpos = xsp;
-    if (jj_3R_166()) return true;
-    }
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  static private boolean jj_3R_64()
+  static private boolean jj_3R_92()
  {
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_31()) return true;
+    if (jj_scan_token(RENAME)) return true;
+    if (jj_3R_31()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_75()) { jj_scanpos = xsp; break; }
+      if (jj_3R_100()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_8()
- {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_164()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_49()
+  static private boolean jj_3R_160()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_55()) return true;
+    if (jj_3R_172()) return true;
     return false;
   }
 
-  static private boolean jj_3_10()
+  static private boolean jj_3_21()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_149()
+  static private boolean jj_3R_194()
  {
-    if (jj_3R_30()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_164()) jj_scanpos = xsp;
+    if (jj_3R_220()) {
+    jj_scanpos = xsp;
+    if (jj_3R_221()) {
+    jj_scanpos = xsp;
+    if (jj_3R_222()) {
+    jj_scanpos = xsp;
+    if (jj_3R_223()) {
+    jj_scanpos = xsp;
+    if (jj_3R_224()) {
+    jj_scanpos = xsp;
+    if (jj_3R_225()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_155()
+  static private boolean jj_3R_159()
  {
-    if (jj_scan_token(E)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_171()) return true;
     return false;
   }
 
-  static private boolean jj_3_2()
+  static private boolean jj_3R_158()
  {
-    if (jj_3R_31()) return true;
-    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_170()) return true;
     return false;
   }
 
-  static private boolean jj_3R_65()
+  static private boolean jj_3R_148()
  {
-    if (jj_scan_token(OR)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_30()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_76()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RBRACKET)) return true;
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_64()) return true;
+    if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  static private boolean jj_3_21()
+  static private boolean jj_3R_157()
  {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
+    if (jj_3R_169()) return true;
     return false;
   }
 
-  static private boolean jj_3R_55()
+  static private boolean jj_3R_79()
  {
-    if (jj_3R_64()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_65()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_147()
- {
-    if (jj_3R_159()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_146()
- {
-    if (jj_3R_158()) return true;
+    if (jj_3R_91()) {
+    jj_scanpos = xsp;
+    if (jj_3R_92()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_210()
+  static private boolean jj_3R_91()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_31()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_99()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_145()
+  static private boolean jj_3R_195()
  {
-    if (jj_3R_157()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3_20()
+  static private boolean jj_3R_156()
  {
-    if (jj_3R_39()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_209()
+  static private boolean jj_3R_68()
  {
-    if (jj_scan_token(I)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_78()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_79()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3R_155()
  {
-    if (jj_3R_156()) return true;
+    if (jj_3R_168()) return true;
     return false;
   }
 
-  static private boolean jj_3R_208()
+  static private boolean jj_3_8()
  {
-    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3_19()
+  static private boolean jj_3R_129()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_207()
+  static private boolean jj_3R_154()
  {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_167()) return true;
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3R_153()
  {
-    if (jj_3R_155()) return true;
+    if (jj_3R_166()) return true;
     return false;
   }
 
-  static private boolean jj_3R_133()
+  static private boolean jj_3R_152()
  {
-    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_165()) return true;
     return false;
   }
 
-  static private boolean jj_3R_142()
+  static private boolean jj_3R_151()
  {
-    if (jj_3R_154()) return true;
+    if (jj_3R_164()) return true;
     return false;
   }
 
-  static private boolean jj_3R_206()
+  static private boolean jj_3R_53()
  {
-    if (jj_scan_token(S)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
-  static private boolean jj_3R_180()
+  static private boolean jj_3R_150()
  {
-    if (jj_3R_53()) return true;
+    if (jj_3R_163()) return true;
     return false;
   }
 
-  static private boolean jj_3R_141()
+  static private boolean jj_3_10()
  {
-    if (jj_3R_39()) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_205()
+  static private boolean jj_3R_126()
  {
-    if (jj_3R_39()) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_129()) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
+    }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_140()
+  static private boolean jj_3R_144()
  {
-    if (jj_3R_153()) return true;
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_226()
+  static private boolean jj_3_2()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  static private boolean jj_3R_179()
+  static private boolean jj_3R_149()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_205()) {
+    if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_206()) {
+    if (jj_3R_151()) {
     jj_scanpos = xsp;
-    if (jj_3R_207()) {
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_208()) {
+    if (jj_3R_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_209()) {
+    if (jj_3R_154()) {
+    jj_scanpos = xsp;
+    if (jj_3R_155()) {
+    jj_scanpos = xsp;
+    if (jj_3R_156()) {
+    jj_scanpos = xsp;
+    if (jj_3R_157()) {
+    jj_scanpos = xsp;
+    if (jj_3R_158()) {
+    jj_scanpos = xsp;
+    if (jj_3R_159()) {
+    jj_scanpos = xsp;
+    if (jj_3R_160()) {
+    jj_scanpos = xsp;
+    if (jj_3R_161()) {
     jj_scanpos = xsp;
-    if (jj_3R_210()) return true;
+    if (jj_3R_162()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     }
     }
@@ -4506,243 +4568,139 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_69()
  {
-    if (jj_3R_152()) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_31()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_80()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_146()
  {
-    if (jj_3R_151()) return true;
+    if (jj_3R_149()) return true;
     return false;
   }
 
-  static private boolean jj_3_18()
+  static private boolean jj_3R_235()
  {
-    if (jj_3R_31()) return true;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
-  static private boolean jj_3R_137()
+  static private boolean jj_3R_59()
  {
-    if (jj_3R_150()) return true;
+    if (jj_3R_68()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_69()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_136()
+  static private boolean jj_3R_145()
  {
-    if (jj_3R_149()) return true;
+    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
-  static private boolean jj_3R_48()
+  static private boolean jj_3R_230()
  {
-    if (jj_3R_55()) return true;
+    if (jj_3R_126()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_56()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_235()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_135()
+  static private boolean jj_3R_141()
  {
-    if (jj_3R_148()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_145()) {
+    jj_scanpos = xsp;
+    if (jj_3R_146()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_129()
- {
-    if (jj_scan_token(MINUS)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_220()
- {
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_134()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_135()) {
-    jj_scanpos = xsp;
-    if (jj_3R_136()) {
-    jj_scanpos = xsp;
-    if (jj_3R_137()) {
-    jj_scanpos = xsp;
-    if (jj_3R_138()) {
-    jj_scanpos = xsp;
-    if (jj_3R_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_140()) {
-    jj_scanpos = xsp;
-    if (jj_3R_141()) {
-    jj_scanpos = xsp;
-    if (jj_3R_142()) {
-    jj_scanpos = xsp;
-    if (jj_3R_143()) {
-    jj_scanpos = xsp;
-    if (jj_3R_144()) {
-    jj_scanpos = xsp;
-    if (jj_3R_145()) {
-    jj_scanpos = xsp;
-    if (jj_3R_146()) {
-    jj_scanpos = xsp;
-    if (jj_3R_147()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_131()
- {
-    if (jj_3R_134()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_222()
- {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_226()) {
-    jj_scanpos = xsp;
-    if (jj_3R_227()) return true;
-    }
-    if (jj_scan_token(RBRACE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_147()
  {
-    if (jj_scan_token(MINUS)) return true;
-    if (jj_3R_126()) return true;
+    if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_215()
+  static private boolean jj_3R_142()
  {
-    if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_220()) {
+    if (jj_3R_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_221()) return true;
+    if (jj_3R_148()) return true;
     }
-    if (jj_scan_token(RBRACE)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_222()) jj_scanpos = xsp;
+    if (jj_3R_141()) return true;
     return false;
   }
 
-  static private boolean jj_3R_41()
+  static private boolean jj_3R_52()
  {
-    if (jj_3R_48()) return true;
+    if (jj_3R_59()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_49()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_126()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_130()) {
-    jj_scanpos = xsp;
-    if (jj_3R_131()) return true;
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_132()
- {
-    if (jj_scan_token(TIMES)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_127()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_132()) {
-    jj_scanpos = xsp;
-    if (jj_3R_133()) return true;
+      if (jj_3R_60()) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_126()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_34()
- {
-    if (jj_3R_41()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_7()
- {
-    if (jj_3R_31()) return true;
-    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_122()
+  static private boolean jj_3R_137()
  {
-    if (jj_3R_126()) return true;
+    if (jj_3R_141()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_127()) { jj_scanpos = xsp; break; }
+      if (jj_3R_142()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_201()
+  static private boolean jj_3R_216()
  {
-    if (jj_3R_51()) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_55()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_128()
+  static private boolean jj_3R_143()
  {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_200()
+  static private boolean jj_3R_215()
  {
-    if (jj_3R_215()) return true;
+    if (jj_3R_230()) return true;
     return false;
   }
 
-  static private boolean jj_3R_199()
+  static private boolean jj_3R_214()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_35()) return true;
+    if (jj_3R_36()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_204()
+  static private boolean jj_3R_219()
  {
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4750,7 +4708,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_178()
+  static private boolean jj_3R_193()
  {
     if (jj_scan_token(RMAX)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4758,19 +4716,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_123()
+  static private boolean jj_3R_138()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_128()) {
+    if (jj_3R_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_129()) return true;
+    if (jj_3R_144()) return true;
     }
-    if (jj_3R_122()) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
-  static private boolean jj_3R_203()
+  static private boolean jj_3R_218()
  {
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4778,7 +4736,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_177()
+  static private boolean jj_3R_192()
  {
     if (jj_scan_token(RMIN)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4786,528 +4744,529 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_202()
+  static private boolean jj_3R_217()
  {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_45()
- {
-    if (jj_3R_53()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_1()
+  static private boolean jj_3R_49()
  {
-    if (jj_scan_token(MODULE)) return true;
-    if (jj_3R_30()) return true;
-    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_176()
+  static private boolean jj_3R_191()
  {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_199()) jj_scanpos = xsp;
+    if (jj_3R_214()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_200()) jj_scanpos = xsp;
+    if (jj_3R_215()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_201()) {
+    if (jj_3R_216()) {
     jj_scanpos = xsp;
-    if (jj_3R_202()) {
+    if (jj_3R_217()) {
     jj_scanpos = xsp;
-    if (jj_3R_203()) {
+    if (jj_3R_218()) {
     jj_scanpos = xsp;
-    if (jj_3R_204()) return true;
+    if (jj_3R_219()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_119()
+  static private boolean jj_3R_134()
  {
-    if (jj_3R_122()) return true;
+    if (jj_3R_137()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_123()) { jj_scanpos = xsp; break; }
+      if (jj_3R_138()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_154()
+  static private boolean jj_3R_169()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_176()) {
+    if (jj_3R_191()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) {
+    if (jj_3R_192()) {
     jj_scanpos = xsp;
-    if (jj_3R_178()) return true;
+    if (jj_3R_193()) return true;
     }
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_179()) return true;
+    if (jj_3R_194()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_180()) jj_scanpos = xsp;
+    if (jj_3R_195()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3_6()
- {
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_120()
- {
-    if (jj_3R_51()) return true;
-    if (jj_3R_119()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_117()
+  static private boolean jj_3R_45()
  {
-    if (jj_3R_119()) return true;
+    if (jj_3R_52()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }
+      if (jj_3R_53()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_118()
- {
-    if (jj_3R_121()) return true;
-    if (jj_3R_117()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_50()
+  static private boolean jj_3R_35()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  static private boolean jj_3R_43()
+  static private boolean jj_3R_135()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_55()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3R_132()
  {
-    if (jj_3R_117()) return true;
+    if (jj_3R_134()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_118()) { jj_scanpos = xsp; break; }
+      if (jj_3R_135()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_42()
+  static private boolean jj_3_7()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_50()) jj_scanpos = xsp;
-    if (jj_3R_51()) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_32()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_115()
+  static private boolean jj_3R_64()
  {
-    if (jj_3R_116()) return true;
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_60()
+  static private boolean jj_3R_63()
  {
-    if (jj_scan_token(LE)) return true;
+    if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_114()
+  static private boolean jj_3R_133()
  {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_136()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
-  static private boolean jj_3R_59()
+  static private boolean jj_3R_62()
  {
-    if (jj_scan_token(GE)) return true;
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3R_54()
  {
-    if (jj_scan_token(LT)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_57()
+  static private boolean jj_3R_47()
+ {
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_61()
  {
     if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_51()
+  static private boolean jj_3R_55()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_57()) {
+    if (jj_3R_61()) {
     jj_scanpos = xsp;
-    if (jj_3R_58()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_59()) {
+    if (jj_3R_63()) {
     jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
+    if (jj_3R_64()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_39()
+  static private boolean jj_3_1()
  {
-    if (jj_scan_token(S)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_42()) {
-    jj_scanpos = xsp;
-    if (jj_3R_43()) return true;
-    }
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_44()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_45()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(MODULE)) return true;
+    if (jj_3R_31()) return true;
+    if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3R_131()
  {
-    if (jj_3R_44()) return true;
-    return false;
-  }
+    if (jj_3R_132()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_133()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
 
-  static private boolean jj_3R_105()
+  static private boolean jj_3R_46()
  {
-    if (jj_3R_44()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_54()) jj_scanpos = xsp;
+    if (jj_3R_55()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_103()
+  static private boolean jj_3R_128()
  {
-    if (jj_3R_44()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101()
+  static private boolean jj_3R_140()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_112()
+  static private boolean jj_3R_127()
+ {
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_124()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_136()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_114()) {
+    if (jj_3R_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_140()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_47()
+  static private boolean jj_3R_139()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_46()) return true;
+    if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_125()
+  static private boolean jj_3R_43()
  {
-    if (jj_scan_token(NE)) return true;
+    if (jj_scan_token(S)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_46()) {
+    jj_scanpos = xsp;
+    if (jj_3R_47()) return true;
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_48()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_49()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_121()
+  static private boolean jj_3_6()
+ {
+    if (jj_3R_32()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_124()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_124()) {
+    if (jj_3R_127()) {
     jj_scanpos = xsp;
-    if (jj_3R_125()) return true;
+    if (jj_3R_128()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_124()
+  static private boolean jj_3R_77()
  {
-    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_73()
+  static private boolean jj_3R_76()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_72()
+  static private boolean jj_3R_58()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
 
-  static private boolean jj_3R_113()
+  static private boolean jj_3R_125()
  {
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_124()) return true;
     return false;
   }
 
-  static private boolean jj_3R_110()
+  static private boolean jj_3R_121()
  {
-    if (jj_3R_112()) return true;
+    if (jj_3R_124()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_113()) { jj_scanpos = xsp; break; }
+      if (jj_3R_125()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_63()
+  static private boolean jj_3R_67()
  {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_72()) {
+    if (jj_3R_76()) {
     jj_scanpos = xsp;
-    if (jj_3R_73()) return true;
+    if (jj_3R_77()) return true;
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_46()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_54()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_53()
+  static private boolean jj_3R_57()
  {
     if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_48()) return true;
     if (jj_scan_token(RBRACE)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_63()) { jj_scanpos = xsp; break; }
+      if (jj_3R_67()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_54()
- {
-    if (jj_scan_token(REG_IDENTPRIME)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_111()
+  static private boolean jj_3R_122()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_110()) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
-  static private boolean jj_3R_108()
+  static private boolean jj_3R_111()
  {
-    if (jj_3R_110()) return true;
+    if (jj_3R_121()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_111()) { jj_scanpos = xsp; break; }
+      if (jj_3R_122()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_40()
+  static private boolean jj_3R_120()
  {
-    if (jj_3R_46()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_47()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3_5()
+  static private boolean jj_3R_118()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_33()
+  static private boolean jj_3R_116()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_40()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(49)) return true;
-    }
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_219()
+  static private boolean jj_3R_114()
+ {
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_234()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
     if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_214()
+  static private boolean jj_3R_238()
+ {
+    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_237()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_229()
  {
-    if (jj_3R_218()) return true;
+    if (jj_3R_233()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_219()) { jj_scanpos = xsp; break; }
+      if (jj_3R_234()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_109()
+  static private boolean jj_3R_112()
  {
     if (jj_scan_token(IFF)) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
-  static private boolean jj_3R_98()
+  static private boolean jj_3R_101()
  {
-    if (jj_3R_108()) return true;
+    if (jj_3R_111()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_109()) { jj_scanpos = xsp; break; }
+      if (jj_3R_112()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_38()
+  static private boolean jj_3R_233()
  {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) {
+    jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_225()
+  static private boolean jj_3R_42()
  {
-    if (jj_scan_token(REG_QUOTED_STRING)) return true;
     return false;
   }
 
-  static private boolean jj_3R_224()
+  static private boolean jj_3R_51()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_50()) return true;
     return false;
   }
 
-  static private boolean jj_3R_198()
+  static private boolean jj_3R_213()
  {
-    if (jj_3R_44()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_99()
+  static private boolean jj_3R_102()
  {
     if (jj_scan_token(IMPLIES)) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_101()) return true;
     return false;
   }
 
-  static private boolean jj_3R_37()
+  static private boolean jj_3R_41()
  {
     return false;
   }
 
-  static private boolean jj_3R_88()
+  static private boolean jj_3R_95()
  {
-    if (jj_3R_98()) return true;
+    if (jj_3R_101()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_99()) { jj_scanpos = xsp; break; }
+      if (jj_3R_102()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_218()
+  static private boolean jj_3R_33()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_224()) {
-    jj_scanpos = xsp;
-    if (jj_3R_225()) return true;
-    }
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3_17()
+  static private boolean jj_3_20()
  {
     jj_lookingAhead = true;
     jj_semLA = getToken(1).kind==REG_IDENT
                          && getToken(2).kind==COLON;
     jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_38()) return true;
-    if (jj_3R_35()) return true;
+    if (!jj_semLA || jj_3R_42()) return true;
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3R_89()
+  static private boolean jj_3R_50()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_96()
  {
     if (jj_scan_token(QMARK)) return true;
-    if (jj_3R_88()) return true;
+    if (jj_3R_95()) return true;
     if (jj_scan_token(COLON)) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  static private boolean jj_3R_36()
+  static private boolean jj_3R_40()
  {
     return false;
   }
 
-  static private boolean jj_3_14()
+  static private boolean jj_3R_204()
  {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3_16()
+  static private boolean jj_3_19()
  {
     jj_lookingAhead = true;
     jj_semLA = getToken(1).kind==NOT
@@ -5315,81 +5274,168 @@ fl.setLHS(s);
                         && getToken(2).image.equals("HOA")
                         && getToken(3).kind==COLON;
     jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_37()) return true;
+    if (!jj_semLA || jj_3R_41()) return true;
     if (jj_scan_token(NOT)) return true;
-    if (jj_3R_35()) return true;
+    if (jj_3R_36()) return true;
     if (jj_scan_token(COLON)) return true;
     if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_214()) return true;
+    if (jj_3R_229()) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_13()
- {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_32()
+  static private boolean jj_3R_36()
  {
     if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3_12()
+  static private boolean jj_3R_85()
  {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_95()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_96()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_11()
+  static private boolean jj_3R_44()
  {
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_50()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_51()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_81()
+  static private boolean jj_3_5()
  {
-    if (jj_3R_88()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_89()) jj_scanpos = xsp;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3_15()
+  static private boolean jj_3_18()
  {
     jj_lookingAhead = true;
     jj_semLA = getToken(1).kind==REG_IDENT
                         && getToken(1).image.equals("HOA")
                         && getToken(2).kind==COLON;
     jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_36()) return true;
-    if (jj_3R_35()) return true;
+    if (!jj_semLA || jj_3R_40()) return true;
+    if (jj_3R_36()) return true;
     if (jj_scan_token(COLON)) return true;
     if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_214()) return true;
+    if (jj_3R_229()) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_106()
+  static private boolean jj_3R_34()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_44()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(49)) return true;
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_39()
+ {
+    return false;
+  }
+
+  static private boolean jj_3R_38()
  {
-    if (jj_3R_35()) return true;
     return false;
   }
 
   static private boolean jj_3R_189()
  {
-    if (jj_scan_token(OR)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_18()) {
+    jj_scanpos = xsp;
+    if (jj_3_19()) {
+    jj_scanpos = xsp;
+    if (jj_3_20()) {
+    jj_scanpos = xsp;
+    if (jj_3R_213()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_174()
+  static private boolean jj_3R_37()
+ {
+    return false;
+  }
+
+  static private boolean jj_3R_123()
+ {
+    if (jj_3R_126()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_32()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3_17()
+ {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_39()) return true;
+    if (jj_3R_31()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_123()) jj_scanpos = xsp;
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_203()
+ {
+    if (jj_scan_token(AND)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_201()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
+  static private boolean jj_3_16()
+ {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_38()) return true;
+    if (jj_3R_31()) return true;
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  static private boolean jj_3_15()
+ {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind==REG_IDENT && getToken(1).image.equals("time");
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_37()) return true;
+    if (jj_3R_31()) return true;
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_109()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -5397,119 +5443,326 @@ fl.setLHS(s);
     jj_scanpos = xsp;
     if (jj_3_16()) {
     jj_scanpos = xsp;
-    if (jj_3_17()) {
-    jj_scanpos = xsp;
-    if (jj_3R_198()) return true;
+    if (jj_3_17()) return true;
     }
     }
+    return false;
+  }
+
+  static private boolean jj_3R_31()
+ {
+    if (jj_scan_token(REG_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3_14()
+ {
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3_13()
+ {
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_110()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_109()) return true;
+    return false;
+  }
+
+  static private boolean jj_3_12()
+ {
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_209()
+ {
+    if (jj_3R_55()) return true;
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_208()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3_11()
+ {
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_206()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_98()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(85)) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_109()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_110()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_104()
+  static private boolean jj_3R_212()
  {
-    if (jj_3R_35()) return true;
+    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_102()
+  static private boolean jj_3R_190()
  {
-    if (jj_3R_35()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_100()
+  static private boolean jj_3R_211()
  {
-    if (jj_3R_35()) return true;
+    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_35()
+  static private boolean jj_3R_210()
  {
-    if (jj_3R_30()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_95()
+  static private boolean jj_3R_205()
+ {
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_119()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_202()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_117()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_200()
+ {
+    if (jj_scan_token(MIN)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_188()
  {
+    if (jj_scan_token(PMAX)) return true;
     if (jj_scan_token(EQ)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(QMARK)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_115()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_187()
+ {
+    if (jj_scan_token(PMIN)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_113()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_108()
+ {
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_107()
+ {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_186()
+ {
+    if (jj_scan_token(P)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_208()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_211()) {
+    jj_scanpos = xsp;
+    if (jj_3R_212()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_94()
+  static private boolean jj_3R_174()
  {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(FILTER)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_200()) {
+    jj_scanpos = xsp;
+    if (jj_3R_201()) {
+    jj_scanpos = xsp;
+    if (jj_3R_202()) {
+    jj_scanpos = xsp;
+    if (jj_3R_203()) {
+    jj_scanpos = xsp;
+    if (jj_3R_204()) {
+    jj_scanpos = xsp;
+    if (jj_3R_205()) return true;
+    }
+    }
+    }
+    }
+    }
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_48()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_206()) jj_scanpos = xsp;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_93()
+  static private boolean jj_3R_106()
  {
     if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_106()) {
+    if (jj_3R_119()) {
     jj_scanpos = xsp;
-    if (jj_3R_107()) return true;
+    if (jj_3R_120()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_92()
+  static private boolean jj_3R_105()
  {
     if (jj_scan_token(GE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_104()) {
+    if (jj_3R_117()) {
     jj_scanpos = xsp;
-    if (jj_3R_105()) return true;
+    if (jj_3R_118()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_91()
+  static private boolean jj_3R_104()
  {
     if (jj_scan_token(LT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_102()) {
+    if (jj_3R_115()) {
     jj_scanpos = xsp;
-    if (jj_3R_103()) return true;
+    if (jj_3R_116()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_90()
+  static private boolean jj_3R_168()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_186()) {
+    jj_scanpos = xsp;
+    if (jj_3R_187()) {
+    jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
+    }
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_189()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_190()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_103()
  {
     if (jj_scan_token(LE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_100()) {
+    if (jj_3R_113()) {
     jj_scanpos = xsp;
-    if (jj_3R_101()) return true;
+    if (jj_3R_114()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3R_97()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_90()) {
+    if (jj_3R_103()) {
     jj_scanpos = xsp;
-    if (jj_3R_91()) {
+    if (jj_3R_104()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) {
+    if (jj_3R_105()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) {
+    if (jj_3R_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_94()) {
+    if (jj_3R_107()) {
     jj_scanpos = xsp;
-    if (jj_3R_95()) return true;
+    if (jj_3R_108()) return true;
     }
     }
     }
@@ -5518,302 +5771,274 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_67()
- {
-    if (jj_3R_81()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_31()
+  static private boolean jj_3R_71()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  static private boolean jj_3R_80()
+  static private boolean jj_3R_94()
  {
-    if (jj_3R_82()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
-  static private boolean jj_3R_188()
+  static private boolean jj_3R_84()
  {
-    if (jj_scan_token(AND)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_93()) {
+    jj_scanpos = xsp;
+    if (jj_3R_94()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_186()
+  static private boolean jj_3R_93()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
-  static private boolean jj_3R_79()
+  static private boolean jj_3R_207()
  {
-    if (jj_scan_token(G)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_78()
+  static private boolean jj_3R_185()
  {
-    if (jj_scan_token(F)) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_77()
+  static private boolean jj_3R_83()
  {
-    if (jj_scan_token(X)) return true;
+    if (jj_scan_token(G)) return true;
     return false;
   }
 
-  static private boolean jj_3R_194()
+  static private boolean jj_3R_82()
  {
-    if (jj_3R_51()) return true;
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(F)) return true;
     return false;
   }
 
-  static private boolean jj_3R_193()
+  static private boolean jj_3R_173()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_35()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_30()
+  static private boolean jj_3R_81()
  {
-    if (jj_scan_token(REG_IDENT)) return true;
+    if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_66()
+  static private boolean jj_3R_70()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_77()) {
+    if (jj_3R_81()) {
     jj_scanpos = xsp;
-    if (jj_3R_78()) {
+    if (jj_3R_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_79()) return true;
+    if (jj_3R_83()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_80()) jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
+    if (jj_3R_84()) jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  static private boolean jj_3R_197()
+  static private boolean jj_3R_228()
  {
-    if (jj_scan_token(MAX)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_169()) return true;
     return false;
   }
 
-  static private boolean jj_3R_175()
+  static private boolean jj_3R_167()
  {
-    if (jj_3R_53()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_48()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_196()
+  static private boolean jj_3R_239()
  {
-    if (jj_scan_token(MIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(86)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(89)) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_195()
+  static private boolean jj_3R_65()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_70()) {
+    jj_scanpos = xsp;
+    if (jj_3R_71()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_87()
  {
-    if (jj_scan_token(PMAX)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_184()
  {
-    if (jj_scan_token(PMIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_61()
+  static private boolean jj_3R_75()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_66()) {
+    if (jj_3R_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_67()) return true;
+    if (jj_3R_87()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_191()
+  static private boolean jj_3R_86()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3R_178()
  {
-    if (jj_scan_token(P)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_193()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_194()) {
-    jj_scanpos = xsp;
-    if (jj_3R_195()) {
-    jj_scanpos = xsp;
-    if (jj_3R_196()) {
-    jj_scanpos = xsp;
-    if (jj_3R_197()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_71()
+  static private boolean jj_3R_240()
  {
-    if (jj_3R_82()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_239()) return true;
     return false;
   }
 
-  static private boolean jj_3R_70()
+  static private boolean jj_3R_74()
  {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3R_236()
  {
-    if (jj_3R_30()) return true;
+    if (jj_3R_239()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_240()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_153()
+  static private boolean jj_3R_177()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_171()) {
-    jj_scanpos = xsp;
-    if (jj_3R_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
-    }
-    }
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_174()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_175()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_69()
+  static private boolean jj_3R_73()
  {
     if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_187()
+  static private boolean jj_3R_72()
  {
-    if (jj_scan_token(PLUS)) return true;
+    if (jj_scan_token(U)) return true;
     return false;
   }
 
-  static private boolean jj_3R_68()
+  static private boolean jj_3R_232()
  {
-    if (jj_scan_token(U)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_236()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_185()
+  static private boolean jj_3R_231()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_62()
+  static private boolean jj_3R_226()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_68()) {
-    jj_scanpos = xsp;
-    if (jj_3R_69()) {
+    if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (jj_3R_70()) return true;
+    if (jj_3R_232()) return true;
     }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_71()) jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
     return false;
   }
 
-  static private boolean jj_3R_159()
+  static private boolean jj_3R_66()
  {
-    if (jj_scan_token(FILTER)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_185()) {
-    jj_scanpos = xsp;
-    if (jj_3R_186()) {
-    jj_scanpos = xsp;
-    if (jj_3R_187()) {
-    jj_scanpos = xsp;
-    if (jj_3R_188()) {
+    if (jj_3R_72()) {
     jj_scanpos = xsp;
-    if (jj_3R_189()) {
+    if (jj_3R_73()) {
     jj_scanpos = xsp;
-    if (jj_3R_190()) return true;
-    }
-    }
-    }
+    if (jj_3R_74()) return true;
     }
     }
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_44()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_191()) jj_scanpos = xsp;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_75()) jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  static private boolean jj_3R_192()
+  static private boolean jj_3R_176()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_170()
+  static private boolean jj_3R_56()
+ {
+    if (jj_3R_65()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_66()) jj_scanpos = xsp;
+    return false;
+  }
+
+  static private boolean jj_3R_199()
  {
-    if (jj_3R_30()) return true;
+    if (jj_3R_167()) return true;
     return false;
   }
 
-  static private boolean jj_3R_52()
+  static private boolean jj_3R_183()
  {
-    if (jj_3R_61()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_62()) jj_scanpos = xsp;
+    if (jj_scan_token(MIN)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_227()
+ {
+    if (jj_3R_168()) return true;
     return false;
   }
 
@@ -5832,7 +6057,7 @@ fl.setLHS(s);
   static private boolean jj_lookingAhead = false;
   static private boolean jj_semLA;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[103];
+  static final private int[] jj_la1 = new int[107];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5842,15 +6067,15 @@ fl.setLHS(s);
       jj_la1_init_2();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0xa0ba0808,0x0,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0000000,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x0,0xa0ba0808,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0000000,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0xc2000,0x2,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x4012783a,0x10000000,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x4012783a,0x4012783a,0x0,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x0,0x4000000,};
+      jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0x0,0xc2000,0x2,0x0,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x10000000,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x4012783a,0x10000000,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x0,0x4012783a,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x0,0x4000000,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x3608404,0x0,0x3608404,0x3608404,0x0,0x3608404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x1000000,0x0,0x1,0x1000000,0x4000,0x3608404,0x0,0x0,0x0,0x3608405,0x1000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x3000000,0x0,0x3341,0x0,0x0,0x3341,0x3608404,0x3608404,0x3608404,0x3608404,0x3608404,0x3341,0x100000,0x0,0x0,0x0,0x0,0x3608404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x3608404,0x3600404,0x0,0x0,0x1000000,0x0,0x600000,0x0,0x3340,0x0,0x10,0x3608404,0x0,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x3608404,0x3608404,0x20000,0x0,0x3608404,0x404,0x0,0x0,0x0,0x1200000,0x10000,0x1200000,0x1004000,0x0,0x6000000,0x1000000,0xc0,0x3300,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x0,0x6c08404,0x0,0x6c08404,0x6c08404,0x0,0x6c08404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x2000000,0x0,0x1,0x2000000,0x4000,0x6c08404,0x0,0x0,0x0,0x6c08405,0x2000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x6000000,0x0,0x203351,0x203351,0x0,0x0,0x203351,0x203351,0x6c08404,0x6c08404,0x6c08404,0x6c08404,0x6c08404,0x3341,0x200000,0x0,0x10,0x100000,0x0,0x0,0x0,0x0,0x6c08404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x6c08404,0x6c00404,0x0,0x0,0x2000000,0x0,0xc00000,0x0,0x3340,0x0,0x10,0x6c08404,0x0,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x20000,0x6c08404,0x0,0x6c08404,0x404,0x0,0x0,0x0,0x2400000,0x10000,0x2400000,0x2004000,0x0,0xc000000,0x2000000,0xc0,0x3300,0x0,};
    }
-  static final private JJCalls[] jj_2_rtns = new JJCalls[21];
+  static final private JJCalls[] jj_2_rtns = new JJCalls[23];
   static private boolean jj_rescan = false;
   static private int jj_gc = 0;
 
@@ -5872,7 +6097,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5887,7 +6112,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5905,7 +6130,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5916,7 +6141,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5933,7 +6158,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5943,7 +6168,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 103; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6056,12 +6281,12 @@ fl.setLHS(s);
   /** Generate ParseException. */
   static public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[93];
+    boolean[] la1tokens = new boolean[94];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 103; i++) {
+    for (int i = 0; i < 107; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -6076,7 +6301,7 @@ fl.setLHS(s);
         }
       }
     }
-    for (int i = 0; i < 93; i++) {
+    for (int i = 0; i < 94; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
@@ -6103,7 +6328,7 @@ fl.setLHS(s);
 
   static private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 21; i++) {
+    for (int i = 0; i < 23; i++) {
     try {
       JJCalls p = jj_2_rtns[i];
       do {
@@ -6131,6 +6356,8 @@ fl.setLHS(s);
             case 18: jj_3_19(); break;
             case 19: jj_3_20(); break;
             case 20: jj_3_21(); break;
+            case 21: jj_3_22(); break;
+            case 22: jj_3_23(); break;
           }
         }
         p = p.next;
diff --git a/prism/src/parser/PrismParserConstants.java b/prism/src/parser/PrismParserConstants.java
index 5f3f1011..c3935153 100644
--- a/prism/src/parser/PrismParserConstants.java
+++ b/prism/src/parser/PrismParserConstants.java
@@ -179,21 +179,23 @@ public interface PrismParserConstants {
   /** RegularExpression Id. */
   int QMARK = 84;
   /** RegularExpression Id. */
-  int REG_INT = 85;
+  int CARET = 85;
   /** RegularExpression Id. */
-  int REG_DOUBLE = 86;
+  int REG_INT = 86;
   /** RegularExpression Id. */
-  int REG_IDENTPRIME = 87;
+  int REG_DOUBLE = 87;
   /** RegularExpression Id. */
-  int REG_IDENT = 88;
+  int REG_IDENTPRIME = 88;
   /** RegularExpression Id. */
-  int REG_QUOTED_IDENT = 89;
+  int REG_IDENT = 89;
   /** RegularExpression Id. */
-  int REG_QUOTED_STRING = 90;
+  int REG_QUOTED_IDENT = 90;
   /** RegularExpression Id. */
-  int PREPROC = 91;
+  int REG_QUOTED_STRING = 91;
   /** RegularExpression Id. */
-  int LEXICAL_ERROR = 92;
+  int PREPROC = 92;
+  /** RegularExpression Id. */
+  int LEXICAL_ERROR = 93;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -285,6 +287,7 @@ public interface PrismParserConstants {
     "\"\\\'\"",
     "\"<-\"",
     "\"?\"",
+    "\"^\"",
     "<REG_INT>",
     "<REG_DOUBLE>",
     "<REG_IDENTPRIME>",
diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java
index 54224965..9e73243c 100644
--- a/prism/src/parser/PrismParserTokenManager.java
+++ b/prism/src/parser/PrismParserTokenManager.java
@@ -24,24 +24,24 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
+         if ((active0 & 0x387c5fb5ff6f0L) != 0L)
+         {
+            jjmatchedKind = 89;
+            return 31;
+         }
          if ((active0 & 0xc783a04a00908L) != 0L)
             return 31;
          if ((active1 & 0x20000L) != 0L)
             return 1;
          if ((active0 & 0x2000000000000000L) != 0L)
             return 11;
-         if ((active0 & 0x387c5fb5ff6f0L) != 0L)
-         {
-            jjmatchedKind = 88;
-            return 31;
-         }
          return -1;
       case 1:
          if ((active0 & 0x39fddfb5ff6f0L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 88;
+               jjmatchedKind = 89;
                jjmatchedPos = 1;
             }
             return 31;
@@ -52,58 +52,58 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x39edd135ff6f0L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 2;
             return 31;
          }
          return -1;
       case 3:
-         if ((active0 & 0x21ad801100490L) != 0L)
-            return 31;
          if ((active0 & 0x18405124ff260L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 88;
+               jjmatchedKind = 89;
                jjmatchedPos = 3;
             }
             return 31;
          }
+         if ((active0 & 0x21ad801100490L) != 0L)
+            return 31;
          return -1;
       case 4:
-         if ((active0 & 0x10020060L) != 0L)
-            return 31;
          if ((active0 & 0x18445024df200L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 4;
             return 31;
          }
+         if ((active0 & 0x10020060L) != 0L)
+            return 31;
          return -1;
       case 5:
          if ((active0 & 0x1000100480200L) != 0L)
             return 31;
          if ((active0 & 0x84440205f000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 5;
             return 31;
          }
          return -1;
       case 6:
-         if ((active0 & 0x40000041000L) != 0L)
-            return 31;
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 6;
             return 31;
          }
+         if ((active0 & 0x40000041000L) != 0L)
+            return 31;
          return -1;
       case 7:
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 7;
             return 31;
          }
@@ -113,7 +113,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x80440000a000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 8;
             return 31;
          }
@@ -123,7 +123,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 9;
             return 31;
          }
@@ -131,7 +131,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 10;
             return 31;
          }
@@ -141,7 +141,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 11;
             return 31;
          }
@@ -151,7 +151,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 12;
             return 31;
          }
@@ -159,7 +159,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 13:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 13;
             return 31;
          }
@@ -167,7 +167,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 14:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 14;
             return 31;
          }
@@ -259,6 +259,8 @@ static private int jjMoveStringLiteralDfa0_0(){
       case 93:
          jjmatchedKind = 65;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x8L);
+      case 94:
+         return jjStopAtPos(0, 85);
       case 98:
          return jjMoveStringLiteralDfa1_0(0x10L, 0x0L);
       case 99:
@@ -863,14 +865,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 89)
+                        kind = 89;
                      { jjCheckNAdd(22); }
                   }
                   else if (curChar == 39)
                   {
-                     if (kind > 87)
-                        kind = 87;
+                     if (kind > 88)
+                        kind = 88;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                      { jjCheckNAddTwoStates(20, 21); }
@@ -878,8 +880,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 87)
+                        kind = 87;
                      { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
@@ -897,14 +899,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 85)
-                        kind = 85;
+                     if (kind > 86)
+                        kind = 86;
                      { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 85)
-                        kind = 85;
+                     if (kind > 86)
+                        kind = 86;
                   }
                   break;
                case 1:
@@ -940,20 +942,20 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 7:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 85)
-                     kind = 85;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 85)
-                     kind = 85;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAdd(8); }
                   break;
                case 9:
-                  if (curChar == 48 && kind > 85)
-                     kind = 85;
+                  if (curChar == 48 && kind > 86)
+                     kind = 86;
                   break;
                case 10:
                   if (curChar == 46)
@@ -962,8 +964,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
@@ -973,8 +975,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAdd(14); }
                   break;
                case 15:
@@ -986,14 +988,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
-                  if (curChar == 35 && kind > 91)
-                     kind = 91;
+                  if (curChar == 35 && kind > 92)
+                     kind = 92;
                   break;
                case 18:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAddStates(0, 3); }
                   break;
                case 20:
@@ -1001,14 +1003,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
-                  if (curChar == 39 && kind > 87)
-                     kind = 87;
+                  if (curChar == 39 && kind > 88)
+                     kind = 88;
                   break;
                case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAdd(22); }
                   break;
                case 23:
@@ -1020,8 +1022,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjAddStates(11, 12); }
                   break;
                case 26:
-                  if (curChar == 34 && kind > 89)
-                     kind = 89;
+                  if (curChar == 34 && kind > 90)
+                     kind = 90;
                   break;
                case 28:
                   { jjCheckNAddStates(13, 15); }
@@ -1031,8 +1033,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddStates(13, 15); }
                   break;
                case 30:
-                  if (curChar == 34 && kind > 90)
-                     kind = 90;
+                  if (curChar == 34 && kind > 91)
+                     kind = 91;
                   break;
                default : break;
             }
@@ -1048,8 +1050,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 89)
+                        kind = 89;
                      { jjCheckNAdd(22); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
@@ -1058,8 +1060,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAddStates(16, 18); }
                   break;
                case 2:
@@ -1081,8 +1083,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 22:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAdd(22); }
                   break;
                case 24:
@@ -1184,7 +1186,7 @@ public static final String[] jjstrLiteralImages = {
 "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", 
 "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", 
 "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", 
-"\77", null, null, null, null, null, null, null, null, };
+"\77", "\136", null, null, null, null, null, null, null, null, };
 static protected Token jjFillToken()
 {
    final Token t;
@@ -1242,9 +1244,9 @@ public static Token getNextToken()
    jjmatchedKind = 0x7fffffff;
    jjmatchedPos = 0;
    curPos = jjMoveStringLiteralDfa0_0();
-   if (jjmatchedPos == 0 && jjmatchedKind > 92)
+   if (jjmatchedPos == 0 && jjmatchedKind > 93)
    {
-      jjmatchedKind = 92;
+      jjmatchedKind = 93;
    }
    if (jjmatchedKind != 0x7fffffff)
    {
@@ -1375,7 +1377,7 @@ public static final String[] lexStateNames = {
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xfffffffffffffff9L, 0x1fffffffL, 
+   0xfffffffffffffff9L, 0x3fffffffL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L,