diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 82945de6..f15bd47a 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1863,6 +1863,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
 // (see ExpressionTemporal production for lookahead explanation)
   static final public 
 void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lBound, uBound;
+        TemporalOperatorBound bound = new TemporalOperatorBound();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LE:{
       jj_consume_token(LE);
@@ -1906,7 +1907,7 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB
           throw new ParseException();
         }
       }
-exprTemp.setUpperBound(uBound, false);
+bound.setUpperBound(uBound, false);
       break;
       }
     case LT:{
@@ -1951,7 +1952,7 @@ exprTemp.setUpperBound(uBound, false);
           throw new ParseException();
         }
       }
-exprTemp.setUpperBound(uBound, true);
+bound.setUpperBound(uBound, true);
       break;
       }
     case GE:{
@@ -1996,7 +1997,7 @@ exprTemp.setUpperBound(uBound, true);
           throw new ParseException();
         }
       }
-exprTemp.setLowerBound(lBound, false);
+bound.setLowerBound(lBound, false);
       break;
       }
     case GT:{
@@ -2041,7 +2042,7 @@ exprTemp.setLowerBound(lBound, false);
           throw new ParseException();
         }
       }
-exprTemp.setLowerBound(lBound, true);
+bound.setLowerBound(lBound, true);
       break;
       }
     case LBRACKET:{
@@ -2050,13 +2051,13 @@ exprTemp.setLowerBound(lBound, true);
       jj_consume_token(COMMA);
       uBound = Expression(false, false);
       jj_consume_token(RBRACKET);
-exprTemp.setLowerBound(lBound, false); exprTemp.setUpperBound(uBound, false);
+bound.setLowerBound(lBound, false); bound.setUpperBound(uBound, false);
       break;
       }
     case EQ:{
       jj_consume_token(EQ);
       lBound = Expression(false, false);
-exprTemp.setEqualBounds(lBound);
+bound.setEqualBounds(lBound);
       break;
       }
     default:
@@ -2064,6 +2065,7 @@ exprTemp.setEqualBounds(lBound);
       jj_consume_token(-1);
       throw new ParseException();
     }
+exprTemp.setBound(bound);
   }
 
 // Expression: if-then-else, i.e. "cond ? then : else"
@@ -3268,6 +3270,7 @@ Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws Parse
         ExpressionTemporal exprTemp = null;
         Expression ret = null;
         Token begin;
+        TemporalOperatorBound b = new TemporalOperatorBound();
 begin = getToken(1);
     if (jj_2_20(2147483647)) {
       expr = ExpressionSS(prop, true);
@@ -3285,7 +3288,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
           begin = jj_consume_token(C);
           jj_consume_token(LE);
           expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); exprTemp.setUpperBound(expr); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_C, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case C:{
@@ -3297,7 +3300,7 @@ ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null);
             jj_consume_token(I);
             jj_consume_token(EQ);
             expr = Expression(false, false);
-exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); exprTemp.setUpperBound(expr); ret = exprTemp;
+exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); b.setUpperBound(expr); exprTemp.setBound(b); ret = exprTemp;
             break;
             }
           case A:
@@ -3947,6 +3950,23 @@ fl.setLHS(s);
     finally { jj_save(20, xla); }
   }
 
+  static private boolean jj_3R_149()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) {
+    jj_scanpos = xsp;
+    if (jj_3R_164()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
   static private boolean jj_3R_86()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -3955,9 +3975,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_161()
+  static private boolean jj_3R_167()
  {
-    if (jj_scan_token(REG_INT)) return true;
+    if (jj_scan_token(MAX)) return true;
     return false;
   }
 
@@ -3967,20 +3987,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_149()
+  static private boolean jj_3R_185()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_161()) {
-    jj_scanpos = xsp;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_164()) return true;
-    }
-    }
-    }
+    if (jj_3R_153()) return true;
     return false;
   }
 
@@ -3997,9 +4006,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_167()
+  static private boolean jj_3R_213()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
@@ -4017,15 +4026,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_185()
- {
-    if (jj_3R_153()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_213()
+  static private boolean jj_3R_184()
  {
-    if (jj_3R_154()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_213()) {
+    jj_scanpos = xsp;
+    if (jj_3R_214()) return true;
+    }
     return false;
   }
 
@@ -4040,14 +4048,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_184()
+  static private boolean jj_3R_183()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_213()) {
-    jj_scanpos = xsp;
-    if (jj_3R_214()) return true;
-    }
+    if (jj_scan_token(DLBRACKET)) return true;
+    if (jj_3R_212()) return true;
+    if (jj_scan_token(DRBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_182()
+ {
+    if (jj_scan_token(DLT)) return true;
+    if (jj_3R_212()) return true;
+    if (jj_scan_token(DGT)) return true;
     return false;
   }
 
@@ -4060,11 +4073,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_183()
+  static private boolean jj_3R_228()
  {
-    if (jj_scan_token(DLBRACKET)) return true;
-    if (jj_3R_212()) return true;
-    if (jj_scan_token(DRBRACKET)) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
@@ -4076,11 +4087,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_182()
+  static private boolean jj_3R_158()
  {
-    if (jj_scan_token(DLT)) return true;
-    if (jj_3R_212()) return true;
-    if (jj_scan_token(DGT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_182()) {
+    jj_scanpos = xsp;
+    if (jj_3R_183()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_184()) {
+    jj_scanpos = xsp;
+    if (jj_3R_185()) return true;
+    }
     return false;
   }
 
@@ -4090,25 +4109,22 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_228()
- {
-    if (jj_3R_45()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_158()
+  static private boolean jj_3R_152()
  {
+    if (jj_scan_token(FUNC)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_182()) {
+    if (jj_3R_169()) {
     jj_scanpos = xsp;
-    if (jj_3R_183()) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_184()) {
+    if (jj_3R_170()) {
     jj_scanpos = xsp;
-    if (jj_3R_185()) return true;
+    if (jj_3R_171()) return true;
+    }
     }
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
@@ -4143,22 +4159,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_152()
+  static private boolean jj_3R_222()
  {
-    if (jj_scan_token(FUNC)) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_170()) {
-    jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
-    }
-    }
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_168()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_45()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_166()
+ {
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -4187,9 +4196,26 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_222()
+  static private boolean jj_3R_157()
  {
+    if (jj_scan_token(A)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_45()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_151()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_166()) {
+    jj_scanpos = xsp;
+    if (jj_3R_167()) return true;
+    }
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
@@ -4204,12 +4230,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_166()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
   static private boolean jj_3_8()
  {
     if (jj_scan_token(OR)) return true;
@@ -4217,29 +4237,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_165()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_166()) {
-    jj_scanpos = xsp;
-    if (jj_3R_167()) return true;
-    }
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_168()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_157()
- {
-    if (jj_scan_token(A)) return true;
-    if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_45()) return true;
-    if (jj_scan_token(RBRACKET)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_50()
  {
     if (jj_scan_token(OR)) return true;
@@ -4248,14 +4253,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_165()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_168()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3_10()
  {
     if (jj_scan_token(OR)) return true;
@@ -4297,6 +4294,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_21()
+ {
+    if (jj_scan_token(C)) return true;
+    if (jj_scan_token(LE)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_56()
  {
     if (jj_3R_65()) return true;
@@ -4306,13 +4310,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_21()
- {
-    if (jj_scan_token(C)) return true;
-    if (jj_scan_token(LE)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_148()
  {
     if (jj_3R_160()) return true;
@@ -4343,12 +4340,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_145()
- {
-    if (jj_3R_157()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_210()
  {
     if (jj_scan_token(I)) return true;
@@ -4357,9 +4348,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_19()
+  static private boolean jj_3R_145()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
@@ -4369,9 +4360,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3_19()
  {
-    if (jj_3R_156()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
@@ -4383,6 +4374,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_144()
+ {
+    if (jj_3R_156()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_134()
  {
     if (jj_scan_token(DIVIDE)) return true;
@@ -4413,27 +4410,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_141()
- {
-    if (jj_3R_154()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_206()
  {
     if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_227()
+  static private boolean jj_3R_141()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
-  static private boolean jj_3R_140()
+  static private boolean jj_3R_227()
  {
-    if (jj_3R_153()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
@@ -4460,20 +4451,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_140()
  {
-    if (jj_3R_152()) return true;
+    if (jj_3R_153()) return true;
     return false;
   }
 
-  static private boolean jj_3R_49()
+  static private boolean jj_3R_139()
  {
-    if (jj_3R_56()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_57()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_152()) return true;
     return false;
   }
 
@@ -4483,13 +4469,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_2()
- {
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(COLON)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_138()
  {
     if (jj_3R_151()) return true;
@@ -4502,6 +4481,24 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_49()
+ {
+    if (jj_3R_56()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_57()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  static private boolean jj_3_2()
+ {
+    if (jj_3R_32()) return true;
+    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_136()
  {
     if (jj_3R_149()) return true;
@@ -4634,12 +4631,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_35()
- {
-    if (jj_3R_42()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_128()
  {
     Token xsp;
@@ -4652,6 +4643,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_35()
+ {
+    if (jj_3R_42()) return true;
+    return false;
+  }
+
   static private boolean jj_3_7()
  {
     if (jj_3R_32()) return true;
@@ -4875,15 +4872,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_6()
+  static private boolean jj_3R_116()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3_6()
  {
-    if (jj_3R_117()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
@@ -4906,27 +4903,32 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_108()
- {
-    if (jj_3R_45()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_106()
+  static private boolean jj_3R_59()
  {
-    if (jj_3R_45()) return true;
+    if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_59()
+  static private boolean jj_3R_58()
  {
-    if (jj_scan_token(LT)) return true;
+    if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_104()
+  static private boolean jj_3R_52()
  {
-    if (jj_3R_45()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_58()) {
+    jj_scanpos = xsp;
+    if (jj_3R_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_60()) {
+    jj_scanpos = xsp;
+    if (jj_3R_61()) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -4947,26 +4949,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3R_108()
  {
-    if (jj_scan_token(GT)) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  static private boolean jj_3R_52()
+  static private boolean jj_3R_106()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_59()) {
-    jj_scanpos = xsp;
-    if (jj_3R_60()) {
-    jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
-    }
-    }
-    }
+    if (jj_3R_45()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_104()
+ {
+    if (jj_3R_45()) return true;
     return false;
   }
 
@@ -5090,13 +5087,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_48()
- {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_47()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_220()
  {
     if (jj_scan_token(COMMA)) return true;
@@ -5106,6 +5096,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_48()
+ {
+    if (jj_scan_token(AND)) return true;
+    if (jj_3R_47()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_215()
  {
     if (jj_3R_219()) return true;
@@ -5140,16 +5137,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_47()
- {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_55()) return true;
-    if (jj_scan_token(EQ)) return true;
-    if (jj_3R_45()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_226()
  {
     if (jj_scan_token(REG_QUOTED_STRING)) return true;
@@ -5168,6 +5155,16 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_47()
+ {
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_55()) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_3R_45()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_100()
  {
     if (jj_scan_token(IMPLIES)) return true;
@@ -5213,34 +5210,34 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_41()
+  static private boolean jj_3R_90()
  {
-    if (jj_3R_47()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_48()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(QMARK)) return true;
+    if (jj_3R_89()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
-  static private boolean jj_3_5()
+  static private boolean jj_3R_37()
  {
-    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_90()
+  static private boolean jj_3R_41()
  {
-    if (jj_scan_token(QMARK)) return true;
-    if (jj_3R_89()) return true;
-    if (jj_scan_token(COLON)) return true;
-    if (jj_3R_82()) return true;
+    if (jj_3R_47()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_48()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  static private boolean jj_3R_37()
+  static private boolean jj_3_5()
  {
+    if (jj_3R_34()) return true;
     return false;
   }
 
@@ -5262,27 +5259,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3_13()
- {
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_12()
- {
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
-  static private boolean jj_3_11()
- {
-    if (jj_3R_36()) return true;
-    if (jj_scan_token(LPARENTH)) return true;
-    return false;
-  }
-
   static private boolean jj_3_16()
  {
     jj_lookingAhead = true;
@@ -5301,24 +5277,39 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3_13()
+ {
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_33()
  {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3_12()
  {
-    if (jj_3R_89()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_90()) jj_scanpos = xsp;
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3_11()
  {
     if (jj_3R_36()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_82()
+ {
+    if (jj_3R_89()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_90()) jj_scanpos = xsp;
     return false;
   }
 
@@ -5338,21 +5329,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_105()
- {
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_103()
+  static private boolean jj_3R_107()
  {
     if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101()
+  static private boolean jj_3R_190()
  {
-    if (jj_3R_36()) return true;
+    if (jj_scan_token(OR)) return true;
     return false;
   }
 
@@ -5373,9 +5358,27 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_190()
+  static private boolean jj_3R_105()
  {
-    if (jj_scan_token(OR)) return true;
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_103()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_101()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_36()
+ {
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -5396,12 +5399,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_36()
- {
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_94()
  {
     if (jj_scan_token(GT)) return true;
@@ -5479,12 +5476,30 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_32()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_81()
  {
     if (jj_3R_83()) return true;
     return false;
   }
 
+  static private boolean jj_3R_189()
+ {
+    if (jj_scan_token(AND)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_187()
+ {
+    if (jj_scan_token(MAX)) return true;
+    return false;
+  }
+
   static private boolean jj_3R_80()
  {
     if (jj_scan_token(G)) return true;
@@ -5503,21 +5518,24 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_32()
+  static private boolean jj_3R_195()
  {
-    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    if (jj_3R_52()) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  static private boolean jj_3R_189()
+  static private boolean jj_3R_194()
  {
-    if (jj_scan_token(AND)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_36()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_187()
+  static private boolean jj_3R_31()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
@@ -5538,27 +5556,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_195()
- {
-    if (jj_3R_52()) return true;
-    if (jj_3R_45()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_194()
- {
-    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_31()
- {
-    if (jj_scan_token(REG_IDENT)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_198()
  {
     if (jj_scan_token(MAX)) return true;
@@ -5596,17 +5593,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_62()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_67()) {
-    jj_scanpos = xsp;
-    if (jj_3R_68()) return true;
-    }
-    return false;
-  }
-
   static private boolean jj_3R_173()
  {
     if (jj_scan_token(PMIN)) return true;
@@ -5615,21 +5601,14 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_72()
- {
-    if (jj_3R_83()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_71()
- {
-    if (jj_scan_token(R)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_70()
+  static private boolean jj_3R_62()
  {
-    if (jj_scan_token(W)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_67()) {
+    jj_scanpos = xsp;
+    if (jj_3R_68()) return true;
+    }
     return false;
   }
 
@@ -5660,9 +5639,21 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_69()
+  static private boolean jj_3R_72()
  {
-    if (jj_scan_token(U)) return true;
+    if (jj_3R_83()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_71()
+ {
+    if (jj_scan_token(R)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_191()
+ {
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -5685,9 +5676,27 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_191()
+  static private boolean jj_3R_70()
  {
-    if (jj_3R_31()) return true;
+    if (jj_scan_token(W)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_188()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_69()
+ {
+    if (jj_scan_token(U)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_186()
+ {
+    if (jj_scan_token(MIN)) return true;
     return false;
   }
 
@@ -5708,18 +5717,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_188()
- {
-    if (jj_scan_token(PLUS)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_186()
- {
-    if (jj_scan_token(MIN)) return true;
-    return false;
-  }
-
   static private boolean jj_3R_160()
  {
     if (jj_scan_token(FILTER)) return true;
@@ -5772,13 +5769,6 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_97()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
   static private boolean jj_3R_153()
  {
     if (jj_scan_token(LPARENTH)) return true;
@@ -5787,6 +5777,13 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_97()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
   static private boolean jj_3R_159()
  {
     if (jj_3R_33()) return true;
@@ -5834,16 +5831,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_162()
+  static private boolean jj_3R_230()
  {
-    if (jj_scan_token(REG_DOUBLE)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_229()) return true;
     return false;
   }
 
-  static private boolean jj_3R_230()
+  static private boolean jj_3R_162()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_229()) return true;
+    if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
@@ -5889,6 +5886,12 @@ fl.setLHS(s);
     return false;
   }
 
+  static private boolean jj_3R_161()
+ {
+    if (jj_scan_token(REG_INT)) return true;
+    return false;
+  }
+
   static private boolean jj_initialized_once = false;
   /** Generated Token Manager. */
   static public PrismParserTokenManager token_source;