diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 418b2a17..147e6ae6 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -14,6 +14,7 @@ import prism.ModelInfo;
 import parser.visitor.*;
 import prism.ModelType;
 import prism.PrismLangException;
+import explicit.MinMax;
 
 @SuppressWarnings({"unused", "static-access", "serial"})
 public class PrismParser implements PrismParserConstants {
@@ -2752,6 +2753,7 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.PARENTH, expr); ret.setPosition(be
 Expression ExpressionProb(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent modifier = null;
         int r;
         String relOp = null;
+        MinMax minMax = null;
         Expression prob = null;
         Expression expr;
         Filter filter = null;
@@ -2774,58 +2776,65 @@ if (!prop) {if (true) throw generateParseException();}
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LT:
-      case GT:
-      case LE:
-      case GE:{
-        r = LtGt();
-        prob = Expression(false, false);
-relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
-        break;
-        }
-      case EQ:{
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "="; isBool = false;
-        break;
-        }
+      case MAX:
       case MIN:{
-        jj_consume_token(MIN);
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "min="; isBool = false;
-        break;
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case MIN:{
+          jj_consume_token(MIN);
+minMax = MinMax.min();
+          break;
+          }
+        case MAX:{
+          jj_consume_token(MAX);
+minMax = MinMax.max();
+          break;
+          }
+        default:
+          jj_la1[74] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      case MAX:{
-        jj_consume_token(MAX);
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "max="; isBool = false;
         break;
         }
       default:
-        jj_la1[74] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+        jj_la1[75] = jj_gen;
+        ;
       }
       break;
       }
     case PMIN:{
       begin = jj_consume_token(PMIN);
-      jj_consume_token(EQ);
-      jj_consume_token(QMARK);
-relOp = "min="; isBool = false;
+minMax = MinMax.min();
       break;
       }
     case PMAX:{
       begin = jj_consume_token(PMAX);
+minMax = MinMax.max();
+      break;
+      }
+    default:
+      jj_la1[76] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:
+    case GT:
+    case LE:
+    case GE:{
+      r = LtGt();
+      prob = Expression(false, false);
+relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
+      break;
+      }
+    case EQ:{
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-relOp = "max="; isBool = false;
+relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[75] = jj_gen;
+      jj_la1[77] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2837,12 +2846,13 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[76] = jj_gen;
+      jj_la1[78] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
 ret.setModifier(modifier == null ? null : modifier.getName());
                 ret.setRelOp(relOp);
+                ret.setMinMax(minMax);
                 ret.setProb(prob);
                 ret.setExpression(expr);
                 ret.setFilter(filter);
@@ -2939,7 +2949,7 @@ result = Expression.Not(result);
         break;
         }
       default:
-        jj_la1[77] = jj_gen;
+        jj_la1[79] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2963,7 +2973,7 @@ result = new ExpressionHOA(hoaAutomatonFile);
         break;
         }
       default:
-        jj_la1[78] = jj_gen;
+        jj_la1[80] = jj_gen;
         break label_28;
       }
       jj_consume_token(COMMA);
@@ -2993,7 +3003,7 @@ filter = new Filter(expr);
         break;
         }
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[81] = jj_gen;
         break label_29;
       }
       jj_consume_token(LBRACE);
@@ -3009,7 +3019,7 @@ filter.setMaxRequested(true);
         break;
         }
       default:
-        jj_la1[80] = jj_gen;
+        jj_la1[82] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3047,7 +3057,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[83] = jj_gen;
         ;
       }
       r = LtGt();
@@ -3062,7 +3072,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[82] = jj_gen;
+      jj_la1[84] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3074,7 +3084,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[85] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3101,6 +3111,7 @@ ret.setModifier(modifier == null ? null : modifier.getName());
 Expression ExpressionReward(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent modifier = null;
         int r;
         String relOp = null;
+        MinMax minMax = null;
         Expression rew = null;
         Expression expr;
         Filter filter = null;
@@ -3119,7 +3130,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[84] = jj_gen;
+        jj_la1[86] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3128,62 +3139,69 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[85] = jj_gen;
+        jj_la1[87] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LT:
-      case GT:
-      case LE:
-      case GE:{
-        r = LtGt();
-        rew = Expression(false, false);
-relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
-        break;
-        }
-      case EQ:{
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "="; isBool = false;
-        break;
-        }
+      case MAX:
       case MIN:{
-        jj_consume_token(MIN);
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "min="; isBool = false;
-        break;
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case MIN:{
+          jj_consume_token(MIN);
+minMax = MinMax.min();
+          break;
+          }
+        case MAX:{
+          jj_consume_token(MAX);
+minMax = MinMax.max();
+          break;
+          }
+        default:
+          jj_la1[88] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      case MAX:{
-        jj_consume_token(MAX);
-        jj_consume_token(EQ);
-        jj_consume_token(QMARK);
-relOp = "max="; isBool = false;
         break;
         }
       default:
-        jj_la1[86] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+        jj_la1[89] = jj_gen;
+        ;
       }
       break;
       }
     case RMIN:{
       begin = jj_consume_token(RMIN);
-      jj_consume_token(EQ);
-      jj_consume_token(QMARK);
-relOp = "min="; isBool = false;
+minMax = MinMax.min();
       break;
       }
     case RMAX:{
       begin = jj_consume_token(RMAX);
+minMax = MinMax.max();
+      break;
+      }
+    default:
+      jj_la1[90] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:
+    case GT:
+    case LE:
+    case GE:{
+      r = LtGt();
+      rew = Expression(false, false);
+relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
+      break;
+      }
+    case EQ:{
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-relOp = "max="; isBool = false;
+relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[87] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3195,11 +3213,12 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[88] = jj_gen;
+      jj_la1[92] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
 ret.setModifier(modifier == null ? null : modifier.getName());
+                ret.setMinMax(minMax);
                 ret.setRelOp(relOp);
                 ret.setReward(rew);
                 ret.setExpression(expr);
@@ -3229,7 +3248,7 @@ void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object
       break;
       }
     default:
-      jj_la1[89] = jj_gen;
+      jj_la1[93] = jj_gen;
       ;
     }
 exprRew.setRewardStructIndex(index);
@@ -3275,7 +3294,7 @@ exprRew.setRewardStructIndex(index);
         break;
         }
       default:
-        jj_la1[90] = jj_gen;
+        jj_la1[94] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3308,7 +3327,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
         }
       default:
-        jj_la1[91] = jj_gen;
+        jj_la1[95] = jj_gen;
         if (jj_2_23(2147483647)) {
           begin = jj_consume_token(C);
           jj_consume_token(LE);
@@ -3360,7 +3379,7 @@ ret = expr;
             break;
             }
           default:
-            jj_la1[92] = jj_gen;
+            jj_la1[96] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3425,7 +3444,7 @@ ret = new ExpressionStrategy(false);
       break;
       }
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[97] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3450,7 +3469,7 @@ ret = new ExpressionStrategy(false);
         break;
         }
       default:
-        jj_la1[94] = jj_gen;
+        jj_la1[98] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3463,7 +3482,7 @@ ret.addOperand(expr);
       break;
       }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[99] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3483,7 +3502,7 @@ exprStrat.setCoalitionAllPlayers();
       break;
       }
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[102] = jj_gen;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
       case REG_IDENT:{
@@ -3497,7 +3516,7 @@ coalition.add(s);
             break;
             }
           default:
-            jj_la1[96] = jj_gen;
+            jj_la1[100] = jj_gen;
             break label_30;
           }
           jj_consume_token(COMMA);
@@ -3507,7 +3526,7 @@ coalition.add(s);
         break;
         }
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[101] = jj_gen;
         ;
       }
 exprStrat.setCoalition(coalition);
@@ -3527,7 +3546,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3590,7 +3609,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[104] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3603,7 +3622,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[105] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -3667,7 +3686,7 @@ s = getToken(0).image;
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[106] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3699,7 +3718,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[103] = jj_gen;
+      jj_la1[107] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3736,7 +3755,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[108] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3768,7 +3787,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3794,7 +3813,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[110] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -3991,25 +4010,6 @@ fl.setLHS(s);
     finally { jj_save(22, xla); }
   }
 
-  static private boolean jj_3R_198()
- {
-    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_197()
- {
-    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_175()
  {
     if (jj_scan_token(REG_INT)) return true;
@@ -4033,14 +4033,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_196()
- {
-    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_3R_99()
  {
     if (jj_scan_token(COMMA)) return true;
@@ -4054,19 +4046,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_130()
  {
-    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;
-    }
+    if (jj_3R_48()) return true;
     return false;
   }
 
@@ -4076,14 +4058,17 @@ fl.setLHS(s);
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_207()) { jj_scanpos = xsp; break; }
+      if (jj_3R_211()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_171()
  {
+    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;
   }
 
@@ -4112,18 +4097,18 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3_4()
  {
-    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;
+    if (jj_scan_token(LABEL)) return true;
     return false;
   }
 
-  static private boolean jj_3_4()
+  static private boolean jj_3R_170()
  {
-    if (jj_scan_token(LABEL)) 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;
   }
 
@@ -4154,6 +4139,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_23()
+ {
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_90()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -4162,12 +4154,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_170()
+  static private boolean jj_3R_223()
  {
-    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;
   }
 
@@ -4177,6 +4166,20 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_22()
+ {
+    if (jj_3R_43()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_222()
+ {
+    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_179()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -4198,6 +4201,20 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_221()
+ {
+    if (jj_scan_token(C)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_220()
+ {
+    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_78()
  {
     Token xsp;
@@ -4221,16 +4238,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_23()
+  static private boolean jj_3R_219()
  {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
+    if (jj_scan_token(S)) return true;
     return false;
   }
 
-  static private boolean jj_3R_225()
+  static private boolean jj_3R_218()
  {
-    if (jj_3R_48()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
@@ -4251,49 +4267,44 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_22()
+  static private boolean jj_3_21()
  {
-    if (jj_3R_43()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_224()
+  static private boolean jj_3R_198()
  {
-    if (jj_scan_token(I)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_48()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_218()) {
+    jj_scanpos = xsp;
+    if (jj_3R_219()) {
+    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()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  static private boolean jj_3R_223()
+  static private boolean jj_3R_162()
  {
-    if (jj_scan_token(C)) return true;
+    if (jj_3R_174()) return true;
     return false;
   }
 
-  static private boolean jj_3R_222()
- {
-    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_scan_token(S)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_162()
- {
-    if (jj_3R_174()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_220()
+  static private boolean jj_3R_199()
  {
-    if (jj_3R_43()) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
@@ -4327,38 +4338,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_160()
- {
-    if (jj_3R_172()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_21()
+  static private boolean jj_3R_129()
  {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_194()
+  static private boolean jj_3R_160()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    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;
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_172()) return true;
     return false;
   }
 
@@ -4411,12 +4399,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_195()
- {
-    if (jj_3R_57()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_156()
  {
     if (jj_3R_43()) return true;
@@ -4447,9 +4429,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_129()
+  static private boolean jj_3R_126()
  {
-    if (jj_3R_32()) 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;
   }
 
@@ -4498,16 +4487,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_126()
+  static private boolean jj_3R_237()
  {
-    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;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_126()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_232()
+ {
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
@@ -4524,6 +4513,15 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_230()
+ {
+    if (jj_3R_126()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) jj_scanpos = xsp;
+    return false;
+  }
+
   static private boolean jj_3R_149()
  {
     Token xsp;
@@ -4590,13 +4588,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_235()
- {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_3R_126()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_59()
  {
     if (jj_3R_68()) return true;
@@ -4613,15 +4604,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_230()
- {
-    if (jj_3R_126()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_235()) jj_scanpos = xsp;
-    return false;
-  }
-
   static private boolean jj_3R_141()
  {
     Token xsp;
@@ -4651,48 +4633,44 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_52()
+  static private boolean jj_3R_197()
  {
-    if (jj_3R_59()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_60()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_137()
+  static private boolean jj_3R_196()
  {
-    if (jj_3R_141()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_142()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_55()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_216()
+  static private boolean jj_3R_231()
  {
-    if (jj_3R_55()) return true;
-    if (jj_3R_48()) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3R_217()
  {
-    if (jj_scan_token(PLUS)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_231()) {
+    jj_scanpos = xsp;
+    if (jj_3R_232()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_215()
+  static private boolean jj_3R_216()
  {
     if (jj_3R_230()) return true;
     return false;
   }
 
-  static private boolean jj_3R_214()
+  static private boolean jj_3R_215()
  {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_36()) return true;
@@ -4700,93 +4678,74 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_219()
- {
-    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_193()
+  static private boolean jj_3R_195()
  {
     if (jj_scan_token(RMAX)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_52()
  {
+    if (jj_3R_59()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_143()) {
-    jj_scanpos = xsp;
-    if (jj_3R_144()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_60()) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_137()) return true;
     return false;
   }
 
-  static private boolean jj_3R_218()
+  static private boolean jj_3R_194()
  {
-    if (jj_scan_token(MIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(RMIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_192()
+  static private boolean jj_3R_137()
  {
-    if (jj_scan_token(RMIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_141()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_142()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_217()
+  static private boolean jj_3R_49()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_49()
+  static private boolean jj_3R_143()
  {
-    if (jj_3R_57()) return true;
+    if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_191()
+  static private boolean jj_3R_193()
  {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_214()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_215()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_216()) {
-    jj_scanpos = xsp;
-    if (jj_3R_217()) {
-    jj_scanpos = xsp;
-    if (jj_3R_218()) {
-    jj_scanpos = xsp;
-    if (jj_3R_219()) return true;
-    }
-    }
-    }
+    if (jj_3R_216()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_217()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_134()
+  static private boolean jj_3R_138()
  {
-    if (jj_3R_137()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_138()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_143()) {
+    jj_scanpos = xsp;
+    if (jj_3R_144()) return true;
     }
+    if (jj_3R_137()) return true;
     return false;
   }
 
@@ -4794,21 +4753,37 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_191()) {
+    if (jj_3R_193()) {
     jj_scanpos = xsp;
-    if (jj_3R_192()) {
+    if (jj_3R_194()) {
     jj_scanpos = xsp;
-    if (jj_3R_193()) return true;
+    if (jj_3R_195()) return true;
+    }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) return true;
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_194()) return true;
+    if (jj_3R_198()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_195()) jj_scanpos = xsp;
+    if (jj_3R_199()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
+  static private boolean jj_3R_134()
+ {
+    if (jj_3R_137()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_138()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_45()
  {
     if (jj_3R_52()) return true;
@@ -4833,24 +4808,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_132()
- {
-    if (jj_3R_134()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_135()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3_7()
- {
-    if (jj_3R_32()) return true;
-    if (jj_3R_35()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_64()
  {
     if (jj_scan_token(LE)) return true;
@@ -4863,31 +4820,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_133()
+  static private boolean jj_3R_62()
  {
-    if (jj_3R_136()) return true;
-    if (jj_3R_132()) return true;
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_62()
- {
-    if (jj_scan_token(LT)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_54()
- {
-    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_47()
+  static private boolean jj_3R_132()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_134()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_135()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -4914,22 +4860,25 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_1()
+  static private boolean jj_3_7()
  {
-    if (jj_scan_token(MODULE)) return true;
-    if (jj_3R_31()) return true;
-    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_131()
+  static private boolean jj_3R_54()
  {
-    if (jj_3R_132()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_133()) { jj_scanpos = xsp; break; }
-    }
+    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_47()
+ {
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
@@ -4943,25 +4892,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_128()
- {
-    if (jj_3R_131()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_140()
  {
     if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  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;
@@ -4979,6 +4915,32 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_133()
+ {
+    if (jj_3R_136()) return true;
+    if (jj_3R_132()) return true;
+    return false;
+  }
+
+  static private boolean jj_3_1()
+ {
+    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_131()
+ {
+    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_43()
  {
     if (jj_scan_token(S)) return true;
@@ -4996,56 +4958,51 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_6()
+  static private boolean jj_3R_128()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
-  static private boolean jj_3R_124()
+  static private boolean jj_3R_127()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) return true;
-    }
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_124()) return true;
     return false;
   }
 
-  static private boolean jj_3R_77()
+  static private boolean jj_3R_58()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
 
-  static private boolean jj_3R_76()
+  static private boolean jj_3R_77()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3_6()
  {
-    if (jj_scan_token(REG_IDENTPRIME)) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_125()
+  static private boolean jj_3R_124()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_124()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_127()) {
+    jj_scanpos = xsp;
+    if (jj_3R_128()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_121()
+  static private boolean jj_3R_76()
  {
-    if (jj_3R_124()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_125()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -5062,6 +5019,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_125()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_124()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_57()
  {
     if (jj_scan_token(LBRACE)) return true;
@@ -5075,6 +5039,23 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_121()
+ {
+    if (jj_3R_124()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_125()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_240()
+ {
+    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_122()
  {
     if (jj_scan_token(OR)) return true;
@@ -5082,6 +5063,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_239()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_111()
  {
     if (jj_3R_121()) return true;
@@ -5093,66 +5080,70 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_120()
+  static private boolean jj_3R_236()
  {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(RENAME)) return true;
     if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_118()
+  static private boolean jj_3R_120()
  {
     if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3R_235()
  {
-    if (jj_3R_48()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_239()) {
+    jj_scanpos = xsp;
+    if (jj_3R_240()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_114()
+  static private boolean jj_3R_118()
  {
     if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_234()
+  static private boolean jj_3R_229()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(RENAME)) return true;
-    if (jj_3R_48()) return true;
+    if (jj_3R_235()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_236()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_238()
+  static private boolean jj_3R_116()
  {
-    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_237()
+  static private boolean jj_3R_114()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3R_229()
+  static private boolean jj_3R_112()
  {
-    if (jj_3R_233()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_234()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(IFF)) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
-  static private boolean jj_3R_112()
+  static private boolean jj_3R_42()
  {
-    if (jj_scan_token(IFF)) return true;
-    if (jj_3R_111()) return true;
     return false;
   }
 
@@ -5167,19 +5158,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_233()
+  static private boolean jj_3R_33()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_237()) {
-    jj_scanpos = xsp;
-    if (jj_3R_238()) return true;
-    }
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_42()
+  static private boolean jj_3R_214()
  {
+    if (jj_3R_48()) return true;
     return false;
   }
 
@@ -5190,9 +5177,8 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_213()
+  static private boolean jj_3R_41()
  {
-    if (jj_3R_48()) return true;
     return false;
   }
 
@@ -5203,8 +5189,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_41()
+  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_42()) return true;
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_208()
  {
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
@@ -5219,20 +5217,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_33()
+  static private boolean jj_3R_40()
  {
-    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3_20()
+  static private boolean jj_3R_36()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT
-                         && getToken(2).kind==COLON;
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_42()) return true;
-    if (jj_3R_36()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -5255,17 +5247,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_40()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_204()
- {
-    if (jj_scan_token(OR)) return true;
-    return false;
-  }
-
   static private boolean jj_3_19()
  {
     jj_lookingAhead = true;
@@ -5284,9 +5265,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_36()
+  static private boolean jj_3_18()
  {
-    if (jj_3R_31()) return true;
+    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_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_229()) return true;
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
@@ -5299,6 +5290,23 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_191()
+ {
+    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_214()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_44()
  {
     if (jj_3R_50()) return true;
@@ -5316,19 +5324,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_18()
+  static private boolean jj_3R_32()
  {
-    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_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_229()) return true;
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_228()
+ {
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
@@ -5343,30 +5347,25 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_39()
+  static private boolean jj_3R_207()
  {
+    if (jj_scan_token(AND)) return true;
     return false;
   }
 
-  static private boolean jj_3R_38()
+  static private boolean jj_3R_205()
  {
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_189()
+  static private boolean jj_3R_39()
+ {
+    return false;
+  }
+
+  static private boolean jj_3R_38()
  {
-    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;
   }
 
@@ -5381,9 +5380,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_32()
+  static private boolean jj_3R_31()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
@@ -5401,18 +5400,6 @@ fl.setLHS(s);
     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;
@@ -5449,9 +5436,36 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_31()
+  static private boolean jj_3R_210()
  {
-    if (jj_scan_token(REG_IDENT)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_48()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_209()
+ {
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_212()
+ {
+    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_206()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_204()
+ {
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -5483,18 +5497,9 @@ fl.setLHS(s);
     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()
+  static private boolean jj_3R_192()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_57()) return true;
     return false;
   }
 
@@ -5505,13 +5510,6 @@ fl.setLHS(s);
     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;
@@ -5527,38 +5525,47 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_212()
- {
-    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_190()
- {
-    if (jj_3R_57()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_211()
+  static private boolean jj_3R_174()
  {
-    if (jj_scan_token(MIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(FILTER)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_204()) {
+    jj_scanpos = xsp;
+    if (jj_3R_205()) {
+    jj_scanpos = xsp;
+    if (jj_3R_206()) {
+    jj_scanpos = xsp;
+    if (jj_3R_207()) {
+    jj_scanpos = xsp;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) return true;
+    }
+    }
+    }
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_48()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_210()) jj_scanpos = xsp;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_210()
+  static private boolean jj_3R_190()
  {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_205()
+  static private boolean jj_3R_189()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_55()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
@@ -5568,29 +5575,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_202()
+  static private boolean jj_3R_227()
  {
-    if (jj_scan_token(PLUS)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_117()
+  static private boolean jj_3R_213()
  {
-    if (jj_3R_36()) 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_200()
+  static private boolean jj_3R_117()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_3R_36()) 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_scan_token(QMARK)) return true;
     return false;
   }
 
@@ -5603,8 +5613,6 @@ fl.setLHS(s);
   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;
   }
 
@@ -5614,6 +5622,17 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_186()
+ {
+    if (jj_scan_token(P)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_212()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_213()) jj_scanpos = xsp;
+    return false;
+  }
+
   static private boolean jj_3R_108()
  {
     if (jj_scan_token(EQ)) return true;
@@ -5631,56 +5650,6 @@ fl.setLHS(s);
     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_174()
- {
-    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_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_106()
  {
     if (jj_scan_token(GT)) return true;
@@ -5705,18 +5674,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_104()
- {
-    if (jj_scan_token(LT)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_115()) {
-    jj_scanpos = xsp;
-    if (jj_3R_116()) return true;
-    }
-    return false;
-  }
-
   static private boolean jj_3R_168()
  {
     Token xsp;
@@ -5728,14 +5685,31 @@ fl.setLHS(s);
     if (jj_3R_188()) return true;
     }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_189()) {
+    jj_scanpos = xsp;
+    if (jj_3R_190()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_189()) return true;
+    if (jj_3R_191()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_190()) jj_scanpos = xsp;
+    if (jj_3R_192()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
+  static private boolean jj_3R_104()
+ {
+    if (jj_scan_token(LT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_115()) {
+    jj_scanpos = xsp;
+    if (jj_3R_116()) return true;
+    }
+    return false;
+  }
+
   static private boolean jj_3R_103()
  {
     if (jj_scan_token(LE)) return true;
@@ -5771,6 +5745,18 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_173()
+ {
+    if (jj_3R_33()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_226()
+ {
+    if (jj_3R_169()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_71()
  {
     if (jj_3R_85()) return true;
@@ -5800,7 +5786,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_207()
+  static private boolean jj_3R_211()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_48()) return true;
@@ -5825,15 +5811,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_81()
  {
-    if (jj_3R_33()) return true;
+    if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_81()
+  static private boolean jj_3R_241()
  {
-    if (jj_scan_token(X)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(86)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(89)) return true;
+    }
     return false;
   }
 
@@ -5854,12 +5845,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_228()
- {
-    if (jj_3R_169()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_167()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -5868,17 +5853,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_239()
+  static private boolean jj_3R_242()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_241()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_238()
  {
+    if (jj_3R_241()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(86)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(89)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_242()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
+  static private boolean jj_3R_234()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_238()) jj_scanpos = xsp;
+    return false;
+  }
+
   static private boolean jj_3R_65()
  {
     Token xsp;
@@ -5890,6 +5890,23 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_233()
+ {
+    if (jj_scan_token(TIMES)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_224()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_233()) {
+    jj_scanpos = xsp;
+    if (jj_3R_234()) return true;
+    }
+    return false;
+  }
+
   static private boolean jj_3R_87()
  {
     if (jj_3R_98()) return true;
@@ -5925,30 +5942,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_240()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_239()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_74()
  {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_236()
- {
-    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_177()
  {
     if (jj_scan_token(TRUE)) return true;
@@ -5967,45 +5966,43 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_232()
+  static private boolean jj_3R_66()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_236()) jj_scanpos = xsp;
+    if (jj_3R_72()) {
+    jj_scanpos = xsp;
+    if (jj_3R_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_75()) jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  static private boolean jj_3R_231()
+  static private boolean jj_3R_203()
  {
-    if (jj_scan_token(TIMES)) return true;
+    if (jj_3R_167()) return true;
     return false;
   }
 
-  static private boolean jj_3R_226()
+  static private boolean jj_3R_225()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_231()) {
-    jj_scanpos = xsp;
-    if (jj_3R_232()) return true;
-    }
+    if (jj_3R_168()) return true;
     return false;
   }
 
-  static private boolean jj_3R_66()
+  static private boolean jj_3R_202()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_72()) {
+    if (jj_3R_225()) {
     jj_scanpos = xsp;
-    if (jj_3R_73()) {
-    jj_scanpos = xsp;
-    if (jj_3R_74()) return true;
-    }
+    if (jj_3R_226()) return true;
     }
-    xsp = jj_scanpos;
-    if (jj_3R_75()) jj_scanpos = xsp;
-    if (jj_3R_65()) return true;
     return false;
   }
 
@@ -6015,6 +6012,22 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_201()
+ {
+    if (jj_scan_token(DLBRACKET)) return true;
+    if (jj_3R_224()) return true;
+    if (jj_scan_token(DRBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_200()
+ {
+    if (jj_scan_token(DLT)) return true;
+    if (jj_3R_224()) return true;
+    if (jj_scan_token(DGT)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_56()
  {
     if (jj_3R_65()) return true;
@@ -6024,9 +6037,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_199()
+  static private boolean jj_3R_172()
  {
-    if (jj_3R_167()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_200()) {
+    jj_scanpos = xsp;
+    if (jj_3R_201()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_202()) {
+    jj_scanpos = xsp;
+    if (jj_3R_203()) return true;
+    }
     return false;
   }
 
@@ -6036,12 +6059,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_227()
- {
-    if (jj_3R_168()) return true;
-    return false;
-  }
-
   static private boolean jj_initialized_once = false;
   /** Generated Token Manager. */
   static public PrismParserTokenManager token_source;
@@ -6057,7 +6074,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[107];
+  static final private int[] jj_la1 = new int[111];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6067,13 +6084,13 @@ 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,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,};
+      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,0xa0000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0xa0000000,0x0,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,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,};
+      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,0x0,0x38,0x0,0x0,0x4012783a,0x10000000,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x3800,0x0,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,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,};
+      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,0x0,0x0,0x0,0x3340,0x10,0x6c08404,0x0,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x0,0x0,0x0,0x3340,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[23];
   static private boolean jj_rescan = false;
@@ -6097,7 +6114,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6112,7 +6129,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6130,7 +6147,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6141,7 +6158,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6158,7 +6175,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6168,7 +6185,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 107; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6286,7 +6303,7 @@ fl.setLHS(s);
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 107; i++) {
+    for (int i = 0; i < 111; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java
index 9e73243c..a6ccf212 100644
--- a/prism/src/parser/PrismParserTokenManager.java
+++ b/prism/src/parser/PrismParserTokenManager.java
@@ -12,6 +12,7 @@ import prism.ModelInfo;
 import parser.visitor.*;
 import prism.ModelType;
 import prism.PrismLangException;
+import explicit.MinMax;
 
 /** Token Manager. */
 @SuppressWarnings("unused")public class PrismParserTokenManager implements PrismParserConstants {