diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index d8ca32bc..8d7f497f 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 {
@@ -2827,6 +2828,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;
@@ -2849,58 +2851,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[75] = 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[75] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+        jj_la1[76] = 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[77] = 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[76] = jj_gen;
+      jj_la1[78] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2912,12 +2921,13 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[77] = jj_gen;
+      jj_la1[79] = 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);
@@ -3014,7 +3024,7 @@ result = Expression.Not(result);
         break;
         }
       default:
-        jj_la1[78] = jj_gen;
+        jj_la1[80] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3038,7 +3048,7 @@ result = new ExpressionHOA(hoaAutomatonFile);
         break;
         }
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[81] = jj_gen;
         break label_29;
       }
       jj_consume_token(COMMA);
@@ -3068,7 +3078,7 @@ filter = new Filter(expr);
         break;
         }
       default:
-        jj_la1[80] = jj_gen;
+        jj_la1[82] = jj_gen;
         break label_30;
       }
       jj_consume_token(LBRACE);
@@ -3084,7 +3094,7 @@ filter.setMaxRequested(true);
         break;
         }
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[83] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3122,7 +3132,7 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[84] = jj_gen;
         ;
       }
       r = LtGt();
@@ -3137,7 +3147,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[85] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3149,7 +3159,7 @@ relOp = "="; isBool = false;
       break;
       }
     default:
-      jj_la1[84] = jj_gen;
+      jj_la1[86] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -3176,6 +3186,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;
@@ -3194,7 +3205,7 @@ 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) {
@@ -3203,62 +3214,69 @@ if (!prop) {if (true) throw generateParseException();}
         break;
         }
       default:
-        jj_la1[86] = jj_gen;
+        jj_la1[88] = 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[89] = 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[87] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+        jj_la1[90] = 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[91] = 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[88] = jj_gen;
+      jj_la1[92] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3270,11 +3288,12 @@ relOp = "max="; isBool = false;
       break;
       }
     default:
-      jj_la1[89] = jj_gen;
+      jj_la1[93] = 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);
@@ -3304,7 +3323,7 @@ void RewardSpecification(ExpressionReward exprRew) throws ParseException {Object
       break;
       }
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
 exprRew.setRewardStructIndex(index);
@@ -3350,7 +3369,7 @@ exprRew.setRewardStructIndex(index);
         break;
         }
       default:
-        jj_la1[91] = jj_gen;
+        jj_la1[95] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3383,7 +3402,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
         }
       default:
-        jj_la1[92] = jj_gen;
+        jj_la1[96] = jj_gen;
         if (jj_2_23(2147483647)) {
           begin = jj_consume_token(C);
           jj_consume_token(LE);
@@ -3435,7 +3454,7 @@ ret = expr;
             break;
             }
           default:
-            jj_la1[93] = jj_gen;
+            jj_la1[97] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3500,7 +3519,7 @@ ret = new ExpressionStrategy(false);
       break;
       }
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[98] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3525,7 +3544,7 @@ ret = new ExpressionStrategy(false);
         break;
         }
       default:
-        jj_la1[95] = jj_gen;
+        jj_la1[99] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3538,7 +3557,7 @@ ret.addOperand(expr);
       break;
       }
     default:
-      jj_la1[96] = jj_gen;
+      jj_la1[100] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3558,7 +3577,7 @@ exprStrat.setCoalitionAllPlayers();
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[103] = jj_gen;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
       case REG_IDENT:{
@@ -3572,7 +3591,7 @@ coalition.add(s);
             break;
             }
           default:
-            jj_la1[97] = jj_gen;
+            jj_la1[101] = jj_gen;
             break label_31;
           }
           jj_consume_token(COMMA);
@@ -3582,7 +3601,7 @@ coalition.add(s);
         break;
         }
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[102] = jj_gen;
         ;
       }
 exprStrat.setCoalition(coalition);
@@ -3602,7 +3621,7 @@ String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[104] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3665,7 +3684,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[105] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3678,7 +3697,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[106] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -3742,7 +3761,7 @@ s = getToken(0).image;
       break;
       }
     default:
-      jj_la1[103] = jj_gen;
+      jj_la1[107] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3774,7 +3793,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[108] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3811,7 +3830,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3843,7 +3862,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[110] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3869,7 +3888,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[111] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -4066,26 +4085,29 @@ fl.setLHS(s);
     finally { jj_save(22, xla); }
   }
 
-  static private boolean jj_3R_91()
+  static private boolean jj_3R_224()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3R_90()
  {
-    if (jj_scan_token(E)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_49()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_90()
+  static private boolean jj_3_22()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_44()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_223()
+ {
+    if (jj_scan_token(I)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -4110,6 +4132,20 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_222()
+ {
+    if (jj_scan_token(C)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_221()
+ {
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    if (jj_3R_49()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_79()
  {
     Token xsp;
@@ -4133,16 +4169,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_23()
+  static private boolean jj_3R_220()
  {
-    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_226()
+  static private boolean jj_3R_219()
  {
-    if (jj_3R_49()) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
@@ -4163,17 +4198,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_22()
+  static private boolean jj_3_21()
  {
-    if (jj_3R_44()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_225()
+  static private boolean jj_3R_199()
  {
-    if (jj_scan_token(I)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_49()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    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()) {
+    jj_scanpos = xsp;
+    if (jj_3R_224()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -4183,26 +4233,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_224()
- {
-    if (jj_scan_token(C)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_223()
- {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
-    if (jj_3R_49()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_222()
- {
-    if (jj_scan_token(S)) return true;
-    return false;
-  }
-
   static private boolean jj_3_3()
  {
     if (jj_scan_token(LABEL)) return true;
@@ -4216,9 +4246,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_221()
+  static private boolean jj_3R_200()
  {
-    if (jj_3R_44()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
@@ -4252,38 +4282,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_161()
- {
-    if (jj_3R_173()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_21()
+  static private boolean jj_3R_130()
  {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_195()
+  static private boolean jj_3R_161()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    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()) {
-    jj_scanpos = xsp;
-    if (jj_3R_226()) return true;
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_173()) return true;
     return false;
   }
 
@@ -4336,12 +4343,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_196()
- {
-    if (jj_3R_58()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_157()
  {
     if (jj_3R_44()) return true;
@@ -4372,13 +4373,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_127()
  {
-    if (jj_3R_33()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_155()
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_130()) {
+    jj_scanpos = xsp;
+    if (jj_3R_131()) return true;
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_155()
  {
     if (jj_3R_168()) return true;
     return false;
@@ -4423,16 +4431,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_127()
+  static private boolean jj_3R_238()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_130()) {
-    jj_scanpos = xsp;
-    if (jj_3R_131()) return true;
-    }
-    if (jj_scan_token(RBRACE)) return true;
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_3R_127()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_233()
+ {
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
@@ -4442,6 +4450,15 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_231()
+ {
+    if (jj_3R_127()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_238()) jj_scanpos = xsp;
+    return false;
+  }
+
   static private boolean jj_3R_150()
  {
     Token xsp;
@@ -4508,13 +4525,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_236()
- {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_3R_127()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_60()
  {
     if (jj_3R_69()) return true;
@@ -4531,15 +4541,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_231()
- {
-    if (jj_3R_127()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_236()) jj_scanpos = xsp;
-    return false;
-  }
-
   static private boolean jj_3R_142()
  {
     Token xsp;
@@ -4569,55 +4570,44 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_53()
- {
-    if (jj_3R_60()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_61()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3_2()
+  static private boolean jj_3R_198()
  {
-    if (jj_3R_33()) return true;
-    if (jj_scan_token(COLON)) 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_197()
  {
-    if (jj_3R_142()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_143()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_56()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_217()
+  static private boolean jj_3R_232()
  {
-    if (jj_3R_56()) return true;
-    if (jj_3R_49()) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3R_218()
  {
-    if (jj_scan_token(PLUS)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_232()) {
+    jj_scanpos = xsp;
+    if (jj_3R_233()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_216()
+  static private boolean jj_3R_217()
  {
     if (jj_3R_231()) return true;
     return false;
   }
 
-  static private boolean jj_3R_215()
+  static private boolean jj_3R_216()
  {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_37()) return true;
@@ -4625,54 +4615,44 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_220()
- {
-    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_194()
+  static private boolean jj_3R_196()
  {
     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_139()
+  static private boolean jj_3R_53()
  {
+    if (jj_3R_60()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_144()) {
-    jj_scanpos = xsp;
-    if (jj_3R_145()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_61()) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_138()) return true;
     return false;
   }
 
-  static private boolean jj_3R_219()
+  static private boolean jj_3R_195()
  {
-    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_193()
+  static private boolean jj_3_2()
  {
-    if (jj_scan_token(RMIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_33()) return true;
+    if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  static private boolean jj_3R_218()
+  static private boolean jj_3R_138()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_142()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_143()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -4682,36 +4662,34 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_192()
+  static private boolean jj_3R_144()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_194()
  {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_215()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_216()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_217()) {
-    jj_scanpos = xsp;
-    if (jj_3R_218()) {
-    jj_scanpos = xsp;
-    if (jj_3R_219()) {
-    jj_scanpos = xsp;
-    if (jj_3R_220()) return true;
-    }
-    }
-    }
+    if (jj_3R_217()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_218()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_135()
+  static private boolean jj_3R_139()
  {
-    if (jj_3R_138()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_139()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_144()) {
+    jj_scanpos = xsp;
+    if (jj_3R_145()) return true;
     }
+    if (jj_3R_138()) return true;
     return false;
   }
 
@@ -4719,21 +4697,37 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_192()) {
+    if (jj_3R_194()) {
     jj_scanpos = xsp;
-    if (jj_3R_193()) {
+    if (jj_3R_195()) {
     jj_scanpos = xsp;
-    if (jj_3R_194()) return true;
+    if (jj_3R_196()) return true;
     }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_197()) {
+    jj_scanpos = xsp;
+    if (jj_3R_198()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_195()) return true;
+    if (jj_3R_199()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_196()) jj_scanpos = xsp;
+    if (jj_3R_200()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
+  static private boolean jj_3R_135()
+ {
+    if (jj_3R_138()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_139()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_46()
  {
     if (jj_3R_53()) return true;
@@ -4758,24 +4752,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_133()
- {
-    if (jj_3R_135()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_136()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  static private boolean jj_3_7()
- {
-    if (jj_3R_33()) return true;
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_65()
  {
     if (jj_scan_token(LE)) return true;
@@ -4788,31 +4764,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_134()
- {
-    if (jj_3R_137()) return true;
-    if (jj_3R_133()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_63()
  {
     if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_55()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_37()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_48()
+  static private boolean jj_3R_133()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_135()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_136()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -4839,14 +4804,25 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_132()
+  static private boolean jj_3_7()
  {
-    if (jj_3R_133()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_134()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_33()) return true;
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_55()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_37()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_48()
+ {
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
@@ -4860,25 +4836,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_129()
- {
-    if (jj_3R_132()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_141()
  {
     if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_128()
- {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_125()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_137()
  {
     Token xsp;
@@ -4896,6 +4859,24 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_134()
+ {
+    if (jj_3R_137()) return true;
+    if (jj_3R_133()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_132()
+ {
+    if (jj_3R_133()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_134()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_44()
  {
     if (jj_scan_token(S)) return true;
@@ -4913,26 +4894,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_125()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_128()) {
-    jj_scanpos = xsp;
-    if (jj_3R_129()) return true;
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_78()
+  static private boolean jj_3R_129()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
-  static private boolean jj_3R_77()
+  static private boolean jj_3R_128()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(NOT)) return true;
+    if (jj_3R_125()) return true;
     return false;
   }
 
@@ -4942,24 +4913,29 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_126()
+  static private boolean jj_3R_78()
  {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_125()) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_122()
+  static private boolean jj_3R_125()
  {
-    if (jj_3R_125()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_126()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_128()) {
+    jj_scanpos = xsp;
+    if (jj_3R_129()) return true;
     }
     return false;
   }
 
+  static private boolean jj_3R_77()
+ {
+    if (jj_scan_token(MIN)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_68()
  {
     if (jj_scan_token(LBRACE)) return true;
@@ -4973,6 +4949,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_126()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_58()
  {
     if (jj_scan_token(LBRACE)) return true;
@@ -4986,6 +4969,17 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_122()
+ {
+    if (jj_3R_125()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_126()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   static private boolean jj_3_1()
  {
     if (jj_scan_token(MODULE)) return true;
@@ -4994,6 +4988,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_241()
+ {
+    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_123()
  {
     if (jj_scan_token(OR)) return true;
@@ -5001,6 +5001,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_240()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_112()
  {
     if (jj_3R_122()) return true;
@@ -5012,72 +5018,76 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_121()
+  static private boolean jj_3R_237()
  {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_33()) return true;
+    if (jj_scan_token(RENAME)) return true;
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_119()
+  static private boolean jj_3R_121()
  {
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_117()
+  static private boolean jj_3R_236()
  {
-    if (jj_3R_49()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_240()) {
+    jj_scanpos = xsp;
+    if (jj_3R_241()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3_6()
+  static private boolean jj_3R_119()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_115()
+  static private boolean jj_3R_230()
  {
-    if (jj_3R_49()) return true;
+    if (jj_3R_236()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_237()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_235()
+  static private boolean jj_3R_117()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_33()) return true;
-    if (jj_scan_token(RENAME)) return true;
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_239()
+  static private boolean jj_3_6()
  {
-    if (jj_scan_token(REG_QUOTED_STRING)) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_238()
+  static private boolean jj_3R_115()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_230()
+  static private boolean jj_3R_113()
  {
-    if (jj_3R_234()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_235()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(IFF)) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
-  static private boolean jj_3R_113()
+  static private boolean jj_3R_43()
  {
-    if (jj_scan_token(IFF)) return true;
-    if (jj_3R_112()) return true;
     return false;
   }
 
@@ -5092,25 +5102,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_234()
+  static private boolean jj_3R_34()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_238()) {
-    jj_scanpos = xsp;
-    if (jj_3R_239()) return true;
-    }
+    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_43()
+  static private boolean jj_3R_215()
  {
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_214()
+  static private boolean jj_3R_42()
  {
-    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -5121,8 +5126,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_42()
+  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_43()) return true;
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_209()
+ {
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
@@ -5137,20 +5154,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_34()
+  static private boolean jj_3R_41()
  {
-    if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3_20()
+  static private boolean jj_3R_37()
  {
-    jj_lookingAhead = true;
-    jj_semLA = getToken(1).kind==REG_IDENT
-                         && getToken(2).kind==COLON;
-    jj_lookingAhead = false;
-    if (!jj_semLA || jj_3R_43()) return true;
-    if (jj_3R_37()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
@@ -5163,17 +5174,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_41()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_205()
- {
-    if (jj_scan_token(OR)) return true;
-    return false;
-  }
-
   static private boolean jj_3_19()
  {
     jj_lookingAhead = true;
@@ -5192,21 +5192,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_37()
- {
-    if (jj_3R_32()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_86()
- {
-    if (jj_3R_96()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_97()) jj_scanpos = xsp;
-    return false;
-  }
-
   static private boolean jj_3_18()
  {
     jj_lookingAhead = true;
@@ -5223,17 +5208,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_40()
- {
-    return false;
-  }
-
-  static private boolean jj_3R_39()
+  static private boolean jj_3R_86()
  {
+    if (jj_3R_96()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_97()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3R_192()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -5243,13 +5227,47 @@ fl.setLHS(s);
     jj_scanpos = xsp;
     if (jj_3_20()) {
     jj_scanpos = xsp;
-    if (jj_3R_214()) return true;
+    if (jj_3R_215()) return true;
     }
     }
     }
     return false;
   }
 
+  static private boolean jj_3R_33()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_229()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_208()
+ {
+    if (jj_scan_token(AND)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_206()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_40()
+ {
+    return false;
+  }
+
+  static private boolean jj_3R_39()
+ {
+    return false;
+  }
+
   static private boolean jj_3R_38()
  {
     return false;
@@ -5268,9 +5286,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_33()
+  static private boolean jj_3R_32()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
@@ -5288,18 +5306,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_204()
- {
-    if (jj_scan_token(AND)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_202()
- {
-    if (jj_scan_token(MAX)) return true;
-    return false;
-  }
-
   static private boolean jj_3_16()
  {
     jj_lookingAhead = true;
@@ -5336,12 +5342,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_32()
- {
-    if (jj_scan_token(REG_IDENT)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_51()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -5352,6 +5352,39 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_211()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_49()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_210()
+ {
+    if (jj_3R_32()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_213()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_37()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_207()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_205()
+ {
+    if (jj_scan_token(MIN)) return true;
+    return false;
+  }
+
   static private boolean jj_3_14()
  {
     if (jj_3R_37()) return true;
@@ -5380,18 +5413,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_210()
- {
-    if (jj_3R_56()) return true;
-    if (jj_3R_49()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_209()
+  static private boolean jj_3R_193()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_37()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
@@ -5413,13 +5437,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_207()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_49()) return true;
-    return false;
-  }
-
   static private boolean jj_3_5()
  {
     if (jj_3R_35()) return true;
@@ -5441,17 +5458,33 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_213()
- {
-    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_191()
+  static private boolean jj_3R_175()
  {
-    if (jj_3R_58()) return true;
+    if (jj_scan_token(FILTER)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    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()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) return true;
+    }
+    }
+    }
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_49()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_211()) jj_scanpos = xsp;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
@@ -5466,24 +5499,17 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_212()
- {
-    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_211()
+  static private boolean jj_3R_191()
  {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_206()
+  static private boolean jj_3R_190()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_56()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -5493,29 +5519,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_203()
+  static private boolean jj_3R_228()
  {
-    if (jj_scan_token(PLUS)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_118()
+  static private boolean jj_3R_214()
  {
-    if (jj_3R_37()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_228()) {
+    jj_scanpos = xsp;
+    if (jj_3R_229()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_201()
+  static private boolean jj_3R_118()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
   static private boolean jj_3R_189()
  {
     if (jj_scan_token(PMAX)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
@@ -5528,8 +5557,6 @@ fl.setLHS(s);
   static private boolean jj_3R_188()
  {
     if (jj_scan_token(PMIN)) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
@@ -5539,70 +5566,31 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_109()
- {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_49()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_108()
- {
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_49()) return true;
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_49()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_187()
  {
     if (jj_scan_token(P)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_209()) jj_scanpos = xsp;
+    if (jj_3R_213()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_210()) {
-    jj_scanpos = xsp;
-    if (jj_3R_211()) {
-    jj_scanpos = xsp;
-    if (jj_3R_212()) {
-    jj_scanpos = xsp;
-    if (jj_3R_213()) return true;
-    }
-    }
-    }
+    if (jj_3R_214()) jj_scanpos = xsp;
+    return false;
+  }
+
+  static private boolean jj_3R_109()
+ {
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_175()
+  static private boolean jj_3R_108()
  {
-    if (jj_scan_token(FILTER)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    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()) {
-    jj_scanpos = xsp;
-    if (jj_3R_206()) return true;
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_49()) return true;
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_49()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_207()) jj_scanpos = xsp;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
@@ -5630,18 +5618,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_105()
- {
-    if (jj_scan_token(LT)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_116()) {
-    jj_scanpos = xsp;
-    if (jj_3R_117()) return true;
-    }
-    return false;
-  }
-
   static private boolean jj_3R_169()
  {
     Token xsp;
@@ -5653,14 +5629,31 @@ fl.setLHS(s);
     if (jj_3R_189()) return true;
     }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_190()) {
+    jj_scanpos = xsp;
+    if (jj_3R_191()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_190()) return true;
+    if (jj_3R_192()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_191()) jj_scanpos = xsp;
+    if (jj_3R_193()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
+  static private boolean jj_3R_105()
+ {
+    if (jj_scan_token(LT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_116()) {
+    jj_scanpos = xsp;
+    if (jj_3R_117()) return true;
+    }
+    return false;
+  }
+
   static private boolean jj_3R_104()
  {
     if (jj_scan_token(LE)) return true;
@@ -5696,6 +5689,18 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_174()
+ {
+    if (jj_3R_34()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_227()
+ {
+    if (jj_3R_170()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_72()
  {
     if (jj_3R_86()) return true;
@@ -5725,7 +5730,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_208()
+  static private boolean jj_3R_212()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_49()) return true;
@@ -5750,15 +5755,20 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_174()
+  static private boolean jj_3R_82()
  {
-    if (jj_3R_34()) return true;
+    if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3R_242()
  {
-    if (jj_scan_token(X)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(91)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(94)) return true;
+    }
     return false;
   }
 
@@ -5779,12 +5789,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_229()
- {
-    if (jj_3R_170()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_168()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -5793,17 +5797,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_240()
+  static private boolean jj_3R_243()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_242()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_239()
  {
+    if (jj_3R_242()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(91)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(94)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_243()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
+  static private boolean jj_3R_235()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_239()) jj_scanpos = xsp;
+    return false;
+  }
+
   static private boolean jj_3R_66()
  {
     Token xsp;
@@ -5815,6 +5834,23 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_234()
+ {
+    if (jj_scan_token(TIMES)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_225()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_234()) {
+    jj_scanpos = xsp;
+    if (jj_3R_235()) return true;
+    }
+    return false;
+  }
+
   static private boolean jj_3R_88()
  {
     if (jj_3R_99()) return true;
@@ -5850,30 +5886,12 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_241()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_240()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_75()
  {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_237()
- {
-    if (jj_3R_240()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_241()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   static private boolean jj_3R_178()
  {
     if (jj_scan_token(TRUE)) return true;
@@ -5892,45 +5910,43 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_233()
+  static private boolean jj_3R_67()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_237()) jj_scanpos = xsp;
+    if (jj_3R_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_75()) return true;
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_76()) jj_scanpos = xsp;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_232()
+  static private boolean jj_3R_204()
  {
-    if (jj_scan_token(TIMES)) return true;
+    if (jj_3R_168()) return true;
     return false;
   }
 
-  static private boolean jj_3R_227()
+  static private boolean jj_3R_226()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_232()) {
-    jj_scanpos = xsp;
-    if (jj_3R_233()) return true;
-    }
+    if (jj_3R_169()) return true;
     return false;
   }
 
-  static private boolean jj_3R_67()
+  static private boolean jj_3R_203()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_73()) {
-    jj_scanpos = xsp;
-    if (jj_3R_74()) {
+    if (jj_3R_226()) {
     jj_scanpos = xsp;
-    if (jj_3R_75()) return true;
-    }
+    if (jj_3R_227()) return true;
     }
-    xsp = jj_scanpos;
-    if (jj_3R_76()) jj_scanpos = xsp;
-    if (jj_3R_66()) return true;
     return false;
   }
 
@@ -5940,49 +5956,50 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_57()
- {
-    if (jj_3R_66()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_67()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_200()
+  static private boolean jj_3R_202()
  {
-    if (jj_3R_168()) return true;
+    if (jj_scan_token(DLBRACKET)) return true;
+    if (jj_3R_225()) return true;
+    if (jj_scan_token(DRBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_184()
+  static private boolean jj_3R_201()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(DLT)) return true;
+    if (jj_3R_225()) return true;
+    if (jj_scan_token(DGT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_228()
+  static private boolean jj_3R_57()
  {
-    if (jj_3R_169()) return true;
+    if (jj_3R_66()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_67()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_199()
+  static private boolean jj_3R_173()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_228()) {
+    if (jj_3R_201()) {
     jj_scanpos = xsp;
-    if (jj_3R_229()) return true;
+    if (jj_3R_202()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_203()) {
+    jj_scanpos = xsp;
+    if (jj_3R_204()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_198()
+  static private boolean jj_3R_184()
  {
-    if (jj_scan_token(DLBRACKET)) return true;
-    if (jj_3R_227()) return true;
-    if (jj_scan_token(DRBRACKET)) return true;
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -6009,14 +6026,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_197()
- {
-    if (jj_scan_token(DLT)) return true;
-    if (jj_3R_227()) return true;
-    if (jj_scan_token(DGT)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_100()
  {
     if (jj_scan_token(COMMA)) return true;
@@ -6030,19 +6039,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_131()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_197()) {
-    jj_scanpos = xsp;
-    if (jj_3R_198()) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_199()) {
-    jj_scanpos = xsp;
-    if (jj_3R_200()) return true;
-    }
+    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -6052,14 +6051,17 @@ fl.setLHS(s);
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_208()) { jj_scanpos = xsp; break; }
+      if (jj_3R_212()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_131()
+  static private boolean jj_3R_172()
  {
+    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_49()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
@@ -6088,9 +6090,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_171()
  {
-    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(E)) return true;
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_49()) return true;
     if (jj_scan_token(RBRACKET)) return true;
@@ -6117,6 +6119,21 @@ 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_91()
+ {
+    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_initialized_once = false;
   /** Generated Token Manager. */
   static public PrismParserTokenManager token_source;
@@ -6132,7 +6149,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[108];
+  static final private int[] jj_la1 = new int[112];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6144,16 +6161,16 @@ fl.setLHS(s);
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x0,0x0,0x41740808,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x41740808,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x0,0x41740808,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x0,0x1840000,0x4,0x0,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1c0,0x0,0x24f01c5,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x70000,0x0,0x0,0x24f01c5,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x0,0x1,0x0,0x0,0x80000000,};
+      jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x0,0x1840000,0x4,0x0,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1,0x1c0,0x0,0x0,0x24f01c5,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x70000,0x0,0x0,0x0,0x24f01c5,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x0,0x1,0x0,0x0,0x80000000,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0xd8108088,0x1,0xd8108088,0xd8108088,0x1,0xd8108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x40000000,0x0,0x20,0x40000000,0x80000,0xd8108088,0x0,0x8,0x2,0xd81080a8,0x40000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0xc0000008,0x0,0x4066a20,0x4066a20,0x0,0x0,0x4066a20,0x4066a20,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0x66820,0x4000000,0x2,0x200,0x2000000,0x0,0x0,0x0,0x0,0xd8108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0xd8108088,0xd8008088,0x8,0x0,0x40000000,0x2,0x18000000,0x8,0x66800,0x0,0x200,0xd8108088,0x2,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x400000,0xd8108088,0x0,0xd8108088,0x8080,0x0,0x8,0x2,0x48000000,0x200000,0x48000000,0x40080000,0x2,0x80000000,0x40000000,0x1800,0x66000,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x0,0xd8108088,0x1,0xd8108088,0xd8108088,0x1,0xd8108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x40000000,0x0,0x20,0x40000000,0x80000,0xd8108088,0x0,0x8,0x2,0xd81080a8,0x40000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0xc0000008,0x0,0x4066a20,0x4066a20,0x0,0x0,0x4066a20,0x4066a20,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0xd8108088,0x66820,0x4000000,0x2,0x200,0x2000000,0x0,0x0,0x0,0x0,0xd8108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0xd8108088,0xd8008088,0x8,0x0,0x40000000,0x2,0x18000000,0x8,0x0,0x0,0x0,0x66800,0x200,0xd8108088,0x2,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x0,0x0,0x0,0x66800,0x200,0x400000,0xd8108088,0x0,0xd8108088,0x8080,0x0,0x8,0x2,0x48000000,0x200000,0x48000000,0x40080000,0x2,0x80000000,0x40000000,0x1800,0x66000,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[23];
   static private boolean jj_rescan = false;
@@ -6177,7 +6194,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6192,7 +6209,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6210,7 +6227,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6221,7 +6238,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6238,7 +6255,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6248,7 +6265,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 108; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6379,7 +6396,7 @@ fl.setLHS(s);
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 108; i++) {
+    for (int i = 0; i < 112; 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 5e53f5ab..0394d9ed 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 {