From ec0428f084579203a2010fffeffa7eb6b9052e72 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Wed, 25 May 2016 23:41:11 +0000
Subject: [PATCH] Update parser files to version 6.0 of JavaCC.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11367 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/parser/ParseException.java          |    4 +-
 prism/src/parser/Prism3To4.java               | 1591 ++++++++----
 prism/src/parser/Prism3To4TokenManager.java   |  248 +-
 prism/src/parser/PrismParser.java             | 2274 ++++++++++-------
 prism/src/parser/PrismParser.jj               |    2 +-
 prism/src/parser/PrismParserTokenManager.java |  252 +-
 prism/src/parser/SimpleCharStream.java        |   11 +-
 prism/src/parser/Token.java                   |    4 +-
 prism/src/parser/TokenMgrError.java           |    4 +-
 prism/src/pta/parser/PTAParser.java           |  158 +-
 .../src/pta/parser/PTAParserTokenManager.java |  204 +-
 prism/src/pta/parser/ParseException.java      |    4 +-
 prism/src/pta/parser/SimpleCharStream.java    |   11 +-
 prism/src/pta/parser/Token.java               |    4 +-
 prism/src/pta/parser/TokenMgrError.java       |    4 +-
 15 files changed, 2850 insertions(+), 1925 deletions(-)

diff --git a/prism/src/parser/ParseException.java b/prism/src/parser/ParseException.java
index 5144d63b..0f7f1628 100644
--- a/prism/src/parser/ParseException.java
+++ b/prism/src/parser/ParseException.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 6.0 */
 /* JavaCCOptions:KEEP_LINE_COL=null */
 package parser;
 
@@ -184,4 +184,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=16ba3edbb338127335444b2b77a37aa1 (do not edit this line) */
+/* JavaCC - OriginalChecksum=83512206aea6c09dd76f640dc4cc775b (do not edit this line) */
diff --git a/prism/src/parser/Prism3To4.java b/prism/src/parser/Prism3To4.java
index c441e2d5..a9f4f98a 100644
--- a/prism/src/parser/Prism3To4.java
+++ b/prism/src/parser/Prism3To4.java
@@ -1,3 +1,4 @@
+/* Prism3To4.java */
 /* Generated By:JavaCC: Do not edit this line. Prism3To4.java */
 package parser;
 
@@ -32,9 +33,9 @@ public class Prism3To4 implements Prism3To4Constants {
 //-----------------------------------------------------------------------------------
 // top-level stuff
 //-----------------------------------------------------------------------------------
-  static final public void ModulesFileOrPropertiesFile() throws ParseException {
-        Token t = null, ptr, ptr2;
-          t = getToken(1);
+  static final public 
+void ModulesFileOrPropertiesFile() throws ParseException {Token t = null, ptr, ptr2;
+t = getToken(1);
     if (jj_2_1(2147483647)) {
       ModulesFile();
     } else if (jj_2_2(2147483647)) {
@@ -43,7 +44,7 @@ public class Prism3To4 implements Prism3To4Constants {
       jj_consume_token(-1);
       throw new ParseException();
     }
-                ptr = t;
+ptr = t;
                 while (ptr != null) {
                         if (ptr.specialToken != null) {
                                 ptr2 = ptr;
@@ -56,7 +57,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // modules file
-  static final public void ModulesFile() throws ParseException {
+  static final public 
+void ModulesFile() throws ParseException {
     label_1:
     while (true) {
       if (jj_2_3(2147483647)) {
@@ -93,7 +95,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // properties file
-  static final public void PropertiesFile() throws ParseException {
+  static final public 
+void PropertiesFile() throws ParseException {
     label_2:
     while (true) {
       if (jj_2_14(2147483647)) {
@@ -107,7 +110,7 @@ public class Prism3To4 implements Prism3To4Constants {
         ConstantDef();
       } else if (jj_2_17(2147483647)) {
         PCTLFormula();
-                                                                            getToken(0).image += ";";
+getToken(0).image += ";";
       } else {
         jj_consume_token(-1);
         throw new ParseException();
@@ -117,7 +120,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // a single expression
-  static final public void SingleExpression() throws ParseException {
+  static final public 
+void SingleExpression() throws ParseException {
     Expression();
     jj_consume_token(0);
   }
@@ -127,7 +131,8 @@ public class Prism3To4 implements Prism3To4Constants {
 //-----------------------------------------------------------------------------------
 
 // keyword denoting module type (nondeterministic, probabilistic, ...)
-  static final public void ModulesFileType() throws ParseException {
+  static final public 
+void ModulesFileType() throws ParseException {
     if (jj_2_18(2147483647)) {
       jj_consume_token(PROBABILISTIC);
     } else if (jj_2_19(2147483647)) {
@@ -147,7 +152,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // formula definition
-  static final public void FormulaDef() throws ParseException {
+  static final public 
+void FormulaDef() throws ParseException {
     jj_consume_token(FORMULA);
     Identifier();
     jj_consume_token(EQ);
@@ -156,7 +162,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // label definition
-  static final public void LabelDef() throws ParseException {
+  static final public 
+void LabelDef() throws ParseException {
     jj_consume_token(LABEL);
     jj_consume_token(DQUOTE);
     Identifier();
@@ -167,7 +174,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // constant definition
-  static final public void ConstantDef() throws ParseException {
+  static final public 
+void ConstantDef() throws ParseException {
     if (jj_2_31(2147483647)) {
       jj_consume_token(CONST);
       jj_consume_token(INT);
@@ -235,13 +243,15 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // global variable declaration
-  static final public void GlobalDecl() throws ParseException {
+  static final public 
+void GlobalDecl() throws ParseException {
     jj_consume_token(GLOBAL);
     Declaration();
   }
 
 // module definition
-  static final public void Module() throws ParseException {
+  static final public 
+void Module() throws ParseException {
     jj_consume_token(MODULE);
     Identifier();
     label_3:
@@ -266,7 +276,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // variable declaration
-  static final public void Declaration() throws ParseException {
+  static final public 
+void Declaration() throws ParseException {
     if (jj_2_40(2147483647)) {
       Identifier();
       jj_consume_token(COLON);
@@ -300,7 +311,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // command definition
-  static final public void Command() throws ParseException {
+  static final public 
+void Command() throws ParseException {
     jj_consume_token(LBRACKET);
     if (jj_2_42(2147483647)) {
       Identifier();
@@ -362,8 +374,7 @@ public class Prism3To4 implements Prism3To4Constants {
     }
   }
 
-  static final public void UpdateElement() throws ParseException {
-        Token t1, t2;
+  static final public void UpdateElement() throws ParseException {Token t1, t2;
     if (jj_2_49(2147483647)) {
       jj_consume_token(LPARENTH);
       IdentifierPrime();
@@ -371,12 +382,12 @@ public class Prism3To4 implements Prism3To4Constants {
       Expression();
       jj_consume_token(RPARENTH);
     } else if (jj_2_50(2147483647)) {
-                                                                            t1=getToken(0);
+t1=getToken(0);
       IdentifierPrime();
       jj_consume_token(EQ);
       Expression();
-                                                                                                                                    t2=getToken(0);
-          insertTokenBeforeNext(t1, "("); t2.image += ")";
+t2=getToken(0);
+insertTokenBeforeNext(t1, "("); t2.image += ")";
     } else {
       jj_consume_token(-1);
       throw new ParseException();
@@ -384,7 +395,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // module definition (by renaming)
-  static final public void RenamedModule() throws ParseException {
+  static final public 
+void RenamedModule() throws ParseException {
     jj_consume_token(MODULE);
     Identifier();
     jj_consume_token(EQ);
@@ -442,14 +454,16 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system composition definition
-  static final public void SystemComp() throws ParseException {
+  static final public 
+void SystemComp() throws ParseException {
     jj_consume_token(SYSTEM);
     SystemParallels();
     jj_consume_token(ENDSYSTEM);
   }
 
 // system definition component
-  static final public void SystemParallels() throws ParseException {
+  static final public 
+void SystemParallels() throws ParseException {
     if (jj_2_62(2147483647)) {
       SystemFullParallel();
     } else if (jj_2_63(2147483647)) {
@@ -465,7 +479,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (full parallel)
-  static final public void SystemFullParallel() throws ParseException {
+  static final public 
+void SystemFullParallel() throws ParseException {
     SystemHideRename();
     label_8:
     while (true) {
@@ -481,7 +496,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (interleaved parallel)
-  static final public void SystemInterleaved() throws ParseException {
+  static final public 
+void SystemInterleaved() throws ParseException {
     SystemHideRename();
     label_9:
     while (true) {
@@ -498,7 +514,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (parallel over set of actions)
-  static final public void SystemParallel() throws ParseException {
+  static final public 
+void SystemParallel() throws ParseException {
     SystemHideRename();
     jj_consume_token(OR);
     jj_consume_token(LBRACKET);
@@ -519,7 +536,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (hiding and renaming)
-  static final public void SystemHideRename() throws ParseException {
+  static final public 
+void SystemHideRename() throws ParseException {
     SystemAtomic();
     label_11:
     while (true) {
@@ -569,7 +587,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (bottom level)
-  static final public void SystemAtomic() throws ParseException {
+  static final public 
+void SystemAtomic() throws ParseException {
     if (jj_2_74(2147483647)) {
       SystemModule();
     } else if (jj_2_75(2147483647)) {
@@ -581,24 +600,28 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // system definition component (action identifier)
-  static final public void SystemAction() throws ParseException {
+  static final public 
+void SystemAction() throws ParseException {
     Identifier();
   }
 
 // system definition component (module identifier)
-  static final public void SystemModule() throws ParseException {
+  static final public 
+void SystemModule() throws ParseException {
     Identifier();
   }
 
 // system definition component (brackets)
-  static final public void SystemBrackets() throws ParseException {
+  static final public 
+void SystemBrackets() throws ParseException {
     jj_consume_token(LPARENTH);
     SystemParallels();
     jj_consume_token(RPARENTH);
   }
 
 // reward structure
-  static final public void RewardStruct() throws ParseException {
+  static final public 
+void RewardStruct() throws ParseException {
     jj_consume_token(REWARDS);
     if (jj_2_76(2147483647)) {
       jj_consume_token(DQUOTE);
@@ -620,7 +643,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // single line (item) of state-based rewards structure
-  static final public void RewardStructItem() throws ParseException {
+  static final public 
+void RewardStructItem() throws ParseException {
     if (jj_2_79(2147483647)) {
       jj_consume_token(LBRACKET);
       if (jj_2_78(2147483647)) {
@@ -639,7 +663,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // multiple initial states
-  static final public void Init() throws ParseException {
+  static final public 
+void Init() throws ParseException {
     jj_consume_token(INIT);
     Expression();
     jj_consume_token(ENDINIT);
@@ -650,7 +675,8 @@ public class Prism3To4 implements Prism3To4Constants {
 //-----------------------------------------------------------------------------------
 
 // pctl formula
-  static final public void PCTLFormula() throws ParseException {
+  static final public 
+void PCTLFormula() throws ParseException {
     PCTLImplies();
   }
 
@@ -702,7 +728,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl prob operator
-  static final public void PCTLProb() throws ParseException {
+  static final public 
+void PCTLProb() throws ParseException {
     if (jj_2_99(2147483647)) {
       if (jj_2_84(2147483647)) {
         jj_consume_token(P);
@@ -786,13 +813,15 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl next
-  static final public void PCTLProbNext() throws ParseException {
+  static final public 
+void PCTLProbNext() throws ParseException {
     jj_consume_token(NEXT);
     PCTLFormula();
   }
 
 // pctl bounded until
-  static final public void PCTLProbBoundedUntil() throws ParseException {
+  static final public 
+void PCTLProbBoundedUntil() throws ParseException {
     PCTLFormula();
     jj_consume_token(UNTIL);
     if (jj_2_101(2147483647)) {
@@ -815,14 +844,16 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl until (unbounded)
-  static final public void PCTLProbUntil() throws ParseException {
+  static final public 
+void PCTLProbUntil() throws ParseException {
     PCTLFormula();
     jj_consume_token(UNTIL);
     PCTLFormula();
   }
 
 // pctl bounded future (eventually) or global
-  static final public void PCTLProbBoundedFutureGlobal() throws ParseException {
+  static final public 
+void PCTLProbBoundedFutureGlobal() throws ParseException {
     if (jj_2_104(2147483647)) {
       jj_consume_token(FUTURE);
     } else if (jj_2_105(2147483647)) {
@@ -851,7 +882,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl future (eventually) or globally
-  static final public void PCTLProbFutureGlobal() throws ParseException {
+  static final public 
+void PCTLProbFutureGlobal() throws ParseException {
     if (jj_2_109(2147483647)) {
       jj_consume_token(FUTURE);
     } else if (jj_2_110(2147483647)) {
@@ -864,7 +896,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl steady state (actually only csl - not pctl at all)
-  static final public void PCTLSS() throws ParseException {
+  static final public 
+void PCTLSS() throws ParseException {
     if (jj_2_114(2147483647)) {
       if (jj_2_111(2147483647)) {
         jj_consume_token(S);
@@ -897,7 +930,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl reward operator
-  static final public void PCTLReward() throws ParseException {
+  static final public 
+void PCTLReward() throws ParseException {
     if (jj_2_134(2147483647)) {
       if (jj_2_123(2147483647)) {
         jj_consume_token(R);
@@ -997,32 +1031,37 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // cumulative reward
-  static final public void PCTLRewardCumul() throws ParseException {
+  static final public 
+void PCTLRewardCumul() throws ParseException {
     jj_consume_token(CUMUL);
     jj_consume_token(LE);
     Expression();
   }
 
 // instantaneous reward
-  static final public void PCTLRewardInst() throws ParseException {
+  static final public 
+void PCTLRewardInst() throws ParseException {
     jj_consume_token(INST);
     jj_consume_token(EQ);
     Expression();
   }
 
 // reach reward
-  static final public void PCTLRewardReach() throws ParseException {
+  static final public 
+void PCTLRewardReach() throws ParseException {
     jj_consume_token(FUTURE);
     PCTLFormula();
   }
 
 // steady-state reward
-  static final public void PCTLRewardSS() throws ParseException {
+  static final public 
+void PCTLRewardSS() throws ParseException {
     jj_consume_token(S);
   }
 
 // init
-  static final public void PCTLInit() throws ParseException {
+  static final public 
+void PCTLInit() throws ParseException {
     if (jj_2_136(2147483647)) {
       jj_consume_token(DQUOTE);
       jj_consume_token(INIT);
@@ -1036,7 +1075,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // label
-  static final public void PCTLLabel() throws ParseException {
+  static final public 
+void PCTLLabel() throws ParseException {
     if (jj_2_138(2147483647)) {
       jj_consume_token(DQUOTE);
       Identifier();
@@ -1050,7 +1090,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // brackets
-  static final public void PCTLBrackets() throws ParseException {
+  static final public 
+void PCTLBrackets() throws ParseException {
     if (jj_2_140(2147483647)) {
       jj_consume_token(LPARENTH);
       PCTLFormula();
@@ -1064,7 +1105,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // pctl expression
-  static final public void PCTLExpression() throws ParseException {
+  static final public 
+void PCTLExpression() throws ParseException {
     ExpressionRelOpRange();
   }
 
@@ -1073,12 +1115,14 @@ public class Prism3To4 implements Prism3To4Constants {
 //-----------------------------------------------------------------------------------
 
 // expression
-  static final public void Expression() throws ParseException {
+  static final public 
+void Expression() throws ParseException {
     ExpressionITE();
   }
 
 // expression (if-then-else)
-  static final public void ExpressionITE() throws ParseException {
+  static final public 
+void ExpressionITE() throws ParseException {
     if (jj_2_142(2147483647)) {
       ExpressionOr();
       jj_consume_token(QMARK);
@@ -1094,7 +1138,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (or)
-  static final public void ExpressionOr() throws ParseException {
+  static final public 
+void ExpressionOr() throws ParseException {
     ExpressionAnd();
     if (jj_2_144(2147483647)) {
       jj_consume_token(OR);
@@ -1105,7 +1150,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (and)
-  static final public void ExpressionAnd() throws ParseException {
+  static final public 
+void ExpressionAnd() throws ParseException {
     ExpressionNot();
     label_19:
     while (true) {
@@ -1120,7 +1166,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (not)
-  static final public void ExpressionNot() throws ParseException {
+  static final public 
+void ExpressionNot() throws ParseException {
     if (jj_2_146(2147483647)) {
       jj_consume_token(NOT);
     } else {
@@ -1130,8 +1177,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression: relational operators/ranges
-  static final public void ExpressionRelOpRange() throws ParseException {
-        Token t0, t1, t2, ptr;
+  static final public 
+void ExpressionRelOpRange() throws ParseException {Token t0, t1, t2, ptr;
         String relOp = null;
         boolean up, thisIsARange = false;
         String lhs = null, s1 = null, s2 = null, newExpr = "";
@@ -1140,23 +1187,23 @@ public class Prism3To4 implements Prism3To4Constants {
       relOp = LtGt();
       ExpressionPlusMinus();
     } else if (jj_2_151(2147483647)) {
-          t0=getToken(0); t1=getToken(1);
+t0=getToken(0); t1=getToken(1);
       ExpressionPlusMinus();
-          t2=getToken(1); ptr = t1; lhs = ""; while (ptr != t2) { lhs += ptr.image; ptr = ptr.next; }
+t2=getToken(1); ptr = t1; lhs = ""; while (ptr != t2) { lhs += ptr.image; ptr = ptr.next; }
       relOp = EqNeq();
-          newExpr = (relOp.equals("!="))?"!(":"(";
-          t1=getToken(1);
+newExpr = (relOp.equals("!="))?"!(":"(";
+t1=getToken(1);
       ExpressionPlusMinus();
-          t2=getToken(1); ptr = t1; s1 = ""; while (ptr != t2) { s1 += ptr.image; ptr = ptr.next; } up = false;
+t2=getToken(1); ptr = t1; s1 = ""; while (ptr != t2) { s1 += ptr.image; ptr = ptr.next; } up = false;
       if (jj_2_147(2147483647)) {
         jj_consume_token(DOTS);
-          thisIsARange = true; t1=getToken(1);
+thisIsARange = true; t1=getToken(1);
         ExpressionPlusMinus();
-          t2=getToken(1); ptr = t1; s2 = ""; while (ptr != t2) { s2 += ptr.image; ptr = ptr.next; } up = true;
+t2=getToken(1); ptr = t1; s2 = ""; while (ptr != t2) { s2 += ptr.image; ptr = ptr.next; } up = true;
       } else {
         ;
       }
-          if (up) newExpr += "("+lhs+")>=("+s1+")&("+lhs+")<=("+s2+")"; else newExpr += "("+lhs+")=("+s1+")";
+if (up) newExpr += "("+lhs+")>=("+s1+")&("+lhs+")<=("+s2+")"; else newExpr += "("+lhs+")=("+s1+")";
       label_20:
       while (true) {
         if (jj_2_148(2147483647)) {
@@ -1165,20 +1212,20 @@ public class Prism3To4 implements Prism3To4Constants {
           break label_20;
         }
         jj_consume_token(COMMA);
-          thisIsARange = true; t1=getToken(1);
+thisIsARange = true; t1=getToken(1);
         ExpressionPlusMinus();
-          t2=getToken(1); ptr = t1; s1 = ""; while (ptr != t2) { s1 += ptr.image; ptr = ptr.next; } up = false;
+t2=getToken(1); ptr = t1; s1 = ""; while (ptr != t2) { s1 += ptr.image; ptr = ptr.next; } up = false;
         if (jj_2_149(2147483647)) {
           jj_consume_token(DOTS);
-          t1=getToken(1);
+t1=getToken(1);
           ExpressionPlusMinus();
-          t2=getToken(1); ptr = t1; s2 = ""; while (ptr != t2) { s2 += ptr.image; ptr = ptr.next; } up = true;
+t2=getToken(1); ptr = t1; s2 = ""; while (ptr != t2) { s2 += ptr.image; ptr = ptr.next; } up = true;
         } else {
           ;
         }
-          if (up) newExpr += "|("+lhs+")>=("+s1+")&("+lhs+")<=("+s2+")"; else newExpr += "|("+lhs+")=("+s1+")";
+if (up) newExpr += "|("+lhs+")>=("+s1+")&("+lhs+")<=("+s2+")"; else newExpr += "|("+lhs+")=("+s1+")";
       }
-          newExpr += ")"; if (thisIsARange) { t0.next = getToken(1); insertTokenBeforeNext(t0, newExpr); }
+newExpr += ")"; if (thisIsARange) { t0.next = getToken(1); insertTokenBeforeNext(t0, newExpr); }
     } else if (jj_2_152(2147483647)) {
       ExpressionPlusMinus();
     } else {
@@ -1188,7 +1235,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression: plus/minus - binary, left associative
-  static final public void ExpressionPlusMinus() throws ParseException {
+  static final public 
+void ExpressionPlusMinus() throws ParseException {
     ExpressionTimesDivide();
     label_21:
     while (true) {
@@ -1210,7 +1258,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression: times/divide - binary, left associative
-  static final public void ExpressionTimesDivide() throws ParseException {
+  static final public 
+void ExpressionTimesDivide() throws ParseException {
     ExpressionUnaryMinus();
     label_22:
     while (true) {
@@ -1232,7 +1281,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression: unary minus (right associative)
-  static final public void ExpressionUnaryMinus() throws ParseException {
+  static final public 
+void ExpressionUnaryMinus() throws ParseException {
     if (jj_2_159(2147483647)) {
       jj_consume_token(MINUS);
       ExpressionFunc();
@@ -1245,7 +1295,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (function)
-  static final public void ExpressionFunc() throws ParseException {
+  static final public 
+void ExpressionFunc() throws ParseException {
     if (jj_2_173(2147483647)) {
       if (jj_2_170(2147483647)) {
         if (jj_2_161(2147483647)) {
@@ -1304,7 +1355,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (identifier)
-  static final public void ExpressionIdent() throws ParseException {
+  static final public 
+void ExpressionIdent() throws ParseException {
     if (jj_2_175(2147483647)) {
       Identifier();
     } else if (jj_2_176(2147483647)) {
@@ -1316,7 +1368,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (literal)
-  static final public void ExpressionLiteral() throws ParseException {
+  static final public 
+void ExpressionLiteral() throws ParseException {
     if (jj_2_177(2147483647)) {
       Int();
     } else if (jj_2_178(2147483647)) {
@@ -1334,7 +1387,8 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 // expression (brackets)
-  static final public void ExpressionBrackets() throws ParseException {
+  static final public 
+void ExpressionBrackets() throws ParseException {
     jj_consume_token(LPARENTH);
     Expression();
     jj_consume_token(RPARENTH);
@@ -1345,24 +1399,27 @@ public class Prism3To4 implements Prism3To4Constants {
 //-----------------------------------------------------------------------------------
 
 // identifier
-  static final public String Identifier() throws ParseException {
+  static final public 
+String Identifier() throws ParseException {
     jj_consume_token(REG_IDENT);
-                {if (true) return token.image;}
+{if ("" != null) return token.image;}
     throw new Error("Missing return statement in function");
   }
 
 // identifier with a prime
-  static final public String IdentifierPrime() throws ParseException {
+  static final public 
+String IdentifierPrime() throws ParseException {
     jj_consume_token(REG_IDENTPRIME);
-                // remove prime and return
+// remove prime and return
                 String s = token.image;
                 s = s.substring(0, s.length()-1);
-                {if (true) return s;}
+                {if ("" != null) return s;}
     throw new Error("Missing return statement in function");
   }
 
 // one of the relational operators: =, !=
-  static final public String EqNeq() throws ParseException {
+  static final public 
+String EqNeq() throws ParseException {
     if (jj_2_182(2147483647)) {
       jj_consume_token(EQ);
     } else if (jj_2_183(2147483647)) {
@@ -1371,12 +1428,13 @@ public class Prism3To4 implements Prism3To4Constants {
       jj_consume_token(-1);
       throw new ParseException();
     }
-                {if (true) return token.image;}
+{if ("" != null) return token.image;}
     throw new Error("Missing return statement in function");
   }
 
 // one of the relational operators: >, <, >=, <=
-  static final public String LtGt() throws ParseException {
+  static final public 
+String LtGt() throws ParseException {
     if (jj_2_184(2147483647)) {
       jj_consume_token(GT);
     } else if (jj_2_185(2147483647)) {
@@ -1389,1347 +1447,1538 @@ public class Prism3To4 implements Prism3To4Constants {
       jj_consume_token(-1);
       throw new ParseException();
     }
-                {if (true) return token.image;}
+{if ("" != null) return token.image;}
     throw new Error("Missing return statement in function");
   }
 
 // integer
-  static final public int Int() throws ParseException {
-        int i;
+  static final public 
+int Int() throws ParseException {int i;
     jj_consume_token(REG_INT);
-                i = Integer.parseInt(token.image);
-                {if (true) return i;}
+i = Integer.parseInt(token.image);
+                {if ("" != null) return i;}
     throw new Error("Missing return statement in function");
   }
 
 // double
-  static final public String Double() throws ParseException {
+  static final public 
+String Double() throws ParseException {
     jj_consume_token(REG_DOUBLE);
-                //return Double.valueOf(token.image).doubleValue();
-                {if (true) return token.image;}
+//return Double.valueOf(token.image).doubleValue();
+                {if ("" != null) return token.image;}
     throw new Error("Missing return statement in function");
   }
 
-  static private boolean jj_2_1(int xla) {
+  static private boolean jj_2_1(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_1(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(0, xla); }
   }
 
-  static private boolean jj_2_2(int xla) {
+  static private boolean jj_2_2(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_2(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(1, xla); }
   }
 
-  static private boolean jj_2_3(int xla) {
+  static private boolean jj_2_3(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_3(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(2, xla); }
   }
 
-  static private boolean jj_2_4(int xla) {
+  static private boolean jj_2_4(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_4(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(3, xla); }
   }
 
-  static private boolean jj_2_5(int xla) {
+  static private boolean jj_2_5(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_5(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(4, xla); }
   }
 
-  static private boolean jj_2_6(int xla) {
+  static private boolean jj_2_6(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_6(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(5, xla); }
   }
 
-  static private boolean jj_2_7(int xla) {
+  static private boolean jj_2_7(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_7(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(6, xla); }
   }
 
-  static private boolean jj_2_8(int xla) {
+  static private boolean jj_2_8(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_8(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(7, xla); }
   }
 
-  static private boolean jj_2_9(int xla) {
+  static private boolean jj_2_9(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_9(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(8, xla); }
   }
 
-  static private boolean jj_2_10(int xla) {
+  static private boolean jj_2_10(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_10(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(9, xla); }
   }
 
-  static private boolean jj_2_11(int xla) {
+  static private boolean jj_2_11(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_11(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(10, xla); }
   }
 
-  static private boolean jj_2_12(int xla) {
+  static private boolean jj_2_12(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_12(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(11, xla); }
   }
 
-  static private boolean jj_2_13(int xla) {
+  static private boolean jj_2_13(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_13(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(12, xla); }
   }
 
-  static private boolean jj_2_14(int xla) {
+  static private boolean jj_2_14(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_14(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(13, xla); }
   }
 
-  static private boolean jj_2_15(int xla) {
+  static private boolean jj_2_15(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_15(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(14, xla); }
   }
 
-  static private boolean jj_2_16(int xla) {
+  static private boolean jj_2_16(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_16(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(15, xla); }
   }
 
-  static private boolean jj_2_17(int xla) {
+  static private boolean jj_2_17(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_17(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(16, xla); }
   }
 
-  static private boolean jj_2_18(int xla) {
+  static private boolean jj_2_18(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_18(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(17, xla); }
   }
 
-  static private boolean jj_2_19(int xla) {
+  static private boolean jj_2_19(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_19(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(18, xla); }
   }
 
-  static private boolean jj_2_20(int xla) {
+  static private boolean jj_2_20(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_20(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(19, xla); }
   }
 
-  static private boolean jj_2_21(int xla) {
+  static private boolean jj_2_21(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_21(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(20, xla); }
   }
 
-  static private boolean jj_2_22(int xla) {
+  static private boolean jj_2_22(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_22(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(21, xla); }
   }
 
-  static private boolean jj_2_23(int xla) {
+  static private boolean jj_2_23(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_23(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(22, xla); }
   }
 
-  static private boolean jj_2_24(int xla) {
+  static private boolean jj_2_24(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_24(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(23, xla); }
   }
 
-  static private boolean jj_2_25(int xla) {
+  static private boolean jj_2_25(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_25(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(24, xla); }
   }
 
-  static private boolean jj_2_26(int xla) {
+  static private boolean jj_2_26(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_26(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(25, xla); }
   }
 
-  static private boolean jj_2_27(int xla) {
+  static private boolean jj_2_27(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_27(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(26, xla); }
   }
 
-  static private boolean jj_2_28(int xla) {
+  static private boolean jj_2_28(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_28(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(27, xla); }
   }
 
-  static private boolean jj_2_29(int xla) {
+  static private boolean jj_2_29(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_29(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(28, xla); }
   }
 
-  static private boolean jj_2_30(int xla) {
+  static private boolean jj_2_30(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_30(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(29, xla); }
   }
 
-  static private boolean jj_2_31(int xla) {
+  static private boolean jj_2_31(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_31(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(30, xla); }
   }
 
-  static private boolean jj_2_32(int xla) {
+  static private boolean jj_2_32(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_32(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(31, xla); }
   }
 
-  static private boolean jj_2_33(int xla) {
+  static private boolean jj_2_33(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_33(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(32, xla); }
   }
 
-  static private boolean jj_2_34(int xla) {
+  static private boolean jj_2_34(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_34(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(33, xla); }
   }
 
-  static private boolean jj_2_35(int xla) {
+  static private boolean jj_2_35(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_35(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(34, xla); }
   }
 
-  static private boolean jj_2_36(int xla) {
+  static private boolean jj_2_36(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_36(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(35, xla); }
   }
 
-  static private boolean jj_2_37(int xla) {
+  static private boolean jj_2_37(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_37(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(36, xla); }
   }
 
-  static private boolean jj_2_38(int xla) {
+  static private boolean jj_2_38(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_38(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(37, xla); }
   }
 
-  static private boolean jj_2_39(int xla) {
+  static private boolean jj_2_39(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_39(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(38, xla); }
   }
 
-  static private boolean jj_2_40(int xla) {
+  static private boolean jj_2_40(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_40(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(39, xla); }
   }
 
-  static private boolean jj_2_41(int xla) {
+  static private boolean jj_2_41(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_41(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(40, xla); }
   }
 
-  static private boolean jj_2_42(int xla) {
+  static private boolean jj_2_42(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_42(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(41, xla); }
   }
 
-  static private boolean jj_2_43(int xla) {
+  static private boolean jj_2_43(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_43(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(42, xla); }
   }
 
-  static private boolean jj_2_44(int xla) {
+  static private boolean jj_2_44(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_44(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(43, xla); }
   }
 
-  static private boolean jj_2_45(int xla) {
+  static private boolean jj_2_45(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_45(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(44, xla); }
   }
 
-  static private boolean jj_2_46(int xla) {
+  static private boolean jj_2_46(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_46(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(45, xla); }
   }
 
-  static private boolean jj_2_47(int xla) {
+  static private boolean jj_2_47(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_47(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(46, xla); }
   }
 
-  static private boolean jj_2_48(int xla) {
+  static private boolean jj_2_48(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_48(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(47, xla); }
   }
 
-  static private boolean jj_2_49(int xla) {
+  static private boolean jj_2_49(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_49(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(48, xla); }
   }
 
-  static private boolean jj_2_50(int xla) {
+  static private boolean jj_2_50(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_50(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(49, xla); }
   }
 
-  static private boolean jj_2_51(int xla) {
+  static private boolean jj_2_51(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_51(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(50, xla); }
   }
 
-  static private boolean jj_2_52(int xla) {
+  static private boolean jj_2_52(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_52(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(51, xla); }
   }
 
-  static private boolean jj_2_53(int xla) {
+  static private boolean jj_2_53(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_53(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(52, xla); }
   }
 
-  static private boolean jj_2_54(int xla) {
+  static private boolean jj_2_54(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_54(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(53, xla); }
   }
 
-  static private boolean jj_2_55(int xla) {
+  static private boolean jj_2_55(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_55(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(54, xla); }
   }
 
-  static private boolean jj_2_56(int xla) {
+  static private boolean jj_2_56(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_56(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(55, xla); }
   }
 
-  static private boolean jj_2_57(int xla) {
+  static private boolean jj_2_57(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_57(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(56, xla); }
   }
 
-  static private boolean jj_2_58(int xla) {
+  static private boolean jj_2_58(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_58(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(57, xla); }
   }
 
-  static private boolean jj_2_59(int xla) {
+  static private boolean jj_2_59(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_59(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(58, xla); }
   }
 
-  static private boolean jj_2_60(int xla) {
+  static private boolean jj_2_60(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_60(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(59, xla); }
   }
 
-  static private boolean jj_2_61(int xla) {
+  static private boolean jj_2_61(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_61(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(60, xla); }
   }
 
-  static private boolean jj_2_62(int xla) {
+  static private boolean jj_2_62(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_62(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(61, xla); }
   }
 
-  static private boolean jj_2_63(int xla) {
+  static private boolean jj_2_63(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_63(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(62, xla); }
   }
 
-  static private boolean jj_2_64(int xla) {
+  static private boolean jj_2_64(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_64(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(63, xla); }
   }
 
-  static private boolean jj_2_65(int xla) {
+  static private boolean jj_2_65(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_65(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(64, xla); }
   }
 
-  static private boolean jj_2_66(int xla) {
+  static private boolean jj_2_66(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_66(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(65, xla); }
   }
 
-  static private boolean jj_2_67(int xla) {
+  static private boolean jj_2_67(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_67(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(66, xla); }
   }
 
-  static private boolean jj_2_68(int xla) {
+  static private boolean jj_2_68(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_68(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(67, xla); }
   }
 
-  static private boolean jj_2_69(int xla) {
+  static private boolean jj_2_69(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_69(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(68, xla); }
   }
 
-  static private boolean jj_2_70(int xla) {
+  static private boolean jj_2_70(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_70(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(69, xla); }
   }
 
-  static private boolean jj_2_71(int xla) {
+  static private boolean jj_2_71(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_71(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(70, xla); }
   }
 
-  static private boolean jj_2_72(int xla) {
+  static private boolean jj_2_72(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_72(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(71, xla); }
   }
 
-  static private boolean jj_2_73(int xla) {
+  static private boolean jj_2_73(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_73(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(72, xla); }
   }
 
-  static private boolean jj_2_74(int xla) {
+  static private boolean jj_2_74(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_74(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(73, xla); }
   }
 
-  static private boolean jj_2_75(int xla) {
+  static private boolean jj_2_75(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_75(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(74, xla); }
   }
 
-  static private boolean jj_2_76(int xla) {
+  static private boolean jj_2_76(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_76(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(75, xla); }
   }
 
-  static private boolean jj_2_77(int xla) {
+  static private boolean jj_2_77(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_77(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(76, xla); }
   }
 
-  static private boolean jj_2_78(int xla) {
+  static private boolean jj_2_78(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_78(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(77, xla); }
   }
 
-  static private boolean jj_2_79(int xla) {
+  static private boolean jj_2_79(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_79(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(78, xla); }
   }
 
-  static private boolean jj_2_80(int xla) {
+  static private boolean jj_2_80(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_80(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(79, xla); }
   }
 
-  static private boolean jj_2_81(int xla) {
+  static private boolean jj_2_81(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_81(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(80, xla); }
   }
 
-  static private boolean jj_2_82(int xla) {
+  static private boolean jj_2_82(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_82(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(81, xla); }
   }
 
-  static private boolean jj_2_83(int xla) {
+  static private boolean jj_2_83(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_83(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(82, xla); }
   }
 
-  static private boolean jj_2_84(int xla) {
+  static private boolean jj_2_84(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_84(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(83, xla); }
   }
 
-  static private boolean jj_2_85(int xla) {
+  static private boolean jj_2_85(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_85(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(84, xla); }
   }
 
-  static private boolean jj_2_86(int xla) {
+  static private boolean jj_2_86(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_86(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(85, xla); }
   }
 
-  static private boolean jj_2_87(int xla) {
+  static private boolean jj_2_87(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_87(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(86, xla); }
   }
 
-  static private boolean jj_2_88(int xla) {
+  static private boolean jj_2_88(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_88(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(87, xla); }
   }
 
-  static private boolean jj_2_89(int xla) {
+  static private boolean jj_2_89(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_89(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(88, xla); }
   }
 
-  static private boolean jj_2_90(int xla) {
+  static private boolean jj_2_90(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_90(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(89, xla); }
   }
 
-  static private boolean jj_2_91(int xla) {
+  static private boolean jj_2_91(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_91(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(90, xla); }
   }
 
-  static private boolean jj_2_92(int xla) {
+  static private boolean jj_2_92(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_92(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(91, xla); }
   }
 
-  static private boolean jj_2_93(int xla) {
+  static private boolean jj_2_93(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_93(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(92, xla); }
   }
 
-  static private boolean jj_2_94(int xla) {
+  static private boolean jj_2_94(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_94(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(93, xla); }
   }
 
-  static private boolean jj_2_95(int xla) {
+  static private boolean jj_2_95(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_95(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(94, xla); }
   }
 
-  static private boolean jj_2_96(int xla) {
+  static private boolean jj_2_96(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_96(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(95, xla); }
   }
 
-  static private boolean jj_2_97(int xla) {
+  static private boolean jj_2_97(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_97(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(96, xla); }
   }
 
-  static private boolean jj_2_98(int xla) {
+  static private boolean jj_2_98(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_98(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(97, xla); }
   }
 
-  static private boolean jj_2_99(int xla) {
+  static private boolean jj_2_99(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_99(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(98, xla); }
   }
 
-  static private boolean jj_2_100(int xla) {
+  static private boolean jj_2_100(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_100(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(99, xla); }
   }
 
-  static private boolean jj_2_101(int xla) {
+  static private boolean jj_2_101(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_101(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(100, xla); }
   }
 
-  static private boolean jj_2_102(int xla) {
+  static private boolean jj_2_102(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_102(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(101, xla); }
   }
 
-  static private boolean jj_2_103(int xla) {
+  static private boolean jj_2_103(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_103(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(102, xla); }
   }
 
-  static private boolean jj_2_104(int xla) {
+  static private boolean jj_2_104(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_104(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(103, xla); }
   }
 
-  static private boolean jj_2_105(int xla) {
+  static private boolean jj_2_105(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_105(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(104, xla); }
   }
 
-  static private boolean jj_2_106(int xla) {
+  static private boolean jj_2_106(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_106(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(105, xla); }
   }
 
-  static private boolean jj_2_107(int xla) {
+  static private boolean jj_2_107(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_107(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(106, xla); }
   }
 
-  static private boolean jj_2_108(int xla) {
+  static private boolean jj_2_108(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_108(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(107, xla); }
   }
 
-  static private boolean jj_2_109(int xla) {
+  static private boolean jj_2_109(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_109(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(108, xla); }
   }
 
-  static private boolean jj_2_110(int xla) {
+  static private boolean jj_2_110(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_110(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(109, xla); }
   }
 
-  static private boolean jj_2_111(int xla) {
+  static private boolean jj_2_111(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_111(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(110, xla); }
   }
 
-  static private boolean jj_2_112(int xla) {
+  static private boolean jj_2_112(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_112(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(111, xla); }
   }
 
-  static private boolean jj_2_113(int xla) {
+  static private boolean jj_2_113(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_113(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(112, xla); }
   }
 
-  static private boolean jj_2_114(int xla) {
+  static private boolean jj_2_114(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_114(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(113, xla); }
   }
 
-  static private boolean jj_2_115(int xla) {
+  static private boolean jj_2_115(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_115(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(114, xla); }
   }
 
-  static private boolean jj_2_116(int xla) {
+  static private boolean jj_2_116(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_116(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(115, xla); }
   }
 
-  static private boolean jj_2_117(int xla) {
+  static private boolean jj_2_117(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_117(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(116, xla); }
   }
 
-  static private boolean jj_2_118(int xla) {
+  static private boolean jj_2_118(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_118(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(117, xla); }
   }
 
-  static private boolean jj_2_119(int xla) {
+  static private boolean jj_2_119(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_119(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(118, xla); }
   }
 
-  static private boolean jj_2_120(int xla) {
+  static private boolean jj_2_120(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_120(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(119, xla); }
   }
 
-  static private boolean jj_2_121(int xla) {
+  static private boolean jj_2_121(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_121(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(120, xla); }
   }
 
-  static private boolean jj_2_122(int xla) {
+  static private boolean jj_2_122(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_122(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(121, xla); }
   }
 
-  static private boolean jj_2_123(int xla) {
+  static private boolean jj_2_123(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_123(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(122, xla); }
   }
 
-  static private boolean jj_2_124(int xla) {
+  static private boolean jj_2_124(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_124(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(123, xla); }
   }
 
-  static private boolean jj_2_125(int xla) {
+  static private boolean jj_2_125(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_125(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(124, xla); }
   }
 
-  static private boolean jj_2_126(int xla) {
+  static private boolean jj_2_126(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_126(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(125, xla); }
   }
 
-  static private boolean jj_2_127(int xla) {
+  static private boolean jj_2_127(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_127(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(126, xla); }
   }
 
-  static private boolean jj_2_128(int xla) {
+  static private boolean jj_2_128(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_128(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(127, xla); }
   }
 
-  static private boolean jj_2_129(int xla) {
+  static private boolean jj_2_129(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_129(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(128, xla); }
   }
 
-  static private boolean jj_2_130(int xla) {
+  static private boolean jj_2_130(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_130(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(129, xla); }
   }
 
-  static private boolean jj_2_131(int xla) {
+  static private boolean jj_2_131(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_131(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(130, xla); }
   }
 
-  static private boolean jj_2_132(int xla) {
+  static private boolean jj_2_132(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_132(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(131, xla); }
   }
 
-  static private boolean jj_2_133(int xla) {
+  static private boolean jj_2_133(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_133(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(132, xla); }
   }
 
-  static private boolean jj_2_134(int xla) {
+  static private boolean jj_2_134(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_134(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(133, xla); }
   }
 
-  static private boolean jj_2_135(int xla) {
+  static private boolean jj_2_135(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_135(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(134, xla); }
   }
 
-  static private boolean jj_2_136(int xla) {
+  static private boolean jj_2_136(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_136(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(135, xla); }
   }
 
-  static private boolean jj_2_137(int xla) {
+  static private boolean jj_2_137(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_137(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(136, xla); }
   }
 
-  static private boolean jj_2_138(int xla) {
+  static private boolean jj_2_138(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_138(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(137, xla); }
   }
 
-  static private boolean jj_2_139(int xla) {
+  static private boolean jj_2_139(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_139(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(138, xla); }
   }
 
-  static private boolean jj_2_140(int xla) {
+  static private boolean jj_2_140(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_140(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(139, xla); }
   }
 
-  static private boolean jj_2_141(int xla) {
+  static private boolean jj_2_141(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_141(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(140, xla); }
   }
 
-  static private boolean jj_2_142(int xla) {
+  static private boolean jj_2_142(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_142(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(141, xla); }
   }
 
-  static private boolean jj_2_143(int xla) {
+  static private boolean jj_2_143(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_143(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(142, xla); }
   }
 
-  static private boolean jj_2_144(int xla) {
+  static private boolean jj_2_144(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_144(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(143, xla); }
   }
 
-  static private boolean jj_2_145(int xla) {
+  static private boolean jj_2_145(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_145(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(144, xla); }
   }
 
-  static private boolean jj_2_146(int xla) {
+  static private boolean jj_2_146(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_146(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(145, xla); }
   }
 
-  static private boolean jj_2_147(int xla) {
+  static private boolean jj_2_147(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_147(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(146, xla); }
   }
 
-  static private boolean jj_2_148(int xla) {
+  static private boolean jj_2_148(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_148(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(147, xla); }
   }
 
-  static private boolean jj_2_149(int xla) {
+  static private boolean jj_2_149(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_149(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(148, xla); }
   }
 
-  static private boolean jj_2_150(int xla) {
+  static private boolean jj_2_150(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_150(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(149, xla); }
   }
 
-  static private boolean jj_2_151(int xla) {
+  static private boolean jj_2_151(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_151(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(150, xla); }
   }
 
-  static private boolean jj_2_152(int xla) {
+  static private boolean jj_2_152(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_152(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(151, xla); }
   }
 
-  static private boolean jj_2_153(int xla) {
+  static private boolean jj_2_153(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_153(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(152, xla); }
   }
 
-  static private boolean jj_2_154(int xla) {
+  static private boolean jj_2_154(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_154(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(153, xla); }
   }
 
-  static private boolean jj_2_155(int xla) {
+  static private boolean jj_2_155(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_155(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(154, xla); }
   }
 
-  static private boolean jj_2_156(int xla) {
+  static private boolean jj_2_156(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_156(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(155, xla); }
   }
 
-  static private boolean jj_2_157(int xla) {
+  static private boolean jj_2_157(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_157(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(156, xla); }
   }
 
-  static private boolean jj_2_158(int xla) {
+  static private boolean jj_2_158(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_158(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(157, xla); }
   }
 
-  static private boolean jj_2_159(int xla) {
+  static private boolean jj_2_159(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_159(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(158, xla); }
   }
 
-  static private boolean jj_2_160(int xla) {
+  static private boolean jj_2_160(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_160(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(159, xla); }
   }
 
-  static private boolean jj_2_161(int xla) {
+  static private boolean jj_2_161(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_161(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(160, xla); }
   }
 
-  static private boolean jj_2_162(int xla) {
+  static private boolean jj_2_162(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_162(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(161, xla); }
   }
 
-  static private boolean jj_2_163(int xla) {
+  static private boolean jj_2_163(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_163(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(162, xla); }
   }
 
-  static private boolean jj_2_164(int xla) {
+  static private boolean jj_2_164(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_164(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(163, xla); }
   }
 
-  static private boolean jj_2_165(int xla) {
+  static private boolean jj_2_165(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_165(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(164, xla); }
   }
 
-  static private boolean jj_2_166(int xla) {
+  static private boolean jj_2_166(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_166(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(165, xla); }
   }
 
-  static private boolean jj_2_167(int xla) {
+  static private boolean jj_2_167(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_167(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(166, xla); }
   }
 
-  static private boolean jj_2_168(int xla) {
+  static private boolean jj_2_168(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_168(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(167, xla); }
   }
 
-  static private boolean jj_2_169(int xla) {
+  static private boolean jj_2_169(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_169(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(168, xla); }
   }
 
-  static private boolean jj_2_170(int xla) {
+  static private boolean jj_2_170(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_170(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(169, xla); }
   }
 
-  static private boolean jj_2_171(int xla) {
+  static private boolean jj_2_171(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_171(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(170, xla); }
   }
 
-  static private boolean jj_2_172(int xla) {
+  static private boolean jj_2_172(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_172(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(171, xla); }
   }
 
-  static private boolean jj_2_173(int xla) {
+  static private boolean jj_2_173(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_173(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(172, xla); }
   }
 
-  static private boolean jj_2_174(int xla) {
+  static private boolean jj_2_174(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_174(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(173, xla); }
   }
 
-  static private boolean jj_2_175(int xla) {
+  static private boolean jj_2_175(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_175(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(174, xla); }
   }
 
-  static private boolean jj_2_176(int xla) {
+  static private boolean jj_2_176(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_176(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(175, xla); }
   }
 
-  static private boolean jj_2_177(int xla) {
+  static private boolean jj_2_177(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_177(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(176, xla); }
   }
 
-  static private boolean jj_2_178(int xla) {
+  static private boolean jj_2_178(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_178(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(177, xla); }
   }
 
-  static private boolean jj_2_179(int xla) {
+  static private boolean jj_2_179(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_179(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(178, xla); }
   }
 
-  static private boolean jj_2_180(int xla) {
+  static private boolean jj_2_180(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_180(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(179, xla); }
   }
 
-  static private boolean jj_2_181(int xla) {
+  static private boolean jj_2_181(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_181(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(180, xla); }
   }
 
-  static private boolean jj_2_182(int xla) {
+  static private boolean jj_2_182(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_182(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(181, xla); }
   }
 
-  static private boolean jj_2_183(int xla) {
+  static private boolean jj_2_183(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_183(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(182, xla); }
   }
 
-  static private boolean jj_2_184(int xla) {
+  static private boolean jj_2_184(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_184(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(183, xla); }
   }
 
-  static private boolean jj_2_185(int xla) {
+  static private boolean jj_2_185(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_185(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(184, xla); }
   }
 
-  static private boolean jj_2_186(int xla) {
+  static private boolean jj_2_186(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_186(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(185, xla); }
   }
 
-  static private boolean jj_2_187(int xla) {
+  static private boolean jj_2_187(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_187(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(186, xla); }
   }
 
-  static private boolean jj_3_63() {
+  static private boolean jj_3_63()
+ {
     if (jj_3R_47()) return true;
     return false;
   }
 
-  static private boolean jj_3_180() {
+  static private boolean jj_3_180()
+ {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_48() {
+  static private boolean jj_3R_48()
+ {
     if (jj_3R_49()) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(LBRACKET)) return true;
@@ -2745,22 +2994,26 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_59() {
+  static private boolean jj_3_59()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3_54() {
+  static private boolean jj_3_54()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_44() {
+  static private boolean jj_3R_44()
+ {
     if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
 
-  static private boolean jj_3R_47() {
+  static private boolean jj_3R_47()
+ {
     if (jj_3R_49()) return true;
     Token xsp;
     if (jj_3_67()) return true;
@@ -2771,28 +3024,33 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_164() {
+  static private boolean jj_3_164()
+ {
     if (jj_scan_token(CEIL)) return true;
     return false;
   }
 
-  static private boolean jj_3_179() {
+  static private boolean jj_3_179()
+ {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3_13() {
+  static private boolean jj_3_13()
+ {
     if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3_39() {
+  static private boolean jj_3_39()
+ {
     if (jj_scan_token(INIT)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_46() {
+  static private boolean jj_3R_46()
+ {
     if (jj_3R_49()) return true;
     Token xsp;
     if (jj_3_66()) return true;
@@ -2803,27 +3061,32 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_48() {
+  static private boolean jj_3_48()
+ {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3_58() {
+  static private boolean jj_3_58()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_53() {
+  static private boolean jj_3_53()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_38() {
+  static private boolean jj_3R_38()
+ {
     if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_86() {
+  static private boolean jj_3R_86()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_62()) {
@@ -2839,87 +3102,103 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_62() {
+  static private boolean jj_3_62()
+ {
     if (jj_3R_46()) return true;
     return false;
   }
 
-  static private boolean jj_3_163() {
+  static private boolean jj_3_163()
+ {
     if (jj_scan_token(FLOOR)) return true;
     return false;
   }
 
-  static private boolean jj_3_178() {
+  static private boolean jj_3_178()
+ {
     if (jj_3R_83()) return true;
     return false;
   }
 
-  static private boolean jj_3_176() {
+  static private boolean jj_3_176()
+ {
     if (jj_3R_81()) return true;
     return false;
   }
 
-  static private boolean jj_3_158() {
+  static private boolean jj_3_158()
+ {
     if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  static private boolean jj_3_160() {
+  static private boolean jj_3_160()
+ {
     if (jj_3R_79()) return true;
     return false;
   }
 
-  static private boolean jj_3_12() {
+  static private boolean jj_3_12()
+ {
     if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_33() {
+  static private boolean jj_3R_33()
+ {
     if (jj_scan_token(SYSTEM)) return true;
     if (jj_3R_86()) return true;
     if (jj_scan_token(ENDSYSTEM)) return true;
     return false;
   }
 
-  static private boolean jj_3_51() {
+  static private boolean jj_3_51()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_45()) return true;
     return false;
   }
 
-  static private boolean jj_3R_84() {
+  static private boolean jj_3R_84()
+ {
     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_3_155() {
+  static private boolean jj_3_155()
+ {
     if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3_57() {
+  static private boolean jj_3_57()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_162() {
+  static private boolean jj_3_162()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3_52() {
+  static private boolean jj_3_52()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_157() {
+  static private boolean jj_3_157()
+ {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_81() {
+  static private boolean jj_3R_81()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_177()) {
@@ -2938,7 +3217,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_45() {
+  static private boolean jj_3R_45()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_52()) {
@@ -2972,12 +3252,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_177() {
+  static private boolean jj_3_177()
+ {
     if (jj_3R_82()) return true;
     return false;
   }
 
-  static private boolean jj_3_156() {
+  static private boolean jj_3_156()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_157()) {
@@ -2988,13 +3270,15 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_43() {
+  static private boolean jj_3_43()
+ {
     if (jj_scan_token(PLUS)) return true;
     if (jj_3R_41()) return true;
     return false;
   }
 
-  static private boolean jj_3R_85() {
+  static private boolean jj_3R_85()
+ {
     if (jj_3R_45()) return true;
     Token xsp;
     while (true) {
@@ -3004,17 +3288,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_154() {
+  static private boolean jj_3_154()
+ {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3_11() {
+  static private boolean jj_3_11()
+ {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3_151() {
+  static private boolean jj_3_151()
+ {
     if (jj_3R_75()) return true;
     if (jj_3R_76()) return true;
     if (jj_3R_75()) return true;
@@ -3028,13 +3315,15 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_46() {
+  static private boolean jj_3_46()
+ {
     if (jj_scan_token(AND)) return true;
     if (jj_3R_43()) return true;
     return false;
   }
 
-  static private boolean jj_3R_80() {
+  static private boolean jj_3R_80()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_175()) {
@@ -3044,12 +3333,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_175() {
+  static private boolean jj_3_175()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_153() {
+  static private boolean jj_3_153()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_154()) {
@@ -3060,7 +3351,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_41() {
+  static private boolean jj_3_41()
+ {
     if (jj_3R_38()) return true;
     if (jj_scan_token(COLON)) return true;
     if (jj_scan_token(BOOL)) return true;
@@ -3071,7 +3363,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_32() {
+  static private boolean jj_3R_32()
+ {
     if (jj_scan_token(MODULE)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(EQ)) return true;
@@ -3083,17 +3376,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_161() {
+  static private boolean jj_3_161()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_37() {
+  static private boolean jj_3_37()
+ {
     if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3_170() {
+  static private boolean jj_3_170()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_161()) {
@@ -3110,7 +3406,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_79() {
+  static private boolean jj_3R_79()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_173()) {
@@ -3120,7 +3417,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_173() {
+  static private boolean jj_3_173()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_170()) {
@@ -3136,7 +3434,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_43() {
+  static private boolean jj_3R_43()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_49()) {
@@ -3146,7 +3445,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_49() {
+  static private boolean jj_3_49()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_44()) return true;
     if (jj_scan_token(EQ)) return true;
@@ -3155,7 +3455,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_78() {
+  static private boolean jj_3R_78()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_159()) {
@@ -3165,13 +3466,15 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_159() {
+  static private boolean jj_3_159()
+ {
     if (jj_scan_token(MINUS)) return true;
     if (jj_3R_79()) return true;
     return false;
   }
 
-  static private boolean jj_3_45() {
+  static private boolean jj_3_45()
+ {
     if (jj_3R_41()) return true;
     Token xsp;
     while (true) {
@@ -3181,17 +3484,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_23() {
+  static private boolean jj_3_23()
+ {
     if (jj_scan_token(CTMC)) return true;
     return false;
   }
 
-  static private boolean jj_3_10() {
+  static private boolean jj_3_10()
+ {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_42() {
+  static private boolean jj_3R_42()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_47()) {
@@ -3201,7 +3507,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_47() {
+  static private boolean jj_3_47()
+ {
     if (jj_3R_43()) return true;
     Token xsp;
     while (true) {
@@ -3211,12 +3518,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_42() {
+  static private boolean jj_3_42()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_77() {
+  static private boolean jj_3R_77()
+ {
     if (jj_3R_78()) return true;
     Token xsp;
     while (true) {
@@ -3226,35 +3535,41 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_36() {
+  static private boolean jj_3_36()
+ {
     if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3_22() {
+  static private boolean jj_3_22()
+ {
     if (jj_scan_token(MDP)) return true;
     return false;
   }
 
-  static private boolean jj_3R_41() {
+  static private boolean jj_3R_41()
+ {
     if (jj_3R_37()) return true;
     if (jj_scan_token(COLON)) return true;
     if (jj_3R_42()) return true;
     return false;
   }
 
-  static private boolean jj_3_30() {
+  static private boolean jj_3_30()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_9() {
+  static private boolean jj_3_9()
+ {
     if (jj_3R_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_75() {
+  static private boolean jj_3R_75()
+ {
     if (jj_3R_77()) return true;
     Token xsp;
     while (true) {
@@ -3264,12 +3579,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_143() {
+  static private boolean jj_3_143()
+ {
     if (jj_3R_72()) return true;
     return false;
   }
 
-  static private boolean jj_3R_88() {
+  static private boolean jj_3R_88()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_44()) {
@@ -3279,34 +3596,40 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_44() {
+  static private boolean jj_3_44()
+ {
     if (jj_3R_42()) return true;
     return false;
   }
 
-  static private boolean jj_3_152() {
+  static private boolean jj_3_152()
+ {
     if (jj_3R_75()) return true;
     return false;
   }
 
-  static private boolean jj_3_25() {
+  static private boolean jj_3_25()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_21() {
+  static private boolean jj_3_21()
+ {
     if (jj_scan_token(DTMC)) return true;
     return false;
   }
 
-  static private boolean jj_3_26() {
+  static private boolean jj_3_26()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_40() {
+  static private boolean jj_3R_40()
+ {
     if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3319,31 +3642,36 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_24() {
+  static private boolean jj_3_24()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_27() {
+  static private boolean jj_3_27()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_38() {
+  static private boolean jj_3_38()
+ {
     if (jj_scan_token(INIT)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_149() {
+  static private boolean jj_3_149()
+ {
     if (jj_scan_token(DOTS)) return true;
     if (jj_3R_75()) return true;
     return false;
   }
 
-  static private boolean jj_3R_39() {
+  static private boolean jj_3R_39()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_40()) {
@@ -3353,7 +3681,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_40() {
+  static private boolean jj_3_40()
+ {
     if (jj_3R_38()) return true;
     if (jj_scan_token(COLON)) return true;
     if (jj_scan_token(LBRACKET)) return true;
@@ -3368,12 +3697,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_8() {
+  static private boolean jj_3_8()
+ {
     if (jj_3R_30()) return true;
     return false;
   }
 
-  static private boolean jj_3_148() {
+  static private boolean jj_3_148()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_75()) return true;
     Token xsp;
@@ -3382,17 +3713,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_20() {
+  static private boolean jj_3_20()
+ {
     if (jj_scan_token(STOCHASTIC)) return true;
     return false;
   }
 
-  static private boolean jj_3_29() {
+  static private boolean jj_3_29()
+ {
     if (jj_scan_token(PROB)) return true;
     return false;
   }
 
-  static private boolean jj_3R_31() {
+  static private boolean jj_3R_31()
+ {
     if (jj_scan_token(MODULE)) return true;
     if (jj_3R_38()) return true;
     Token xsp;
@@ -3408,39 +3742,46 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_147() {
+  static private boolean jj_3_147()
+ {
     if (jj_scan_token(DOTS)) return true;
     if (jj_3R_75()) return true;
     return false;
   }
 
-  static private boolean jj_3_115() {
+  static private boolean jj_3_115()
+ {
     if (jj_3R_64()) return true;
     return false;
   }
 
-  static private boolean jj_3_17() {
+  static private boolean jj_3_17()
+ {
     if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3R_30() {
+  static private boolean jj_3R_30()
+ {
     if (jj_scan_token(GLOBAL)) return true;
     if (jj_3R_39()) return true;
     return false;
   }
 
-  static private boolean jj_3_28() {
+  static private boolean jj_3_28()
+ {
     if (jj_scan_token(RATE)) return true;
     return false;
   }
 
-  static private boolean jj_3_7() {
+  static private boolean jj_3_7()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3_35() {
+  static private boolean jj_3_35()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_28()) {
@@ -3454,7 +3795,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_91() {
+  static private boolean jj_3R_91()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_150()) {
@@ -3467,20 +3809,23 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_150() {
+  static private boolean jj_3_150()
+ {
     if (jj_3R_75()) return true;
     if (jj_3R_57()) return true;
     if (jj_3R_75()) return true;
     return false;
   }
 
-  static private boolean jj_3_145() {
+  static private boolean jj_3_145()
+ {
     if (jj_scan_token(AND)) return true;
     if (jj_3R_74()) return true;
     return false;
   }
 
-  static private boolean jj_3_34() {
+  static private boolean jj_3_34()
+ {
     if (jj_scan_token(CONST)) return true;
     if (jj_3R_38()) return true;
     Token xsp;
@@ -3490,7 +3835,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_33() {
+  static private boolean jj_3_33()
+ {
     if (jj_scan_token(CONST)) return true;
     if (jj_scan_token(BOOL)) return true;
     if (jj_3R_38()) return true;
@@ -3501,7 +3847,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_32() {
+  static private boolean jj_3_32()
+ {
     if (jj_scan_token(CONST)) return true;
     if (jj_scan_token(DOUBLE)) return true;
     if (jj_3R_38()) return true;
@@ -3512,7 +3859,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_29() {
+  static private boolean jj_3R_29()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_31()) {
@@ -3531,7 +3879,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_31() {
+  static private boolean jj_3_31()
+ {
     if (jj_scan_token(CONST)) return true;
     if (jj_scan_token(INT)) return true;
     if (jj_3R_38()) return true;
@@ -3542,33 +3891,39 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_19() {
+  static private boolean jj_3_19()
+ {
     if (jj_scan_token(NONDETERMINISTIC)) return true;
     return false;
   }
 
-  static private boolean jj_3_144() {
+  static private boolean jj_3_144()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_3R_72()) return true;
     return false;
   }
 
-  static private boolean jj_3_16() {
+  static private boolean jj_3_16()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3_6() {
+  static private boolean jj_3_6()
+ {
     if (jj_3R_28()) return true;
     return false;
   }
 
-  static private boolean jj_3_146() {
+  static private boolean jj_3_146()
+ {
     if (jj_scan_token(NOT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_28() {
+  static private boolean jj_3R_28()
+ {
     if (jj_scan_token(LABEL)) return true;
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_38()) return true;
@@ -3579,7 +3934,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_74() {
+  static private boolean jj_3R_74()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_146()) jj_scanpos = xsp;
@@ -3587,12 +3943,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_141() {
+  static private boolean jj_3_141()
+ {
     if (jj_3R_71()) return true;
     return false;
   }
 
-  static private boolean jj_3R_27() {
+  static private boolean jj_3R_27()
+ {
     if (jj_scan_token(FORMULA)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(EQ)) return true;
@@ -3601,7 +3959,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_92() {
+  static private boolean jj_3R_92()
+ {
     if (jj_3R_74()) return true;
     Token xsp;
     while (true) {
@@ -3611,12 +3970,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_15() {
+  static private boolean jj_3_15()
+ {
     if (jj_3R_28()) return true;
     return false;
   }
 
-  static private boolean jj_3_14() {
+  static private boolean jj_3_14()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_15()) {
@@ -3629,17 +3990,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_5() {
+  static private boolean jj_3_5()
+ {
     if (jj_3R_27()) return true;
     return false;
   }
 
-  static private boolean jj_3_18() {
+  static private boolean jj_3_18()
+ {
     if (jj_scan_token(PROBABILISTIC)) return true;
     return false;
   }
 
-  static private boolean jj_3R_26() {
+  static private boolean jj_3R_26()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_18()) {
@@ -3661,7 +4025,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_72() {
+  static private boolean jj_3R_72()
+ {
     if (jj_3R_92()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3669,12 +4034,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_139() {
+  static private boolean jj_3_139()
+ {
     if (jj_3R_70()) return true;
     return false;
   }
 
-  static private boolean jj_3R_73() {
+  static private boolean jj_3R_73()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_142()) {
@@ -3684,7 +4051,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_142() {
+  static private boolean jj_3_142()
+ {
     if (jj_3R_72()) return true;
     if (jj_scan_token(QMARK)) return true;
     if (jj_3R_72()) return true;
@@ -3693,24 +4061,28 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_37() {
+  static private boolean jj_3R_37()
+ {
     if (jj_3R_73()) return true;
     return false;
   }
 
-  static private boolean jj_3_113() {
+  static private boolean jj_3_113()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_36()) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_137() {
+  static private boolean jj_3_137()
+ {
     if (jj_3R_69()) return true;
     return false;
   }
 
-  static private boolean jj_3R_25() {
+  static private boolean jj_3R_25()
+ {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -3720,7 +4092,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_3() {
+  static private boolean jj_3_3()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_4()) {
@@ -3754,22 +4127,26 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_4() {
+  static private boolean jj_3_4()
+ {
     if (jj_3R_26()) return true;
     return false;
   }
 
-  static private boolean jj_3_129() {
+  static private boolean jj_3_129()
+ {
     if (jj_scan_token(41)) return true;
     return false;
   }
 
-  static private boolean jj_3R_71() {
+  static private boolean jj_3R_71()
+ {
     if (jj_3R_91()) return true;
     return false;
   }
 
-  static private boolean jj_3R_24() {
+  static private boolean jj_3R_24()
+ {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -3779,12 +4156,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_2() {
+  static private boolean jj_3_2()
+ {
     if (jj_3R_25()) return true;
     return false;
   }
 
-  static private boolean jj_3R_70() {
+  static private boolean jj_3R_70()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_140()) {
@@ -3794,14 +4173,16 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_140() {
+  static private boolean jj_3_140()
+ {
     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_69() {
+  static private boolean jj_3R_69()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_138()) {
@@ -3811,24 +4192,28 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_138() {
+  static private boolean jj_3_138()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3_1() {
+  static private boolean jj_3_1()
+ {
     if (jj_3R_24()) return true;
     return false;
   }
 
-  static private boolean jj_3_128() {
+  static private boolean jj_3_128()
+ {
     if (jj_3R_67()) return true;
     return false;
   }
 
-  static private boolean jj_3R_68() {
+  static private boolean jj_3R_68()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_136()) {
@@ -3838,19 +4223,22 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_117() {
+  static private boolean jj_3_117()
+ {
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_136() {
+  static private boolean jj_3_136()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_scan_token(INIT)) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3_108() {
+  static private boolean jj_3_108()
+ {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_37()) return true;
     if (jj_scan_token(COMMA)) return true;
@@ -3859,25 +4247,29 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_132() {
+  static private boolean jj_3_132()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_94() {
+  static private boolean jj_3_94()
+ {
     if (jj_3R_62()) return true;
     return false;
   }
 
-  static private boolean jj_3R_67() {
+  static private boolean jj_3R_67()
+ {
     if (jj_scan_token(FUTURE)) return true;
     if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3_103() {
+  static private boolean jj_3_103()
+ {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_37()) return true;
     if (jj_scan_token(COMMA)) return true;
@@ -3886,62 +4278,72 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_127() {
+  static private boolean jj_3_127()
+ {
     if (jj_3R_66()) return true;
     return false;
   }
 
-  static private boolean jj_3_112() {
+  static private boolean jj_3_112()
+ {
     if (jj_scan_token(S)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_66() {
+  static private boolean jj_3R_66()
+ {
     if (jj_scan_token(INST)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_107() {
+  static private boolean jj_3_107()
+ {
     if (jj_scan_token(GE)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_65() {
+  static private boolean jj_3R_65()
+ {
     if (jj_scan_token(CUMUL)) return true;
     if (jj_scan_token(LE)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_174() {
+  static private boolean jj_3_174()
+ {
     if (jj_3R_80()) return true;
     return false;
   }
 
-  static private boolean jj_3_135() {
+  static private boolean jj_3_135()
+ {
     if (jj_3R_68()) return true;
     return false;
   }
 
-  static private boolean jj_3_116() {
+  static private boolean jj_3_116()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3_102() {
+  static private boolean jj_3_102()
+ {
     if (jj_scan_token(GE)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_130() {
+  static private boolean jj_3_130()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_131()) {
@@ -3951,14 +4353,16 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_131() {
+  static private boolean jj_3_131()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_133() {
+  static private boolean jj_3_133()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_36()) return true;
     if (jj_scan_token(RBRACE)) return true;
@@ -3970,45 +4374,52 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_126() {
+  static private boolean jj_3_126()
+ {
     if (jj_3R_65()) return true;
     return false;
   }
 
-  static private boolean jj_3_93() {
+  static private boolean jj_3_93()
+ {
     if (jj_3R_61()) return true;
     return false;
   }
 
-  static private boolean jj_3_125() {
+  static private boolean jj_3_125()
+ {
     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_3_124() {
+  static private boolean jj_3_124()
+ {
     if (jj_scan_token(RMIN)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3_122() {
+  static private boolean jj_3_122()
+ {
     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_3_121() {
+  static private boolean jj_3_121()
+ {
     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_3_123() {
+  static private boolean jj_3_123()
+ {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4027,7 +4438,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_118() {
+  static private boolean jj_3_118()
+ {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4039,19 +4451,22 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_119() {
+  static private boolean jj_3_119()
+ {
     if (jj_3R_57()) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_120() {
+  static private boolean jj_3_120()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_64() {
+  static private boolean jj_3R_64()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_134()) {
@@ -4061,13 +4476,15 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_106() {
+  static private boolean jj_3_106()
+ {
     if (jj_scan_token(LE)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_134() {
+  static private boolean jj_3_134()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_123()) {
@@ -4095,19 +4512,22 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_111() {
+  static private boolean jj_3_111()
+ {
     if (jj_scan_token(S)) return true;
     if (jj_3R_57()) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_110() {
+  static private boolean jj_3_110()
+ {
     if (jj_scan_token(GLOB)) return true;
     return false;
   }
 
-  static private boolean jj_3R_63() {
+  static private boolean jj_3R_63()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_114()) {
@@ -4117,7 +4537,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_114() {
+  static private boolean jj_3_114()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_111()) {
@@ -4132,28 +4553,33 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_92() {
+  static private boolean jj_3_92()
+ {
     if (jj_3R_60()) return true;
     return false;
   }
 
-  static private boolean jj_3_105() {
+  static private boolean jj_3_105()
+ {
     if (jj_scan_token(GLOB)) return true;
     return false;
   }
 
-  static private boolean jj_3_101() {
+  static private boolean jj_3_101()
+ {
     if (jj_scan_token(LE)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_109() {
+  static private boolean jj_3_109()
+ {
     if (jj_scan_token(FUTURE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_62() {
+  static private boolean jj_3R_62()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_109()) {
@@ -4164,19 +4590,22 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_104() {
+  static private boolean jj_3_104()
+ {
     if (jj_scan_token(FUTURE)) return true;
     return false;
   }
 
-  static private boolean jj_3_97() {
+  static private boolean jj_3_97()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_61() {
+  static private boolean jj_3R_61()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_104()) {
@@ -4195,25 +4624,29 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_172() {
+  static private boolean jj_3_172()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_60() {
+  static private boolean jj_3R_60()
+ {
     if (jj_3R_36()) return true;
     if (jj_scan_token(UNTIL)) return true;
     if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3_91() {
+  static private boolean jj_3_91()
+ {
     if (jj_3R_59()) return true;
     return false;
   }
 
-  static private boolean jj_3R_59() {
+  static private boolean jj_3R_59()
+ {
     if (jj_3R_36()) return true;
     if (jj_scan_token(UNTIL)) return true;
     Token xsp;
@@ -4229,18 +4662,21 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_58() {
+  static private boolean jj_3R_58()
+ {
     if (jj_scan_token(NEXT)) return true;
     if (jj_3R_36()) return true;
     return false;
   }
 
-  static private boolean jj_3_100() {
+  static private boolean jj_3_100()
+ {
     if (jj_3R_63()) return true;
     return false;
   }
 
-  static private boolean jj_3_95() {
+  static private boolean jj_3_95()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_96()) {
@@ -4250,14 +4686,16 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_96() {
+  static private boolean jj_3_96()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3_98() {
+  static private boolean jj_3_98()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_36()) return true;
     if (jj_scan_token(RBRACE)) return true;
@@ -4269,26 +4707,30 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_90() {
+  static private boolean jj_3_90()
+ {
     if (jj_3R_58()) return true;
     return false;
   }
 
-  static private boolean jj_3_89() {
+  static private boolean jj_3_89()
+ {
     if (jj_scan_token(PMAX)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3_88() {
+  static private boolean jj_3_88()
+ {
     if (jj_scan_token(PMIN)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3_87() {
+  static private boolean jj_3_87()
+ {
     if (jj_scan_token(P)) return true;
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4296,7 +4738,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_86() {
+  static private boolean jj_3_86()
+ {
     if (jj_scan_token(P)) return true;
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4304,32 +4747,37 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_82() {
+  static private boolean jj_3_82()
+ {
     if (jj_scan_token(AND)) return true;
     if (jj_3R_56()) return true;
     return false;
   }
 
-  static private boolean jj_3_85() {
+  static private boolean jj_3_85()
+ {
     if (jj_scan_token(P)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3_169() {
+  static private boolean jj_3_169()
+ {
     if (jj_scan_token(CEIL)) return true;
     return false;
   }
 
-  static private boolean jj_3_84() {
+  static private boolean jj_3_84()
+ {
     if (jj_scan_token(P)) return true;
     if (jj_3R_57()) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_90() {
+  static private boolean jj_3R_90()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_99()) {
@@ -4339,7 +4787,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_99() {
+  static private boolean jj_3_99()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_84()) {
@@ -4379,23 +4828,27 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_77() {
+  static private boolean jj_3_77()
+ {
     if (jj_3R_53()) return true;
     return false;
   }
 
-  static private boolean jj_3_81() {
+  static private boolean jj_3_81()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_3R_55()) return true;
     return false;
   }
 
-  static private boolean jj_3_83() {
+  static private boolean jj_3_83()
+ {
     if (jj_scan_token(NOT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_56() {
+  static private boolean jj_3R_56()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_83()) jj_scanpos = xsp;
@@ -4403,13 +4856,15 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_80() {
+  static private boolean jj_3_80()
+ {
     if (jj_scan_token(IMPLIES)) return true;
     if (jj_3R_54()) return true;
     return false;
   }
 
-  static private boolean jj_3R_55() {
+  static private boolean jj_3R_55()
+ {
     if (jj_3R_56()) return true;
     Token xsp;
     while (true) {
@@ -4419,12 +4874,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_168() {
+  static private boolean jj_3_168()
+ {
     if (jj_scan_token(FLOOR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_54() {
+  static private boolean jj_3R_54()
+ {
     if (jj_3R_55()) return true;
     Token xsp;
     while (true) {
@@ -4434,7 +4891,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_87() {
+  static private boolean jj_3R_87()
+ {
     if (jj_3R_54()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4442,28 +4900,33 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_167() {
+  static private boolean jj_3_167()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_36() {
+  static private boolean jj_3R_36()
+ {
     if (jj_3R_87()) return true;
     return false;
   }
 
-  static private boolean jj_3_70() {
+  static private boolean jj_3_70()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_50()) return true;
     return false;
   }
 
-  static private boolean jj_3_78() {
+  static private boolean jj_3_78()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_71() {
+  static private boolean jj_3_71()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_50()) return true;
     if (jj_scan_token(RENAME)) return true;
@@ -4471,37 +4934,43 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_166() {
+  static private boolean jj_3_166()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_76() {
+  static private boolean jj_3_76()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_35() {
+  static private boolean jj_3R_35()
+ {
     if (jj_scan_token(INIT)) return true;
     if (jj_3R_37()) return true;
     if (jj_scan_token(ENDINIT)) return true;
     return false;
   }
 
-  static private boolean jj_3_68() {
+  static private boolean jj_3_68()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_50()) return true;
     return false;
   }
 
-  static private boolean jj_3_65() {
+  static private boolean jj_3_65()
+ {
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3_79() {
+  static private boolean jj_3_79()
+ {
     if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4510,7 +4979,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_53() {
+  static private boolean jj_3R_53()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_79()) jj_scanpos = xsp;
@@ -4521,17 +4991,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_83() {
+  static private boolean jj_3R_83()
+ {
     if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
-  static private boolean jj_3_187() {
+  static private boolean jj_3_187()
+ {
     if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_34() {
+  static private boolean jj_3R_34()
+ {
     if (jj_scan_token(REWARDS)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4544,49 +5017,58 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_165() {
+  static private boolean jj_3_165()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_186() {
+  static private boolean jj_3_186()
+ {
     if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_82() {
+  static private boolean jj_3R_82()
+ {
     if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_52() {
+  static private boolean jj_3R_52()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_86()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_75() {
+  static private boolean jj_3_75()
+ {
     if (jj_3R_52()) return true;
     return false;
   }
 
-  static private boolean jj_3_64() {
+  static private boolean jj_3_64()
+ {
     if (jj_3R_48()) return true;
     return false;
   }
 
-  static private boolean jj_3_185() {
+  static private boolean jj_3_185()
+ {
     if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_51() {
+  static private boolean jj_3R_51()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_72() {
+  static private boolean jj_3_72()
+ {
     if (jj_scan_token(DIVIDE)) return true;
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_50()) return true;
@@ -4599,7 +5081,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_69() {
+  static private boolean jj_3_69()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_72()) {
@@ -4609,17 +5092,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_184() {
+  static private boolean jj_3_184()
+ {
     if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3_61() {
+  static private boolean jj_3_61()
+ {
     if (jj_scan_token(CEIL)) return true;
     return false;
   }
 
-  static private boolean jj_3R_57() {
+  static private boolean jj_3R_57()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_184()) {
@@ -4635,22 +5121,26 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_50() {
+  static private boolean jj_3R_50()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_56() {
+  static private boolean jj_3_56()
+ {
     if (jj_scan_token(CEIL)) return true;
     return false;
   }
 
-  static private boolean jj_3_183() {
+  static private boolean jj_3_183()
+ {
     if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3_171() {
+  static private boolean jj_3_171()
+ {
     if (jj_scan_token(FUNC)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
@@ -4672,12 +5162,14 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_181() {
+  static private boolean jj_3_181()
+ {
     if (jj_3R_84()) return true;
     return false;
   }
 
-  static private boolean jj_3_67() {
+  static private boolean jj_3_67()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
@@ -4685,7 +5177,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_89() {
+  static private boolean jj_3R_89()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_74()) {
@@ -4695,17 +5188,20 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_74() {
+  static private boolean jj_3_74()
+ {
     if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3_182() {
+  static private boolean jj_3_182()
+ {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_76() {
+  static private boolean jj_3R_76()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_182()) {
@@ -4715,31 +5211,36 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3_66() {
+  static private boolean jj_3_66()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3_60() {
+  static private boolean jj_3_60()
+ {
     if (jj_scan_token(FLOOR)) return true;
     return false;
   }
 
-  static private boolean jj_3_50() {
+  static private boolean jj_3_50()
+ {
     if (jj_3R_44()) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3_55() {
+  static private boolean jj_3_55()
+ {
     if (jj_scan_token(FLOOR)) return true;
     return false;
   }
 
-  static private boolean jj_3_73() {
+  static private boolean jj_3_73()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_50()) return true;
     if (jj_scan_token(RENAME)) return true;
@@ -4753,7 +5254,8 @@ public class Prism3To4 implements Prism3To4Constants {
     return false;
   }
 
-  static private boolean jj_3R_49() {
+  static private boolean jj_3R_49()
+ {
     if (jj_3R_89()) return true;
     Token xsp;
     while (true) {
@@ -4815,7 +5317,6 @@ public class Prism3To4 implements Prism3To4Constants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 0; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4848,7 +5349,6 @@ public class Prism3To4 implements Prism3To4Constants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 0; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4859,7 +5359,6 @@ public class Prism3To4 implements Prism3To4Constants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 0; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4876,7 +5375,6 @@ public class Prism3To4 implements Prism3To4Constants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 0; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4886,7 +5384,6 @@ public class Prism3To4 implements Prism3To4Constants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 0; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4914,6 +5411,7 @@ public class Prism3To4 implements Prism3To4Constants {
     throw generateParseException();
   }
 
+  @SuppressWarnings("serial")
   static private final class LookaheadSuccess extends java.lang.Error { }
   static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
   static private boolean jj_scan_token(int kind) {
@@ -4957,7 +5455,7 @@ public class Prism3To4 implements Prism3To4Constants {
     return t;
   }
 
-  static private int jj_ntk() {
+  static private int jj_ntk_f() {
     if ((jj_nt=token.next) == null)
       return (jj_ntk = (token.next=token_source.getNextToken()).kind);
     else
@@ -5265,3 +5763,6 @@ public class Prism3To4 implements Prism3To4Constants {
   }
 
 }
+
+//-----------------------------------------------------------------------------------
+
diff --git a/prism/src/parser/Prism3To4TokenManager.java b/prism/src/parser/Prism3To4TokenManager.java
index 09c247ed..baa74ff2 100644
--- a/prism/src/parser/Prism3To4TokenManager.java
+++ b/prism/src/parser/Prism3To4TokenManager.java
@@ -1,17 +1,16 @@
+/* Prism3To4TokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. Prism3To4TokenManager.java */
 package parser;
 import java.io.*;
 
 /** Token Manager. */
-public class Prism3To4TokenManager implements Prism3To4Constants
-{
+@SuppressWarnings("unused")public class Prism3To4TokenManager implements Prism3To4Constants {
 
   /** Debug output. */
   public static  java.io.PrintStream debugStream = System.out;
   /** Set debug output. */
   public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
-{
+private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1){
    switch (pos)
    {
       case 0:
@@ -162,8 +161,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
          return -1;
    }
 }
-private static final int jjStartNfa_0(int pos, long active0, long active1)
-{
+private static final int jjStartNfa_0(int pos, long active0, long active1){
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
 }
 static private int jjStopAtPos(int pos, int kind)
@@ -172,8 +170,7 @@ static private int jjStopAtPos(int pos, int kind)
    jjmatchedPos = pos;
    return pos + 1;
 }
-static private int jjMoveStringLiteralDfa0_0()
-{
+static private int jjMoveStringLiteralDfa0_0(){
    switch(curChar)
    {
       case 33:
@@ -279,8 +276,7 @@ static private int jjMoveStringLiteralDfa0_0()
          return jjMoveNfa_0(0, 0);
    }
 }
-static private int jjMoveStringLiteralDfa1_0(long active0, long active1)
-{
+static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(0, active0, active1);
@@ -339,8 +335,7 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1)
    }
    return jjStartNfa_0(0, active0, active1);
 }
-static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
-{
+static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_0(0, old0, old1);
    try { curChar = input_stream.readChar(); }
@@ -393,8 +388,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
    }
    return jjStartNfa_0(1, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(1, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -468,8 +462,7 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0)
    }
    return jjStartNfa_0(2, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(2, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -512,8 +505,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0)
    }
    return jjStartNfa_0(3, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(3, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -556,8 +548,7 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0)
    }
    return jjStartNfa_0(4, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(4, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -590,8 +581,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0)
    }
    return jjStartNfa_0(5, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa7_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(5, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -614,8 +604,7 @@ static private int jjMoveStringLiteralDfa7_0(long old0, long active0)
    }
    return jjStartNfa_0(6, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa8_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa8_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(6, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -642,8 +631,7 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0)
    }
    return jjStartNfa_0(7, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa9_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa9_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(7, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -668,8 +656,7 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0)
    }
    return jjStartNfa_0(8, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa10_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa10_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(8, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -688,8 +675,7 @@ static private int jjMoveStringLiteralDfa10_0(long old0, long active0)
    }
    return jjStartNfa_0(9, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa11_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa11_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(9, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -706,8 +692,7 @@ static private int jjMoveStringLiteralDfa11_0(long old0, long active0)
    }
    return jjStartNfa_0(10, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa12_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa12_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(10, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -728,8 +713,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0)
    }
    return jjStartNfa_0(11, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa13_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa13_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(11, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -746,8 +730,7 @@ static private int jjMoveStringLiteralDfa13_0(long old0, long active0)
    }
    return jjStartNfa_0(12, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa14_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa14_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(12, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -764,8 +747,7 @@ static private int jjMoveStringLiteralDfa14_0(long old0, long active0)
    }
    return jjStartNfa_0(13, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa15_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa15_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(13, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -818,7 +800,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 78)
                         kind = 78;
-                     jjCheckNAdd(22);
+                     { jjCheckNAdd(22); }
                   }
                   else if (curChar == 39)
                   {
@@ -826,14 +808,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 77;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 76)
                         kind = 76;
-                     jjCheckNAddStates(0, 3);
+                     { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
                   {
@@ -841,16 +823,16 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;
                   }
                   else if (curChar == 35)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   else if (curChar == 46)
-                     jjCheckNAdd(11);
+                     { jjCheckNAdd(11); }
                   else if (curChar == 47)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
                      if (kind > 75)
                         kind = 75;
-                     jjCheckNAdd(8);
+                     { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
@@ -860,11 +842,11 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 1:
                   if (curChar == 47)
-                     jjCheckNAddStates(4, 6);
+                     { jjCheckNAddStates(4, 6); }
                   break;
                case 2:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     jjCheckNAddStates(4, 6);
+                     { jjCheckNAddStates(4, 6); }
                   break;
                case 3:
                   if ((0x2400L & l) != 0L && kind > 2)
@@ -887,14 +869,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  jjCheckNAdd(8);
+                  { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 75)
                      kind = 75;
-                  jjCheckNAdd(8);
+                  { jjCheckNAdd(8); }
                   break;
                case 9:
                   if (curChar == 48 && kind > 75)
@@ -902,33 +884,33 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 10:
                   if (curChar == 46)
-                     jjCheckNAdd(11);
+                     { jjCheckNAdd(11); }
                   break;
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 76)
                      kind = 76;
-                  jjCheckNAddTwoStates(11, 12);
+                  { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(14);
+                     { jjCheckNAdd(14); }
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 76)
                      kind = 76;
-                  jjCheckNAdd(14);
+                  { jjCheckNAdd(14); }
                   break;
                case 15:
                   if (curChar == 35)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 16:
                   if ((0xfffffff7ffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
                   if (curChar == 35 && kind > 79)
@@ -939,11 +921,11 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 76)
                      kind = 76;
-                  jjCheckNAddStates(0, 3);
+                  { jjCheckNAddStates(0, 3); }
                   break;
                case 20:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if (curChar == 39 && kind > 77)
@@ -954,7 +936,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 78)
                      kind = 78;
-                  jjCheckNAdd(22);
+                  { jjCheckNAdd(22); }
                   break;
                default : break;
             }
@@ -972,38 +954,38 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 78)
                         kind = 78;
-                     jjCheckNAdd(22);
+                     { jjCheckNAdd(22); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 78)
                      kind = 78;
-                  jjCheckNAddStates(7, 9);
+                  { jjCheckNAddStates(7, 9); }
                   break;
                case 2:
-                  jjAddStates(4, 6);
+                  { jjAddStates(4, 6); }
                   break;
                case 12:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(10, 11);
+                     { jjAddStates(10, 11); }
                   break;
                case 16:
-                  jjAddStates(12, 13);
+                  { jjAddStates(12, 13); }
                   break;
                case 20:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 22:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 78)
                      kind = 78;
-                  jjCheckNAdd(22);
+                  { jjCheckNAdd(22); }
                   break;
                default : break;
             }
@@ -1019,11 +1001,11 @@ static private int jjMoveNfa_0(int startState, int curPos)
             {
                case 2:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(4, 6);
+                     { jjAddStates(4, 6); }
                   break;
                case 16:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(12, 13);
+                     { jjAddStates(12, 13); }
                   break;
                default : break;
             }
@@ -1062,69 +1044,6 @@ public static final String[] jjstrLiteralImages = {
 "\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", "\133", "\135", "\173", 
 "\175", "\75", "\41\75", "\74", "\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", 
 "\47", "\74\55", "\77", "\42", null, null, null, null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-static final long[] jjtoToken = {
-   0xfffffffffffffff9L, 0xffffL, 
-};
-static final long[] jjtoSkip = {
-   0x6L, 0x0L, 
-};
-static final long[] jjtoSpecial = {
-   0x6L, 0x0L, 
-};
-static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[23];
-static private final int[] jjstateSet = new int[46];
-static protected char curChar;
-/** Constructor. */
-public Prism3To4TokenManager(SimpleCharStream stream){
-   if (input_stream != null)
-      throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
-   input_stream = stream;
-}
-
-/** Constructor. */
-public Prism3To4TokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-static private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 23; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-static public void SwitchTo(int lexState)
-{
-   if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
-
 static protected Token jjFillToken()
 {
    final Token t;
@@ -1173,6 +1092,7 @@ public static Token getNextToken()
    catch(java.io.IOException e)
    {
       jjmatchedKind = 0;
+      jjmatchedPos = -1;
       matchedToken = jjFillToken();
       matchedToken.specialToken = specialToken;
       return matchedToken;
@@ -1257,4 +1177,72 @@ static private void jjCheckNAddStates(int start, int end)
    } while (start++ != end);
 }
 
+    /** Constructor. */
+    public Prism3To4TokenManager(SimpleCharStream stream){
+
+      if (input_stream != null)
+        throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+
+    input_stream = stream;
+  }
+
+  /** Constructor. */
+  public Prism3To4TokenManager (SimpleCharStream stream, int lexState){
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream)
+  {
+    jjmatchedPos = jjnewStateCnt = 0;
+    curLexState = defaultLexState;
+    input_stream = stream;
+    ReInitRounds();
+  }
+
+  static private void ReInitRounds()
+  {
+    int i;
+    jjround = 0x80000001;
+    for (i = 23; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream, int lexState)
+  {
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Switch to specified lex state. */
+  static public void SwitchTo(int lexState)
+  {
+    if (lexState >= 1 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+    else
+      curLexState = lexState;
+  }
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+};
+static final long[] jjtoToken = {
+   0xfffffffffffffff9L, 0xffffL, 
+};
+static final long[] jjtoSkip = {
+   0x6L, 0x0L, 
+};
+static final long[] jjtoSpecial = {
+   0x6L, 0x0L, 
+};
+    static protected SimpleCharStream  input_stream;
+
+    static private final int[] jjrounds = new int[23];
+    static private final int[] jjstateSet = new int[2 * 23];
+
+    
+    static protected char curChar;
 }
diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 7c71e066..6f78f5a8 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -1,3 +1,4 @@
+/* PrismParser.java */
 /* Generated By:JavaCC: Do not edit this line. PrismParser.java */
 package parser;
 
@@ -322,7 +323,7 @@ public class PrismParser implements PrismParserConstants {
 	 */
         public int getTabSize()
         {
-                return SimpleCharStream.getTabSize(0);
+                return SimpleCharStream.getTabSize();
         }
 
         /**
@@ -369,8 +370,8 @@ public class PrismParser implements PrismParserConstants {
 //-----------------------------------------------------------------------------------
 
 // Modules file
-  static final public ModulesFile ModulesFile() throws ParseException, PrismLangException {
-        ModelType type = ModelType.MDP;
+  static final public 
+ModulesFile ModulesFile() throws ParseException, PrismLangException {ModelType type = ModelType.MDP;
         int typeCount = 0;
         Token typeDupe = null;
         Declaration global;
@@ -384,7 +385,7 @@ public class PrismParser implements PrismParserConstants {
         Token begin = null;
     label_1:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case CONST:
       case CTMC:
       case DTMC:
@@ -401,66 +402,76 @@ public class PrismParser implements PrismParserConstants {
       case RATE:
       case REWARDS:
       case STOCHASTIC:
-      case SYSTEM:
+      case SYSTEM:{
         ;
         break;
+        }
       default:
         jj_la1[0] = jj_gen;
         break label_1;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case CTMC:
       case DTMC:
       case MDP:
       case NONDETERMINISTIC:
       case PROBABILISTIC:
       case PTA:
-      case STOCHASTIC:
-            begin = getToken(1);
+      case STOCHASTIC:{
+begin = getToken(1);
         type = ModulesFileType();
-                                   typeCount++; if (typeCount == 2) typeDupe = getToken(0);
+typeCount++; if (typeCount == 2) typeDupe = getToken(0);
         break;
-      case FORMULA:
+        }
+      case FORMULA:{
         FormulaDef(mf.getFormulaList());
         break;
-      case LABEL:
+        }
+      case LABEL:{
         LabelDef(mf.getLabelList());
         break;
+        }
       case CONST:
       case PROB:
-      case RATE:
+      case RATE:{
         ConstantDef(mf.getConstantList());
         break;
-      case GLOBAL:
+        }
+      case GLOBAL:{
         // Global variable
                 global = GlobalDecl();
-                                mf.addGlobal(global);
+mf.addGlobal(global);
         break;
+        }
       default:
         jj_la1[1] = jj_gen;
         if (jj_2_1(2147483647)) {
           rm = RenamedModule();
-                                                                     mf.addRenamedModule(rm);
+mf.addRenamedModule(rm);
         } else {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case MODULE:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case MODULE:{
             // Module
                     m = Module();
-                       mf.addModule(m);
+mf.addModule(m);
             break;
-          case REWARDS:
+            }
+          case REWARDS:{
             // Reward structure
                     rs = RewardStruct();
-                              mf.addRewardStruct(rs);
+mf.addRewardStruct(rs);
             break;
-          case INIT:
+            }
+          case INIT:{
             // Initial states ("init...endinit" construct)
                     init = Init();
-                        mf.setInitialStates(init); initCount++; if (initCount == 2) initDupe = init;
+mf.setInitialStates(init); initCount++; if (initCount == 2) initDupe = init;
             break;
-          case SYSTEM:
+            }
+          case SYSTEM:{
             SystemEndsystem(mf);
             break;
+            }
           default:
             jj_la1[2] = jj_gen;
             jj_consume_token(-1);
@@ -470,7 +481,7 @@ public class PrismParser implements PrismParserConstants {
       }
     }
     jj_consume_token(0);
-                // Check for multiple instances of some items
+// Check for multiple instances of some items
                 if (typeDupe != null) {
                         ExpressionIdent tmp = new ExpressionIdent(typeDupe.image);
                         tmp.setPosition(typeDupe);
@@ -485,19 +496,19 @@ public class PrismParser implements PrismParserConstants {
 
                 // Return completed ModulesFile object
                 mf.setPosition(begin != null? begin: getToken(0), getToken(0));
-                {if (true) return mf;}
+                {if ("" != null) return mf;}
     throw new Error("Missing return statement in function");
   }
 
 // Properties file
-  static final public PropertiesFile PropertiesFile() throws ParseException, PrismLangException {
-        PropertiesFile pf = new PropertiesFile(modelInfo);
+  static final public 
+PropertiesFile PropertiesFile() throws ParseException, PrismLangException {PropertiesFile pf = new PropertiesFile(modelInfo);
         Property prop;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     label_2:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case CONST:
       case E:
@@ -525,14 +536,15 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         ;
         break;
+        }
       default:
         jj_la1[3] = jj_gen;
         break label_2;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case E:
       case FALSE:
@@ -556,30 +568,34 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         prop = Property();
-                                      pf.addProperty(prop);
+pf.addProperty(prop);
         label_3:
         while (true) {
           jj_consume_token(SEMICOLON);
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case SEMICOLON:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SEMICOLON:{
             ;
             break;
+            }
           default:
             jj_la1[4] = jj_gen;
             break label_3;
           }
         }
         break;
-      case LABEL:
+        }
+      case LABEL:{
         LabelDef(pf.getLabelList());
         break;
+        }
       case CONST:
       case PROB:
-      case RATE:
+      case RATE:{
         ConstantDef(pf.getConstantList());
         break;
+        }
       default:
         jj_la1[5] = jj_gen;
         jj_consume_token(-1);
@@ -587,19 +603,19 @@ public class PrismParser implements PrismParserConstants {
       }
     }
     jj_consume_token(0);
-          pf.setPosition(begin, getToken(0)); {if (true) return pf;}
+pf.setPosition(begin, getToken(0)); {if ("" != null) return pf;}
     throw new Error("Missing return statement in function");
   }
 
 // Properties file with optional semicolons - beware of potential ambiguities
-  static final public PropertiesFile PropertiesFileSemicolonless() throws ParseException, PrismLangException {
-        PropertiesFile pf = new PropertiesFile(modelInfo);
+  static final public 
+PropertiesFile PropertiesFileSemicolonless() throws ParseException, PrismLangException {PropertiesFile pf = new PropertiesFile(modelInfo);
         Property prop;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     label_4:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case CONST:
       case E:
@@ -627,14 +643,15 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         ;
         break;
+        }
       default:
         jj_la1[6] = jj_gen;
         break label_4;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case E:
       case FALSE:
@@ -658,30 +675,34 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         prop = Property();
         label_5:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case SEMICOLON:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SEMICOLON:{
             ;
             break;
+            }
           default:
             jj_la1[7] = jj_gen;
             break label_5;
           }
           jj_consume_token(SEMICOLON);
         }
-                                                     pf.addProperty(prop);
+pf.addProperty(prop);
         break;
-      case LABEL:
+        }
+      case LABEL:{
         LabelDef(pf.getLabelList());
         break;
+        }
       case CONST:
       case PROB:
-      case RATE:
+      case RATE:{
         ConstantDef(pf.getConstantList());
         break;
+        }
       default:
         jj_la1[8] = jj_gen;
         jj_consume_token(-1);
@@ -689,17 +710,17 @@ public class PrismParser implements PrismParserConstants {
       }
     }
     jj_consume_token(0);
-          pf.setPosition(begin, getToken(0)); {if (true) return pf;}
+pf.setPosition(begin, getToken(0)); {if ("" != null) return pf;}
     throw new Error("Missing return statement in function");
   }
 
 // Property - expression, with optional name/comment
-  static final public Property Property() throws ParseException {
-        String name = null;
+  static final public 
+Property Property() throws ParseException {String name = null;
         Expression expr;
         Property prop;
         Token begin = null;
-            begin = getToken(1);
+begin = getToken(1);
     if (jj_2_2(2147483647)) {
       jj_consume_token(DQUOTE);
       name = Identifier();
@@ -709,26 +730,26 @@ public class PrismParser implements PrismParserConstants {
       ;
     }
     expr = ExpressionITE(true, false);
-          prop = new Property(expr, name, getPrecedingCommentBlock(begin));
-          prop.setPosition(begin, getToken(0)); {if (true) return prop;}
+prop = new Property(expr, name, getPrecedingCommentBlock(begin));
+prop.setPosition(begin, getToken(0)); {if ("" != null) return prop;}
     throw new Error("Missing return statement in function");
   }
 
 // A single expression
-  static final public Expression SingleExpression() throws ParseException {
-        Expression ret;
+  static final public 
+Expression SingleExpression() throws ParseException {Expression ret;
     ret = Expression(false, false);
     jj_consume_token(0);
-                                                   {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // A single LTL formula
-  static final public Expression SingleLTLFormula() throws ParseException {
-        Expression ret;
+  static final public 
+Expression SingleLTLFormula() throws ParseException {Expression ret;
     ret = Expression(true, true);
     jj_consume_token(0);
-                                                 {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -737,85 +758,95 @@ public class PrismParser implements PrismParserConstants {
 //-----------------------------------------------------------------------------------
 
 // Keyword denoting model type
-  static final public ModelType ModulesFileType() throws ParseException {
-        ModelType modelType = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+  static final public 
+ModelType ModulesFileType() throws ParseException {ModelType modelType = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case DTMC:
-    case PROBABILISTIC:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DTMC:
+    case PROBABILISTIC:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DTMC:{
         jj_consume_token(DTMC);
         break;
-      case PROBABILISTIC:
+        }
+      case PROBABILISTIC:{
         jj_consume_token(PROBABILISTIC);
         break;
+        }
       default:
         jj_la1[9] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-                                     modelType=ModelType.DTMC;
+modelType=ModelType.DTMC;
       break;
+      }
     case MDP:
-    case NONDETERMINISTIC:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case MDP:
+    case NONDETERMINISTIC:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case MDP:{
         jj_consume_token(MDP);
         break;
-      case NONDETERMINISTIC:
+        }
+      case NONDETERMINISTIC:{
         jj_consume_token(NONDETERMINISTIC);
         break;
+        }
       default:
         jj_la1[10] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-                                       modelType=ModelType.MDP;
+modelType=ModelType.MDP;
       break;
+      }
     case CTMC:
-    case STOCHASTIC:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case CTMC:
+    case STOCHASTIC:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CTMC:{
         jj_consume_token(CTMC);
         break;
-      case STOCHASTIC:
+        }
+      case STOCHASTIC:{
         jj_consume_token(STOCHASTIC);
         break;
+        }
       default:
         jj_la1[11] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-                                  modelType=ModelType.CTMC;
+modelType=ModelType.CTMC;
       break;
-    case PTA:
+      }
+    case PTA:{
       jj_consume_token(PTA);
-                  modelType=ModelType.PTA;
+modelType=ModelType.PTA;
       break;
+      }
     default:
       jj_la1[12] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return modelType;}
+{if ("" != null) return modelType;}
     throw new Error("Missing return statement in function");
   }
 
 // Formula definition
-  static final public void FormulaDef(FormulaList formulaList) throws ParseException {
-        ExpressionIdent name = null;
+  static final public 
+void FormulaDef(FormulaList formulaList) throws ParseException {ExpressionIdent name = null;
         Expression expr = null;
     jj_consume_token(FORMULA);
     name = IdentifierExpression();
     jj_consume_token(EQ);
     expr = Expression(false, false);
     jj_consume_token(SEMICOLON);
-          formulaList.addFormula(name, expr);
+formulaList.addFormula(name, expr);
   }
 
 // Label definition
-  static final public void LabelDef(LabelList labelList) throws ParseException, PrismLangException {
-        ExpressionIdent name = null;
+  static final public 
+void LabelDef(LabelList labelList) throws ParseException, PrismLangException {ExpressionIdent name = null;
         Expression expr = null;
     if (jj_2_3(2147483647)) {
       jj_consume_token(LABEL);
@@ -825,11 +856,11 @@ public class PrismParser implements PrismParserConstants {
       jj_consume_token(EQ);
       expr = Expression(false, false);
       jj_consume_token(SEMICOLON);
-          labelList.addLabel(name, expr);
+labelList.addLabel(name, expr);
     } else if (jj_2_4(2147483647)) {
       jj_consume_token(LABEL);
       name = IdentifierExpression();
-                                                                         {if (true) throw new PrismLangException("Label names must be enclosed in double-quotes", name);}
+{if (true) throw new PrismLangException("Label names must be enclosed in double-quotes", name);}
     } else {
       jj_consume_token(-1);
       throw new ParseException();
@@ -837,57 +868,65 @@ public class PrismParser implements PrismParserConstants {
   }
 
 // Constant definition
-  static final public void ConstantDef(ConstantList constantList) throws ParseException {
-        Type type = TypeInt.getInstance();
+  static final public 
+void ConstantDef(ConstantList constantList) throws ParseException {Type type = TypeInt.getInstance();
         ExpressionIdent name = null;
         Expression expr = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case CONST:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case CONST:{
       jj_consume_token(CONST);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BOOL:
       case DOUBLE:
-      case INT:
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case INT:
+      case INT:{
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case INT:{
           jj_consume_token(INT);
-                             type=TypeInt.getInstance();
+type=TypeInt.getInstance();
           break;
-        case DOUBLE:
+          }
+        case DOUBLE:{
           jj_consume_token(DOUBLE);
-                                                                        type=TypeDouble.getInstance();
+type=TypeDouble.getInstance();
           break;
-        case BOOL:
+          }
+        case BOOL:{
           jj_consume_token(BOOL);
-                                                                                                                    type=TypeBool.getInstance();
+type=TypeBool.getInstance();
           break;
+          }
         default:
           jj_la1[13] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
+        }
       default:
         jj_la1[14] = jj_gen;
         ;
       }
       break;
+      }
     case PROB:
-    case RATE:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case RATE:
+    case RATE:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case RATE:{
         jj_consume_token(RATE);
         break;
-      case PROB:
+        }
+      case PROB:{
         jj_consume_token(PROB);
         break;
+        }
       default:
         jj_la1[15] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-                               type=TypeDouble.getInstance();
+type=TypeDouble.getInstance();
       break;
+      }
     default:
       jj_la1[16] = jj_gen;
       jj_consume_token(-1);
@@ -895,94 +934,100 @@ public class PrismParser implements PrismParserConstants {
     }
     // Name and (optional) initial value
             name = IdentifierExpression();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case EQ:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case EQ:{
       jj_consume_token(EQ);
       expr = Expression(false, false);
       break;
+      }
     default:
       jj_la1[17] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
-          constantList.addConstant(name, expr, type);
+constantList.addConstant(name, expr, type);
   }
 
 // Global variable declaration
-  static final public Declaration GlobalDecl() throws ParseException {
-        Declaration decl = null;
+  static final public 
+Declaration GlobalDecl() throws ParseException {Declaration decl = null;
     jj_consume_token(GLOBAL);
     decl = Declaration();
-          {if (true) return decl;}
+{if ("" != null) return decl;}
     throw new Error("Missing return statement in function");
   }
 
 // Variable declaration
-  static final public Declaration Declaration() throws ParseException {
-        Declaration decl;
+  static final public 
+Declaration Declaration() throws ParseException {Declaration decl;
         String name = null;
         DeclarationType declType;
         Expression init = null;
         Token begin = null;
-            begin = getToken(1);
+begin = getToken(1);
     name = Identifier();
     jj_consume_token(COLON);
     declType = DeclarationVarType();
-                  decl = new Declaration(name, declType);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INIT:
+decl = new Declaration(name, declType);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INIT:{
       jj_consume_token(INIT);
       init = Expression(false, false);
-          decl.setStart(init);
+decl.setStart(init);
       break;
+      }
     default:
       jj_la1[18] = jj_gen;
       ;
     }
     jj_consume_token(SEMICOLON);
-          decl.setPosition(begin, getToken(0)); {if (true) return decl;}
+decl.setPosition(begin, getToken(0)); {if ("" != null) return decl;}
     throw new Error("Missing return statement in function");
   }
 
 // Type part of a declaration
-  static final public DeclarationType DeclarationVarType() throws ParseException {
-        Expression low = null, high = null;
+  static final public 
+DeclarationType DeclarationVarType() throws ParseException {Expression low = null, high = null;
         DeclarationType declType, subtype;
         Token begin = null;
-            begin = getToken(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LBRACKET:
+begin = getToken(1);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACKET:{
       jj_consume_token(LBRACKET);
       low = Expression(false, false);
       jj_consume_token(DOTS);
       high = Expression(false, false);
       jj_consume_token(RBRACKET);
-                  declType = new DeclarationInt(low, high);
+declType = new DeclarationInt(low, high);
       break;
-    case INT:
+      }
+    case INT:{
       jj_consume_token(INT);
-                    declType = new DeclarationIntUnbounded();
+declType = new DeclarationIntUnbounded();
       break;
-    case BOOL:
+      }
+    case BOOL:{
       jj_consume_token(BOOL);
-                     declType = new DeclarationBool();
+declType = new DeclarationBool();
       break;
-    case CLOCK:
+      }
+    case CLOCK:{
       jj_consume_token(CLOCK);
-                      declType = new DeclarationClock();
+declType = new DeclarationClock();
       break;
+      }
     default:
       jj_la1[19] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          declType.setPosition(begin, getToken(0)); {if (true) return declType;}
+declType.setPosition(begin, getToken(0)); {if ("" != null) return declType;}
     throw new Error("Missing return statement in function");
   }
 
 // Module
-  static final public Module Module() throws ParseException {
-        ExpressionIdent name = null;
+  static final public 
+Module Module() throws ParseException {ExpressionIdent name = null;
         Declaration var = null;
         Expression invar;
         Command comm = null;
@@ -990,63 +1035,67 @@ public class PrismParser implements PrismParserConstants {
         Token begin = null;
     begin = jj_consume_token(MODULE);
     name = IdentifierExpression();
-                                                         module = new Module(name.getName());
+module = new Module(name.getName());
     label_6:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case REG_IDENT:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case REG_IDENT:{
         ;
         break;
+        }
       default:
         jj_la1[20] = jj_gen;
         break label_6;
       }
       var = Declaration();
-                                module.addDeclaration(var);
+module.addDeclaration(var);
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INVARIANT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INVARIANT:{
       jj_consume_token(INVARIANT);
       invar = Expression(false, false);
       jj_consume_token(ENDINVARIANT);
-                                                                        module.setInvariant(invar);
+module.setInvariant(invar);
       break;
+      }
     default:
       jj_la1[21] = jj_gen;
       ;
     }
     label_7:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACKET:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:{
         ;
         break;
+        }
       default:
         jj_la1[22] = jj_gen;
         break label_7;
       }
       comm = Command();
-                             module.addCommand(comm);
+module.addCommand(comm);
     }
     jj_consume_token(ENDMODULE);
-          module.setPosition(begin, getToken(0)); module.setNameASTElement(name); {if (true) return module;}
+module.setPosition(begin, getToken(0)); module.setNameASTElement(name); {if ("" != null) return module;}
     throw new Error("Missing return statement in function");
   }
 
 // Command
-  static final public Command Command() throws ParseException {
-        String synch = null;
+  static final public 
+Command Command() throws ParseException {String synch = null;
         Expression guard = null;
         Updates updates = null;
         Command comm = new Command();
         Token begin = null;
     // Synchronisation action-label
             begin = jj_consume_token(LBRACKET);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       synch = Identifier();
-                                                    comm.setSynch(synch);
+comm.setSynch(synch);
       break;
+      }
     default:
       jj_la1[23] = jj_gen;
       ;
@@ -1054,27 +1103,27 @@ public class PrismParser implements PrismParserConstants {
     jj_consume_token(RBRACKET);
     // Guard/updates
             guard = Expression(false, false);
-                                           comm.setGuard(guard);
+comm.setGuard(guard);
     jj_consume_token(RARROW);
     updates = Updates();
-                                                                                                  comm.setUpdates(updates);
+comm.setUpdates(updates);
     jj_consume_token(SEMICOLON);
-          comm.setPosition(begin, getToken(0)); {if (true) return comm;}
+comm.setPosition(begin, getToken(0)); {if ("" != null) return comm;}
     throw new Error("Missing return statement in function");
   }
 
 // Updates
-  static final public Updates Updates() throws ParseException {
-        Expression prob;
+  static final public 
+Updates Updates() throws ParseException {Expression prob;
         Update update;
         Updates updates = new Updates();
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     if (jj_2_5(2147483647)) {
       update = Update();
-                  updates.addUpdate(null, update);
+updates.addUpdate(null, update);
     } else {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case E:
       case FALSE:
@@ -1101,17 +1150,18 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         prob = Expression(false, false);
         jj_consume_token(COLON);
         update = Update();
-                                                                              updates.addUpdate(prob, update);
+updates.addUpdate(prob, update);
         label_8:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case PLUS:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PLUS:{
             ;
             break;
+            }
           default:
             jj_la1[24] = jj_gen;
             break label_8;
@@ -1120,32 +1170,33 @@ public class PrismParser implements PrismParserConstants {
           prob = Expression(false, false);
           jj_consume_token(COLON);
           update = Update();
-                                                                                     updates.addUpdate(prob, update);
+updates.addUpdate(prob, update);
         }
         break;
+        }
       default:
         jj_la1[25] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
-          updates.setPosition(begin, getToken(0)); {if (true) return updates;}
+updates.setPosition(begin, getToken(0)); {if ("" != null) return updates;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public Update Update() throws ParseException {
-        Update update = new Update();
+  static final public Update Update() throws ParseException {Update update = new Update();
         Token begin = null;
-          begin = getToken(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LPARENTH:
+begin = getToken(1);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPARENTH:{
       UpdateElement(update);
       label_9:
       while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case AND:
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AND:{
           ;
           break;
+          }
         default:
           jj_la1[26] = jj_gen;
           break label_9;
@@ -1154,47 +1205,49 @@ public class PrismParser implements PrismParserConstants {
         UpdateElement(update);
       }
       break;
-    case TRUE:
+      }
+    case TRUE:{
       jj_consume_token(TRUE);
       break;
+      }
     default:
       jj_la1[27] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          update.setPosition(begin, getToken(0)); {if (true) return update;}
+update.setPosition(begin, getToken(0)); {if ("" != null) return update;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void UpdateElement(Update update) throws ParseException {
-        ExpressionIdent var = null;
+  static final public void UpdateElement(Update update) throws ParseException {ExpressionIdent var = null;
         Expression expr = null;
     jj_consume_token(LPARENTH);
     var = IdentifierPrime();
     jj_consume_token(EQ);
     expr = Expression(false, false);
     jj_consume_token(RPARENTH);
-                                                                                             update.addElement(var, expr);
+update.addElement(var, expr);
   }
 
 // Module renaming
-  static final public RenamedModule RenamedModule() throws ParseException {
-        ExpressionIdent name = null, base = null;
+  static final public 
+RenamedModule RenamedModule() throws ParseException {ExpressionIdent name = null, base = null;
         RenamedModule rm = null;
         Token begin = null;
     begin = jj_consume_token(MODULE);
     name = IdentifierExpression();
     jj_consume_token(EQ);
     base = IdentifierExpression();
-                                                                                            rm = new RenamedModule(name.getName(), base.getName());
+rm = new RenamedModule(name.getName(), base.getName());
     jj_consume_token(LBRACKET);
     Rename(rm);
     label_10:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case COMMA:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
         ;
         break;
+        }
       default:
         jj_la1[28] = jj_gen;
         break label_10;
@@ -1204,22 +1257,21 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(RBRACKET);
     jj_consume_token(ENDMODULE);
-          rm.setPosition(begin, getToken(0)); rm.setNameASTElement(name); rm.setBaseModuleASTElement(base); {if (true) return rm;}
+rm.setPosition(begin, getToken(0)); rm.setNameASTElement(name); rm.setBaseModuleASTElement(base); {if ("" != null) return rm;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void Rename(RenamedModule rm) throws ParseException {
-        ExpressionIdent id1 = null, id2 = null;
+  static final public void Rename(RenamedModule rm) throws ParseException {ExpressionIdent id1 = null, id2 = null;
     // NB: have to explicitly include keywords for functions because they can be renamed
             id1 = IdentifierExpressionMinMax();
     jj_consume_token(EQ);
     id2 = IdentifierExpressionMinMax();
-                rm.addRename(id1.getName(), id2.getName(), id1, id2);
+rm.addRename(id1.getName(), id2.getName(), id1, id2);
   }
 
 // Reward structure
-  static final public RewardStruct RewardStruct() throws ParseException {
-        String name = null, s = null;
+  static final public 
+RewardStruct RewardStruct() throws ParseException {String name = null, s = null;
         Expression guard = null, value = null;
         RewardStruct rs = new RewardStruct();
         RewardStructItem rsi;
@@ -1229,13 +1281,13 @@ public class PrismParser implements PrismParserConstants {
       jj_consume_token(DQUOTE);
       name = Identifier();
       jj_consume_token(DQUOTE);
-                                                                      rs.setName(name);
+rs.setName(name);
     } else {
       ;
     }
     label_11:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case E:
       case FALSE:
@@ -1263,28 +1315,31 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         ;
         break;
+        }
       default:
         jj_la1[29] = jj_gen;
         break label_11;
       }
-            begin2 = getToken(1); s = null;
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACKET:
+begin2 = getToken(1); s = null;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:{
         jj_consume_token(LBRACKET);
-                                                             s = "";
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case REG_IDENT:
+s = "";
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case REG_IDENT:{
           s = Identifier();
           break;
+          }
         default:
           jj_la1[30] = jj_gen;
           ;
         }
         jj_consume_token(RBRACKET);
         break;
+        }
       default:
         jj_la1[31] = jj_gen;
         ;
@@ -1293,26 +1348,26 @@ public class PrismParser implements PrismParserConstants {
       jj_consume_token(COLON);
       value = Expression(false, false);
       jj_consume_token(SEMICOLON);
-          rsi = new RewardStructItem(s, guard, value); rsi.setPosition(begin2, getToken(0)); rs.addItem(rsi);
+rsi = new RewardStructItem(s, guard, value); rsi.setPosition(begin2, getToken(0)); rs.addItem(rsi);
     }
     jj_consume_token(ENDREWARDS);
-          rs.setPosition(begin, getToken(0)); {if (true) return rs;}
+rs.setPosition(begin, getToken(0)); {if ("" != null) return rs;}
     throw new Error("Missing return statement in function");
   }
 
 // Initial states ("init...endinit" construct)
-  static final public Expression Init() throws ParseException {
-        Expression expr = null;
+  static final public 
+Expression Init() throws ParseException {Expression expr = null;
     jj_consume_token(INIT);
     expr = Expression(false, false);
     jj_consume_token(ENDINIT);
-                                                           {if (true) return expr;}
+{if ("" != null) return expr;}
     throw new Error("Missing return statement in function");
   }
 
 // System definition ("system...endsystem" construct)
-  static final public void SystemEndsystem(ModulesFile mf) throws ParseException {
-        String name = null;
+  static final public 
+void SystemEndsystem(ModulesFile mf) throws ParseException {String name = null;
         SystemDefn sysdef;
     jj_consume_token(SYSTEM);
     if (jj_2_7(2147483647)) {
@@ -1324,25 +1379,25 @@ public class PrismParser implements PrismParserConstants {
     }
     sysdef = SystemDefn();
     jj_consume_token(ENDSYSTEM);
-                mf.addSystemDefn(sysdef, name);
+mf.addSystemDefn(sysdef, name);
   }
 
 // System definition component
-  static final public SystemDefn SystemDefn() throws ParseException {
-        SystemDefn ret;
+  static final public 
+SystemDefn SystemDefn() throws ParseException {SystemDefn ret;
     ret = SystemFullParallel();
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // System definition component (full parallel)
-  static final public SystemDefn SystemFullParallel() throws ParseException {
-        SystemDefn sys1 = null, sys2 = null;
+  static final public 
+SystemDefn SystemFullParallel() throws ParseException {SystemDefn sys1 = null, sys2 = null;
         SystemFullParallel par = null;
         Token begin;
-          begin = getToken(1);
+begin = getToken(1);
     sys1 = SystemInterleaved();
-            par = new SystemFullParallel(); par.addOperand(sys1);
+par = new SystemFullParallel(); par.addOperand(sys1);
     label_12:
     while (true) {
       if (jj_2_8(2147483647)) {
@@ -1353,26 +1408,26 @@ public class PrismParser implements PrismParserConstants {
       jj_consume_token(OR);
       jj_consume_token(OR);
       sys2 = SystemParallel();
-                                                                                                                               par.addOperand(sys2);
+par.addOperand(sys2);
     }
-                if (par==null || par.getNumOperands() == 1) {
-                        {if (true) return sys1;}
+if (par==null || par.getNumOperands() == 1) {
+                        {if ("" != null) return sys1;}
                 }
                 else {
                         par.setPosition(begin, getToken(0));
-                        {if (true) return par;}
+                        {if ("" != null) return par;}
                 }
     throw new Error("Missing return statement in function");
   }
 
 // System definition component (interleaved parallel)
-  static final public SystemDefn SystemInterleaved() throws ParseException {
-        SystemDefn sys1 = null, sys2 = null;
+  static final public 
+SystemDefn SystemInterleaved() throws ParseException {SystemDefn sys1 = null, sys2 = null;
         SystemInterleaved par = null;
         Token begin;
-          begin = getToken(1);
+begin = getToken(1);
     sys1 = SystemParallel();
-            par = new SystemInterleaved(); par.addOperand(sys1);
+par = new SystemInterleaved(); par.addOperand(sys1);
     label_13:
     while (true) {
       if (jj_2_9(2147483647)) {
@@ -1384,120 +1439,125 @@ public class PrismParser implements PrismParserConstants {
       jj_consume_token(OR);
       jj_consume_token(OR);
       sys2 = SystemFullParallel();
-                                                                                                                                             par.addOperand(sys2);
+par.addOperand(sys2);
     }
-                if (par==null || par.getNumOperands() == 1) {
-                        {if (true) return sys1;}
+if (par==null || par.getNumOperands() == 1) {
+                        {if ("" != null) return sys1;}
                 }
                 else {
                         par.setPosition(begin, getToken(0));
-                        {if (true) return par;}
+                        {if ("" != null) return par;}
                 }
     throw new Error("Missing return statement in function");
   }
 
 // System definition component (parallel over set of actions)
-  static final public SystemDefn SystemParallel() throws ParseException {
-        SystemDefn sys1 = null, sys2 = null;
+  static final public 
+SystemDefn SystemParallel() throws ParseException {SystemDefn sys1 = null, sys2 = null;
         SystemParallel par = null;
         String s;
         Token begin;
-          begin = getToken(1);
+begin = getToken(1);
     sys1 = SystemHideRename();
     if (jj_2_10(2147483647)) {
-                                       par = new SystemParallel(); par.setOperand1(sys1);
+par = new SystemParallel(); par.setOperand1(sys1);
       jj_consume_token(OR);
       jj_consume_token(LBRACKET);
       s = Identifier();
-                                          par.addAction(s);
+par.addAction(s);
       label_14:
       while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case COMMA:
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
           ;
           break;
+          }
         default:
           jj_la1[32] = jj_gen;
           break label_14;
         }
         jj_consume_token(COMMA);
         s = Identifier();
-                                                                                           par.addAction(s);
+par.addAction(s);
       }
       jj_consume_token(RBRACKET);
       jj_consume_token(OR);
       sys2 = SystemHideRename();
-                                           par.setOperand2(sys2);
+par.setOperand2(sys2);
     } else {
       ;
     }
-                if (par==null) {
-                        {if (true) return sys1;}
+if (par==null) {
+                        {if ("" != null) return sys1;}
                 }
                 else {
                         par.setPosition(begin, getToken(0));
-                        {if (true) return par;}
+                        {if ("" != null) return par;}
                 }
     throw new Error("Missing return statement in function");
   }
 
 // System definition component (hiding and renaming)
-  static final public SystemDefn SystemHideRename() throws ParseException {
-        SystemDefn sys = null;
+  static final public 
+SystemDefn SystemHideRename() throws ParseException {SystemDefn sys = null;
         SystemHide hide = null;
         SystemRename rename = null;
         String s1 = null, s2 = null;
         Token begin;
-          begin = getToken(1);
+begin = getToken(1);
     sys = SystemAtomic();
     label_15:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACE:
-      case DIVIDE:
+      case DIVIDE:{
         ;
         break;
+        }
       default:
         jj_la1[33] = jj_gen;
         break label_15;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DIVIDE:
-                  hide = new SystemHide(sys);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DIVIDE:{
+hide = new SystemHide(sys);
         jj_consume_token(DIVIDE);
         jj_consume_token(LBRACE);
         s1 = Identifier();
-                                                        hide.addAction(s1);
+hide.addAction(s1);
         label_16:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case COMMA:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
             ;
             break;
+            }
           default:
             jj_la1[34] = jj_gen;
             break label_16;
           }
           jj_consume_token(COMMA);
           s1 = Identifier();
-                                                                                                            hide.addAction(s1);
+hide.addAction(s1);
         }
         jj_consume_token(RBRACE);
-                  sys = hide;
+sys = hide;
         break;
-      case LBRACE:
-                  rename = new SystemRename(sys);
+        }
+      case LBRACE:{
+rename = new SystemRename(sys);
         jj_consume_token(LBRACE);
         s1 = Identifier();
         jj_consume_token(RENAME);
         s2 = Identifier();
-                                                                        rename.addRename(s1, s2);
+rename.addRename(s1, s2);
         label_17:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case COMMA:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
             ;
             break;
+            }
           default:
             jj_la1[35] = jj_gen;
             break label_17;
@@ -1506,50 +1566,54 @@ public class PrismParser implements PrismParserConstants {
           s1 = Identifier();
           jj_consume_token(RENAME);
           s2 = Identifier();
-                                                                         rename.addRename(s1, s2);
+rename.addRename(s1, s2);
         }
         jj_consume_token(RBRACE);
-                  sys = rename;
+sys = rename;
         break;
+        }
       default:
         jj_la1[36] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
-          sys.setPosition(begin, getToken(0)); {if (true) return sys;}
+sys.setPosition(begin, getToken(0)); {if ("" != null) return sys;}
     throw new Error("Missing return statement in function");
   }
 
 // System definition component (bottom level)
-  static final public SystemDefn SystemAtomic() throws ParseException {
-        String name = null;
+  static final public 
+SystemDefn SystemAtomic() throws ParseException {String name = null;
         SystemDefn sys = null;
         Token begin;
-          begin = getToken(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+begin = getToken(1);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       name = Identifier();
-                                sys = new SystemModule(name);
+sys = new SystemModule(name);
       break;
-    case DQUOTE:
+      }
+    case DQUOTE:{
       jj_consume_token(DQUOTE);
       name = Identifier();
       jj_consume_token(DQUOTE);
-                                                   sys = new SystemReference(name);
+sys = new SystemReference(name);
       break;
-    case LPARENTH:
+      }
+    case LPARENTH:{
       jj_consume_token(LPARENTH);
       sys = SystemDefn();
       jj_consume_token(RPARENTH);
-                                                      sys = new SystemBrackets(sys);
+sys = new SystemBrackets(sys);
       break;
+      }
     default:
       jj_la1[37] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          sys.setPosition(begin, getToken(0)); {if (true) return sys;}
+sys.setPosition(begin, getToken(0)); {if ("" != null) return sys;}
     throw new Error("Missing return statement in function");
   }
 
@@ -1562,10 +1626,10 @@ public class PrismParser implements PrismParserConstants {
 //-----------------------------------------------------------------------------------
 
 // Expression
-  static final public Expression Expression(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret;
+  static final public 
+Expression Expression(boolean prop, boolean pathprop) throws ParseException {Expression ret;
     ret = ExpressionTemporalBinary(prop, pathprop);
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -1587,104 +1651,113 @@ public class PrismParser implements PrismParserConstants {
 // In fact, JavaCC also warns about lookahead for this function.
 // This is because (like unary minus), R can appear on the left of a unary
 // operator (reward R operator) or in the middle of a binary operator (release).
-  static final public Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         ExpressionTemporal exprTemp;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionTemporalUnary(prop, pathprop);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case R:
     case U:
-    case W:
-                  if (!pathprop) {if (true) throw generateParseException();}
-                  exprTemp = new ExpressionTemporal(); exprTemp.setOperand1(ret);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case U:
+    case W:{
+if (!pathprop) {if (true) throw generateParseException();}
+exprTemp = new ExpressionTemporal(); exprTemp.setOperand1(ret);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case U:{
         jj_consume_token(U);
-                        exprTemp.setOperator(ExpressionTemporal.P_U);
+exprTemp.setOperator(ExpressionTemporal.P_U);
         break;
-      case W:
+        }
+      case W:{
         jj_consume_token(W);
-                        exprTemp.setOperator(ExpressionTemporal.P_W);
+exprTemp.setOperator(ExpressionTemporal.P_W);
         break;
-      case R:
+        }
+      case R:{
         jj_consume_token(R);
-                        exprTemp.setOperator(ExpressionTemporal.P_R);
+exprTemp.setOperator(ExpressionTemporal.P_R);
         break;
+        }
       default:
         jj_la1[38] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACKET:
       case EQ:
       case LT:
       case GT:
       case LE:
-      case GE:
+      case GE:{
         TimeBound(exprTemp);
         break;
+        }
       default:
         jj_la1[39] = jj_gen;
         ;
       }
       expr = ExpressionTemporalUnary(prop, pathprop);
-                  exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
+exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
       break;
+      }
     default:
       jj_la1[40] = jj_gen;
       ;
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public Expression ExpressionTemporalUnary(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public Expression ExpressionTemporalUnary(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         ExpressionTemporal exprTemp;
         Token begin = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case F:
     case G:
-    case X:
-                  if (!pathprop) {if (true) throw generateParseException();}
-                  begin = getToken(1); exprTemp = new ExpressionTemporal();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case X:
+    case X:{
+if (!pathprop) {if (true) throw generateParseException();}
+begin = getToken(1); exprTemp = new ExpressionTemporal();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case X:{
         jj_consume_token(X);
-                        exprTemp.setOperator(ExpressionTemporal.P_X);
+exprTemp.setOperator(ExpressionTemporal.P_X);
         break;
-      case F:
+        }
+      case F:{
         jj_consume_token(F);
-                        exprTemp.setOperator(ExpressionTemporal.P_F);
+exprTemp.setOperator(ExpressionTemporal.P_F);
         break;
-      case G:
+        }
+      case G:{
         jj_consume_token(G);
-                        exprTemp.setOperator(ExpressionTemporal.P_G);
+exprTemp.setOperator(ExpressionTemporal.P_G);
         break;
+        }
       default:
         jj_la1[41] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LBRACKET:
       case EQ:
       case LT:
       case GT:
       case LE:
-      case GE:
+      case GE:{
         TimeBound(exprTemp);
         break;
+        }
       default:
         jj_la1[42] = jj_gen;
         ;
       }
       expr = ExpressionTemporalUnary(prop, pathprop);
-                  exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
+exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = exprTemp;
       break;
+      }
     case A:
     case E:
     case FALSE:
@@ -1708,29 +1781,30 @@ public class PrismParser implements PrismParserConstants {
     case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:
+    case REG_IDENT:{
       ret = ExpressionITE(prop, pathprop);
       break;
+      }
     default:
       jj_la1[43] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Time bound for temporal operators
 // (see ExpressionTemporal production for lookahead explanation)
-  static final public void TimeBound(ExpressionTemporal exprTemp) throws ParseException {
-        Expression lBound, uBound;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LE:
+  static final public 
+void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lBound, uBound;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LE:{
       jj_consume_token(LE);
       if (jj_2_11(2147483647)) {
         uBound = IdentifierExpression();
       } else {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
         case E:
         case FALSE:
@@ -1757,23 +1831,25 @@ public class PrismParser implements PrismParserConstants {
         case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:
+        case REG_IDENT:{
           uBound = Expression(false, false);
           break;
+          }
         default:
           jj_la1[44] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
       }
-                                                                                                                                        exprTemp.setUpperBound(uBound, false);
+exprTemp.setUpperBound(uBound, false);
       break;
-    case LT:
+      }
+    case LT:{
       jj_consume_token(LT);
       if (jj_2_12(2147483647)) {
         uBound = IdentifierExpression();
       } else {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
         case E:
         case FALSE:
@@ -1800,23 +1876,25 @@ public class PrismParser implements PrismParserConstants {
         case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:
+        case REG_IDENT:{
           uBound = Expression(false, false);
           break;
+          }
         default:
           jj_la1[45] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
       }
-                                                                                                                                        exprTemp.setUpperBound(uBound, true);
+exprTemp.setUpperBound(uBound, true);
       break;
-    case GE:
+      }
+    case GE:{
       jj_consume_token(GE);
       if (jj_2_13(2147483647)) {
         lBound = IdentifierExpression();
       } else {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
         case E:
         case FALSE:
@@ -1843,23 +1921,25 @@ public class PrismParser implements PrismParserConstants {
         case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:
+        case REG_IDENT:{
           lBound = Expression(false, false);
           break;
+          }
         default:
           jj_la1[46] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
       }
-                                                                                                                                        exprTemp.setLowerBound(lBound, false);
+exprTemp.setLowerBound(lBound, false);
       break;
-    case GT:
+      }
+    case GT:{
       jj_consume_token(GT);
       if (jj_2_14(2147483647)) {
         lBound = IdentifierExpression();
       } else {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
         case E:
         case FALSE:
@@ -1886,30 +1966,34 @@ public class PrismParser implements PrismParserConstants {
         case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:
+        case REG_IDENT:{
           lBound = Expression(false, false);
           break;
+          }
         default:
           jj_la1[47] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
       }
-                                                                                                                                        exprTemp.setLowerBound(lBound, true);
+exprTemp.setLowerBound(lBound, true);
       break;
-    case LBRACKET:
+      }
+    case LBRACKET:{
       jj_consume_token(LBRACKET);
       lBound = Expression(false, false);
       jj_consume_token(COMMA);
       uBound = Expression(false, false);
       jj_consume_token(RBRACKET);
-                                                                                                                exprTemp.setLowerBound(lBound, false); exprTemp.setUpperBound(uBound, false);
+exprTemp.setLowerBound(lBound, false); exprTemp.setUpperBound(uBound, false);
       break;
-    case EQ:
+      }
+    case EQ:{
       jj_consume_token(EQ);
       lBound = Expression(false, false);
-                                                     exprTemp.setEqualBounds(lBound);
+exprTemp.setEqualBounds(lBound);
       break;
+      }
     default:
       jj_la1[48] = jj_gen;
       jj_consume_token(-1);
@@ -1918,133 +2002,139 @@ public class PrismParser implements PrismParserConstants {
   }
 
 // Expression: if-then-else, i.e. "cond ? then : else"
-  static final public Expression ExpressionITE(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, left, right;
+  static final public 
+Expression ExpressionITE(boolean prop, boolean pathprop) throws ParseException {Expression ret, left, right;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionImplies(prop, pathprop);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case QMARK:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case QMARK:{
       jj_consume_token(QMARK);
       left = ExpressionImplies(prop, pathprop);
       jj_consume_token(COLON);
       right = ExpressionITE(prop, pathprop);
-                  ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0));
+ret = new ExpressionITE(ret, left, right); ret.setPosition(begin, getToken(0));
       break;
+      }
     default:
       jj_la1[49] = jj_gen;
       ;
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: implies
-  static final public Expression ExpressionImplies(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionImplies(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionIff(prop, pathprop);
     label_18:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case IMPLIES:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IMPLIES:{
         ;
         break;
+        }
       default:
         jj_la1[50] = jj_gen;
         break label_18;
       }
       jj_consume_token(IMPLIES);
       expr = ExpressionIff(prop, pathprop);
-                                                           ret = new ExpressionBinaryOp(ExpressionBinaryOp.IMPLIES, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(ExpressionBinaryOp.IMPLIES, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: if-and-only-iff
-  static final public Expression ExpressionIff(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionIff(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionOr(prop, pathprop);
     label_19:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case IFF:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IFF:{
         ;
         break;
+        }
       default:
         jj_la1[51] = jj_gen;
         break label_19;
       }
       jj_consume_token(IFF);
       expr = ExpressionOr(prop, pathprop);
-                                                      ret = new ExpressionBinaryOp(ExpressionBinaryOp.IFF, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(ExpressionBinaryOp.IFF, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: or
-  static final public Expression ExpressionOr(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionOr(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionAnd(prop, pathprop);
     label_20:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case OR:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OR:{
         ;
         break;
+        }
       default:
         jj_la1[52] = jj_gen;
         break label_20;
       }
       jj_consume_token(OR);
       expr = ExpressionAnd(prop, pathprop);
-                                                      ret = new ExpressionBinaryOp(ExpressionBinaryOp.OR, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(ExpressionBinaryOp.OR, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: and
-  static final public Expression ExpressionAnd(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionAnd(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionNot(prop, pathprop);
     label_21:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case AND:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AND:{
         ;
         break;
+        }
       default:
         jj_la1[53] = jj_gen;
         break label_21;
       }
       jj_consume_token(AND);
       expr = ExpressionNot(prop, pathprop);
-                                                       ret = new ExpressionBinaryOp(ExpressionBinaryOp.AND, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(ExpressionBinaryOp.AND, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: not
-  static final public Expression ExpressionNot(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionNot(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case NOT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case NOT:{
       begin = jj_consume_token(NOT);
       expr = ExpressionNot(prop, pathprop);
-                                                                     ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin, getToken(0));
       break;
+      }
     case A:
     case E:
     case FALSE:
@@ -2067,69 +2157,72 @@ public class PrismParser implements PrismParserConstants {
     case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:
+    case REG_IDENT:{
       ret = ExpressionEquality(prop, pathprop);
       break;
+      }
     default:
       jj_la1[54] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: equality operators: =, !=
-  static final public Expression ExpressionEquality(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionEquality(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         int op;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionRelop(prop, pathprop);
     label_22:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case EQ:
-      case NE:
+      case NE:{
         ;
         break;
+        }
       default:
         jj_la1[55] = jj_gen;
         break label_22;
       }
       op = EqNeq();
       expr = ExpressionRelop(prop, pathprop);
-                                                                ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: relational operators: >, <, >=, <=
-  static final public Expression ExpressionRelop(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionRelop(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         int op;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionPlusMinus(prop, pathprop);
     label_23:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LT:
       case GT:
       case LE:
-      case GE:
+      case GE:{
         ;
         break;
+        }
       default:
         jj_la1[56] = jj_gen;
         break label_23;
       }
       op = LtGt();
       expr = ExpressionPlusMinus(prop, pathprop);
-                                                                   ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -2141,93 +2234,100 @@ public class PrismParser implements PrismParserConstants {
 // we allow two or more successive expressions resulting in potential ambiguities
 // e.g. "-a-b" = "(-a)-b" = "-a" "-b"
 // Ignoring the warning results in the largest match being taken.
-  static final public Expression ExpressionPlusMinus(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionPlusMinus(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         int op;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionTimesDivide(prop, pathprop);
     label_24:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:
-      case MINUS:
+      case MINUS:{
         ;
         break;
+        }
       default:
         jj_la1[57] = jj_gen;
         break label_24;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case PLUS:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:{
         jj_consume_token(PLUS);
-                           op = ExpressionBinaryOp.PLUS;
+op = ExpressionBinaryOp.PLUS;
         break;
-      case MINUS:
+        }
+      case MINUS:{
         jj_consume_token(MINUS);
-                                                                       op = ExpressionBinaryOp.MINUS;
+op = ExpressionBinaryOp.MINUS;
         break;
+        }
       default:
         jj_la1[58] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       expr = ExpressionTimesDivide(prop, pathprop);
-                                                               ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: times/divide
-  static final public Expression ExpressionTimesDivide(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionTimesDivide(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         int op;
         Token begin = null;
-          begin = getToken(1);
+begin = getToken(1);
     ret = ExpressionUnaryMinus(prop, pathprop);
     label_25:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TIMES:
-      case DIVIDE:
+      case DIVIDE:{
         ;
         break;
+        }
       default:
         jj_la1[59] = jj_gen;
         break label_25;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case TIMES:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TIMES:{
         jj_consume_token(TIMES);
-                            op = ExpressionBinaryOp.TIMES;
+op = ExpressionBinaryOp.TIMES;
         break;
-      case DIVIDE:
+        }
+      case DIVIDE:{
         jj_consume_token(DIVIDE);
-                                                                          op = ExpressionBinaryOp.DIVIDE;
+op = ExpressionBinaryOp.DIVIDE;
         break;
+        }
       default:
         jj_la1[60] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       expr = ExpressionUnaryMinus(prop, pathprop);
-                                                              ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionBinaryOp(op, ret, expr); ret.setPosition(begin, getToken(0));
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: unary minus
-  static final public Expression ExpressionUnaryMinus(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret, expr;
+  static final public 
+Expression ExpressionUnaryMinus(boolean prop, boolean pathprop) throws ParseException {Expression ret, expr;
         Token begin = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case MINUS:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case MINUS:{
       begin = jj_consume_token(MINUS);
       expr = ExpressionUnaryMinus(prop, pathprop);
-                  ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begin, getToken(0));
+ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begin, getToken(0));
       break;
+      }
     case A:
     case E:
     case FALSE:
@@ -2249,77 +2349,91 @@ public class PrismParser implements PrismParserConstants {
     case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:
+    case REG_IDENT:{
       ret = ExpressionBasic(prop, pathprop);
       break;
+      }
     default:
       jj_la1[61] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Basic expression (top of operator precedence ordering)
-  static final public Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+  static final public 
+Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException {Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case FALSE:
     case TRUE:
     case REG_INT:
-    case REG_DOUBLE:
+    case REG_DOUBLE:{
       ret = ExpressionLiteral(prop, pathprop);
       break;
-    case REG_IDENT:
+      }
+    case REG_IDENT:{
       ret = ExpressionFuncOrIdent(prop, pathprop);
       break;
+      }
     case MAX:
-    case MIN:
+    case MIN:{
       ret = ExpressionFuncMinMax(prop, pathprop);
       break;
-    case FUNC:
+      }
+    case FUNC:{
       ret = ExpressionFuncOldStyle(prop, pathprop);
       break;
-    case LPARENTH:
+      }
+    case LPARENTH:{
       ret = ExpressionParenth(prop, pathprop);
       break;
+      }
     case PMAX:
     case PMIN:
-    case P:
+    case P:{
       // Remaining options are only applicable for properties
                       ret = ExpressionProb(prop, pathprop);
       break;
-    case S:
+      }
+    case S:{
       ret = ExpressionSS(prop, pathprop);
       break;
+      }
     case RMAX:
     case RMIN:
-    case R:
+    case R:{
       ret = ExpressionReward(prop, pathprop);
       break;
-    case E:
+      }
+    case E:{
       ret = ExpressionExists(prop, pathprop);
       break;
-    case A:
+      }
+    case A:{
       ret = ExpressionForAll(prop, pathprop);
       break;
+      }
     case DLBRACKET:
-    case DLT:
+    case DLT:{
       ret = ExpressionStrategy(prop, pathprop);
       break;
-    case DQUOTE:
+      }
+    case DQUOTE:{
       ret = ExpressionLabel(prop, pathprop);
       break;
-    case FILTER:
+      }
+    case FILTER:{
       ret = ExpressionFilter(prop, pathprop);
       break;
+      }
     default:
       jj_la1[62] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return ret;}
+{if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -2331,115 +2445,122 @@ public class PrismParser implements PrismParserConstants {
 // we allow two or more successive expressions resulting in potential ambiguities
 // e.g. "a(b)" = "a" "(b)"
 // Ignoring the warning results in the largest match being taken.
-  static final public Expression ExpressionFuncOrIdent(boolean prop, boolean pathprop) throws ParseException {
-        String s = null;
+  static final public 
+Expression ExpressionFuncOrIdent(boolean prop, boolean pathprop) throws ParseException {String s = null;
         Expression ret = null;
         Token begin = null;
     // If there is no "(...)", this is an identifier
             s = Identifier();
-                           ret = new ExpressionIdent(s); begin = getToken(0);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LPARENTH:
+ret = new ExpressionIdent(s); begin = getToken(0);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPARENTH:{
       jj_consume_token(LPARENTH);
-                       ret = new ExpressionFunc(s);
+ret = new ExpressionFunc(s);
       ExpressionFuncArgs(prop, pathprop, (ExpressionFunc)ret);
       jj_consume_token(RPARENTH);
       break;
+      }
     default:
       jj_la1[63] = jj_gen;
       ;
     }
-          ret.setPosition(begin, getToken(0)); {if (true) return ret;}
+ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: min/max function (treated differently because min/max are keywords)
-  static final public Expression ExpressionFuncMinMax(boolean prop, boolean pathprop) throws ParseException {
-        String s = null;
+  static final public 
+Expression ExpressionFuncMinMax(boolean prop, boolean pathprop) throws ParseException {String s = null;
         ExpressionFunc func = null;
         Token begin = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case MIN:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case MIN:{
       begin = jj_consume_token(MIN);
-                          s = "min";
+s = "min";
       break;
-    case MAX:
+      }
+    case MAX:{
       begin = jj_consume_token(MAX);
-                                                         s = "max";
+s = "max";
       break;
+      }
     default:
       jj_la1[64] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          func = new ExpressionFunc(s);
+func = new ExpressionFunc(s);
     jj_consume_token(LPARENTH);
     ExpressionFuncArgs(prop, pathprop, func);
     jj_consume_token(RPARENTH);
-          func.setPosition(begin, getToken(0)); {if (true) return func;}
+func.setPosition(begin, getToken(0)); {if ("" != null) return func;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: old-style function, i.e. "func(name, ...)"
-  static final public Expression ExpressionFuncOldStyle(boolean prop, boolean pathprop) throws ParseException {
-        String s = null;
+  static final public 
+Expression ExpressionFuncOldStyle(boolean prop, boolean pathprop) throws ParseException {String s = null;
         ExpressionFunc func = null;
         Token begin = null;
     begin = jj_consume_token(FUNC);
     jj_consume_token(LPARENTH);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case MIN:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case MIN:{
       jj_consume_token(MIN);
-                                            s = "min";
+s = "min";
       break;
-    case MAX:
+      }
+    case MAX:{
       jj_consume_token(MAX);
-                                                                   s = "max";
+s = "max";
       break;
-    case REG_IDENT:
+      }
+    case REG_IDENT:{
       s = Identifier();
       break;
+      }
     default:
       jj_la1[65] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     jj_consume_token(COMMA);
-                  func = new ExpressionFunc(s); func.setOldStyle(true);
+func = new ExpressionFunc(s); func.setOldStyle(true);
     ExpressionFuncArgs(prop, pathprop, func);
     jj_consume_token(RPARENTH);
-          func.setPosition(begin, getToken(0)); {if (true) return func;}
+func.setPosition(begin, getToken(0)); {if ("" != null) return func;}
     throw new Error("Missing return statement in function");
   }
 
 // Arguments for a function in an expression
-  static final public void ExpressionFuncArgs(boolean prop, boolean pathprop, ExpressionFunc func) throws ParseException {
-        Expression expr;
+  static final public 
+void ExpressionFuncArgs(boolean prop, boolean pathprop, ExpressionFunc func) throws ParseException {Expression expr;
     expr = Expression(prop, pathprop);
-                                            func.addOperand(expr);
+func.addOperand(expr);
     label_26:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case COMMA:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
         ;
         break;
+        }
       default:
         jj_la1[66] = jj_gen;
         break label_26;
       }
       jj_consume_token(COMMA);
       expr = Expression(prop, pathprop);
-                                                                                                                   func.addOperand(expr);
+func.addOperand(expr);
     }
   }
 
 // Expression: literal
-  static final public Expression ExpressionLiteral(boolean prop, boolean pathprop) throws ParseException {
-        Expression ret = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_INT:
+  static final public 
+Expression ExpressionLiteral(boolean prop, boolean pathprop) throws ParseException {Expression ret = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_INT:{
       jj_consume_token(REG_INT);
-                try {
+try {
                         int i = Integer.parseInt(getToken(0).image);
                         ret = new ExpressionLiteral(TypeInt.getInstance(), new Integer(i));
                 } catch (NumberFormatException e) {
@@ -2451,9 +2572,10 @@ public class PrismParser implements PrismParserConstants {
                         // NB: can't call generateParseException() here; it crashes
                 }
       break;
-    case REG_DOUBLE:
+      }
+    case REG_DOUBLE:{
       jj_consume_token(REG_DOUBLE);
-                try {
+try {
                         double d = Double.parseDouble(getToken(0).image);
                         ret = new ExpressionLiteral(TypeDouble.getInstance(), new Double(d), getToken(0).image);
                 } catch (NumberFormatException e) {
@@ -2463,31 +2585,34 @@ public class PrismParser implements PrismParserConstants {
                         // NB: can't call generateParseException() here; it crashes
                 }
       break;
-    case TRUE:
+      }
+    case TRUE:{
       jj_consume_token(TRUE);
-                 ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(true));
+ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(true));
       break;
-    case FALSE:
+      }
+    case FALSE:{
       jj_consume_token(FALSE);
-                  ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(false));
+ret = new ExpressionLiteral(TypeBool.getInstance(), new Boolean(false));
       break;
+      }
     default:
       jj_la1[67] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          ret.setPosition(getToken(0)); {if (true) return ret;}
+ret.setPosition(getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Expression: parentheses
-  static final public Expression ExpressionParenth(boolean prop, boolean pathprop) throws ParseException {
-        Expression expr, ret;
+  static final public 
+Expression ExpressionParenth(boolean prop, boolean pathprop) throws ParseException {Expression expr, ret;
         Token begin = null;
     begin = jj_consume_token(LPARENTH);
     expr = Expression(prop, pathprop);
     jj_consume_token(RPARENTH);
-          ret = new ExpressionUnaryOp(ExpressionUnaryOp.PARENTH, expr); ret.setPosition(begin, getToken(0)); {if (true) return ret;}
+ret = new ExpressionUnaryOp(ExpressionUnaryOp.PARENTH, expr); ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -2496,8 +2621,8 @@ public class PrismParser implements PrismParserConstants {
 //-----------------------------------------------------------------------------------
 
 // (Property) expression: probabilistic operator P
-  static final public Expression ExpressionProb(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionIdent modifier = null;
+  static final public 
+Expression ExpressionProb(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent modifier = null;
         int r;
         String relOp = null;
         Expression prob = null;
@@ -2506,64 +2631,72 @@ public class PrismParser implements PrismParserConstants {
         ExpressionProb ret = new ExpressionProb();
         Token begin = null;
         boolean isBool;
-          if (!prop) {if (true) throw generateParseException();}
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case P:
+if (!prop) {if (true) throw generateParseException();}
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case P:{
       begin = jj_consume_token(P);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LPARENTH:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LPARENTH:{
         jj_consume_token(LPARENTH);
         modifier = IdentifierExpression();
         jj_consume_token(RPARENTH);
         break;
+        }
       default:
         jj_la1[68] = jj_gen;
         ;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LT:
       case GT:
       case LE:
-      case GE:
+      case GE:{
         r = LtGt();
         prob = Expression(false, false);
-                                                                       relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
+relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
         break;
-      case EQ:
+        }
+      case EQ:{
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                                 relOp = "="; isBool = false;
+relOp = "="; isBool = false;
         break;
-      case MIN:
+        }
+      case MIN:{
         jj_consume_token(MIN);
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                                       relOp = "min="; isBool = false;
+relOp = "min="; isBool = false;
         break;
-      case MAX:
+        }
+      case MAX:{
         jj_consume_token(MAX);
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                                       relOp = "max="; isBool = false;
+relOp = "max="; isBool = false;
         break;
+        }
       default:
         jj_la1[69] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
-    case PMIN:
+      }
+    case PMIN:{
       begin = jj_consume_token(PMIN);
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-                                         relOp = "min="; isBool = false;
+relOp = "min="; isBool = false;
       break;
-    case PMAX:
+      }
+    case PMAX:{
       begin = jj_consume_token(PMAX);
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-                                         relOp = "max="; isBool = false;
+relOp = "max="; isBool = false;
       break;
+      }
     default:
       jj_la1[70] = jj_gen;
       jj_consume_token(-1);
@@ -2571,16 +2704,17 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(LBRACKET);
     expr = Expression(prop, true);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LBRACE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
       filter = Filter();
       break;
+      }
     default:
       jj_la1[71] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
-                ret.setModifier(modifier == null ? null : modifier.getName());
+ret.setModifier(modifier == null ? null : modifier.getName());
                 ret.setRelOp(relOp);
                 ret.setProb(prob);
                 ret.setExpression(expr);
@@ -2592,41 +2726,44 @@ public class PrismParser implements PrismParserConstants {
                         String filterOp = isBool ? "&" : filter.getFilterOpString();
                         ExpressionFilter ef = new ExpressionFilter(filterOp, ret, filter.getExpression());
                         ef.setInvisible(true);
-                        {if (true) return ef;}
+                        {if ("" != null) return ef;}
                 }
-                else {if (true) return ret;}
+                else {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Filter for a P/S/R operator
-  static final public Filter Filter() throws ParseException {
-        Filter filter;
+  static final public 
+Filter Filter() throws ParseException {Filter filter;
         Expression expr;
         Token begin = null;
     begin = jj_consume_token(LBRACE);
     expr = Expression(true, false);
-                                                          filter = new Filter(expr);
+filter = new Filter(expr);
     jj_consume_token(RBRACE);
     label_27:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACE:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACE:{
         ;
         break;
+        }
       default:
         jj_la1[72] = jj_gen;
         break label_27;
       }
       jj_consume_token(LBRACE);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case MIN:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case MIN:{
         jj_consume_token(MIN);
-                          filter.setMinRequested(true);
+filter.setMinRequested(true);
         break;
-      case MAX:
+        }
+      case MAX:{
         jj_consume_token(MAX);
-                          filter.setMaxRequested(true);
+filter.setMaxRequested(true);
         break;
+        }
       default:
         jj_la1[73] = jj_gen;
         jj_consume_token(-1);
@@ -2634,13 +2771,13 @@ public class PrismParser implements PrismParserConstants {
       }
       jj_consume_token(RBRACE);
     }
-          filter.setPosition(begin, getToken(0)); {if (true) return filter;}
+filter.setPosition(begin, getToken(0)); {if ("" != null) return filter;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: steady-state operator S
-  static final public Expression ExpressionSS(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionIdent modifier = null;
+  static final public 
+Expression ExpressionSS(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent modifier = null;
         int r;
         String relOp = null;
         Expression prob = null;
@@ -2649,34 +2786,37 @@ public class PrismParser implements PrismParserConstants {
         ExpressionSS ret = new ExpressionSS();
         Token begin;
         boolean isBool;
-          if (!prop) {if (true) throw generateParseException();}
+if (!prop) {if (true) throw generateParseException();}
     // Various options for "S" keyword and attached symbols
             begin = jj_consume_token(S);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPARENTH:
     case LT:
     case GT:
     case LE:
-    case GE:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LPARENTH:
+    case GE:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LPARENTH:{
         jj_consume_token(LPARENTH);
         modifier = IdentifierExpression();
         jj_consume_token(RPARENTH);
         break;
+        }
       default:
         jj_la1[74] = jj_gen;
         ;
       }
       r = LtGt();
       prob = Expression(false, false);
-                                                               relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
+relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
       break;
-    case EQ:
+      }
+    case EQ:{
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-                                 relOp = "="; isBool = false;
+relOp = "="; isBool = false;
       break;
+      }
     default:
       jj_la1[75] = jj_gen;
       jj_consume_token(-1);
@@ -2684,16 +2824,17 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(LBRACKET);
     expr = Expression(prop, pathprop);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LBRACE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
       filter = Filter();
       break;
+      }
     default:
       jj_la1[76] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
-                ret.setModifier(modifier == null ? null : modifier.getName());
+ret.setModifier(modifier == null ? null : modifier.getName());
                 ret.setRelOp(relOp);
                 ret.setProb(prob);
                 ret.setExpression(expr);
@@ -2705,15 +2846,15 @@ public class PrismParser implements PrismParserConstants {
                         String filterOp = isBool ? "&" : filter.getFilterOpString();
                         ExpressionFilter ef = new ExpressionFilter(filterOp, ret, filter.getExpression());
                         ef.setInvisible(true);
-                        {if (true) return ef;}
+                        {if ("" != null) return ef;}
                 }
-                else {if (true) return ret;}
+                else {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: expected reward operator R
-  static final public Expression ExpressionReward(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionIdent modifier = null;
+  static final public 
+Expression ExpressionReward(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent modifier = null;
         int r;
         String relOp = null;
         Expression rew = null;
@@ -2722,72 +2863,81 @@ public class PrismParser implements PrismParserConstants {
         ExpressionReward ret = new ExpressionReward();
         Token begin;
         boolean isBool;
-          if (!prop) {if (true) throw generateParseException();}
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case R:
+if (!prop) {if (true) throw generateParseException();}
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case R:{
       begin = jj_consume_token(R);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LPARENTH:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LPARENTH:{
         jj_consume_token(LPARENTH);
         modifier = IdentifierExpression();
         jj_consume_token(RPARENTH);
         break;
+        }
       default:
         jj_la1[77] = jj_gen;
         ;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACE:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACE:{
         RewardIndex(ret);
         break;
+        }
       default:
         jj_la1[78] = jj_gen;
         ;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LT:
       case GT:
       case LE:
-      case GE:
+      case GE:{
         r = LtGt();
         rew = Expression(false, false);
-                                                               relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
+relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true;
         break;
-      case EQ:
+        }
+      case EQ:{
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                             relOp = "="; isBool = false;
+relOp = "="; isBool = false;
         break;
-      case MIN:
+        }
+      case MIN:{
         jj_consume_token(MIN);
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                                   relOp = "min="; isBool = false;
+relOp = "min="; isBool = false;
         break;
-      case MAX:
+        }
+      case MAX:{
         jj_consume_token(MAX);
         jj_consume_token(EQ);
         jj_consume_token(QMARK);
-                                   relOp = "max="; isBool = false;
+relOp = "max="; isBool = false;
         break;
+        }
       default:
         jj_la1[79] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
-    case RMIN:
+      }
+    case RMIN:{
       begin = jj_consume_token(RMIN);
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-                                         relOp = "min="; isBool = false;
+relOp = "min="; isBool = false;
       break;
-    case RMAX:
+      }
+    case RMAX:{
       begin = jj_consume_token(RMAX);
       jj_consume_token(EQ);
       jj_consume_token(QMARK);
-                                         relOp = "max="; isBool = false;
+relOp = "max="; isBool = false;
       break;
+      }
     default:
       jj_la1[80] = jj_gen;
       jj_consume_token(-1);
@@ -2795,16 +2945,17 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(LBRACKET);
     expr = ExpressionRewardContents(prop, pathprop);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LBRACE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
       filter = Filter();
       break;
+      }
     default:
       jj_la1[81] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
-                ret.setModifier(modifier == null ? null : modifier.getName());
+ret.setModifier(modifier == null ? null : modifier.getName());
                 ret.setRelOp(relOp);
                 ret.setReward(rew);
                 ret.setExpression(expr);
@@ -2816,15 +2967,15 @@ public class PrismParser implements PrismParserConstants {
                         String filterOp = isBool ? "&" : filter.getFilterOpString();
                         ExpressionFilter ef = new ExpressionFilter(filterOp, ret, filter.getExpression());
                         ef.setInvisible(true);
-                        {if (true) return ef;}
+                        {if ("" != null) return ef;}
                 }
-                else {if (true) return ret;}
+                else {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Reward struct index for R operator
-  static final public void RewardIndex(ExpressionReward exprRew) throws ParseException {
-        Object index = null;
+  static final public 
+void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = null;
         Object indexDiv = null;
     jj_consume_token(LBRACE);
     if (jj_2_15(2147483647)) {
@@ -2832,7 +2983,7 @@ public class PrismParser implements PrismParserConstants {
       index = Identifier();
       jj_consume_token(DQUOTE);
     } else {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
       case E:
       case FALSE:
@@ -2859,9 +3010,10 @@ public class PrismParser implements PrismParserConstants {
       case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:
+      case REG_IDENT:{
         index = Expression(false, false);
         break;
+        }
       default:
         jj_la1[82] = jj_gen;
         jj_consume_token(-1);
@@ -2869,8 +3021,8 @@ public class PrismParser implements PrismParserConstants {
       }
     }
     jj_consume_token(RBRACE);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case DIVIDE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case DIVIDE:{
       jj_consume_token(DIVIDE);
       jj_consume_token(LBRACE);
       if (jj_2_16(2147483647)) {
@@ -2878,7 +3030,7 @@ public class PrismParser implements PrismParserConstants {
         indexDiv = Identifier();
         jj_consume_token(DQUOTE);
       } else {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
         case E:
         case FALSE:
@@ -2905,9 +3057,10 @@ public class PrismParser implements PrismParserConstants {
         case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:
+        case REG_IDENT:{
           indexDiv = Expression(false, false);
           break;
+          }
         default:
           jj_la1[83] = jj_gen;
           jj_consume_token(-1);
@@ -2916,11 +3069,12 @@ public class PrismParser implements PrismParserConstants {
       }
       jj_consume_token(RBRACE);
       break;
+      }
     default:
       jj_la1[84] = jj_gen;
       ;
     }
-                exprRew.setRewardStructIndex(index);
+exprRew.setRewardStructIndex(index);
                 if (indexDiv != null) {
                         exprRew.setRewardStructIndexDiv(indexDiv);
                 }
@@ -2931,40 +3085,43 @@ public class PrismParser implements PrismParserConstants {
 // JavaCC warns about lookahead for this function. This is because there is a possible conflict between
 // R [ S ], where "S" is the long-run reward operator, and R [ S [ ] ], where "S [ ]" is an LTL formula
 // comprising a single atomic proposition. We use lookahead to resolve the ambiguity.
-  static final public Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws ParseException {
-        Expression expr = null;
+  static final public 
+Expression ExpressionRewardContents(boolean prop, boolean pathprop) throws ParseException {Expression expr = null;
         ExpressionTemporal exprTemp = null;
         Expression ret = null;
         Token begin;
-          begin = getToken(1);
+begin = getToken(1);
     if (jj_2_17(2147483647)) {
       expr = ExpressionSS(prop, true);
-                                                                                  ret = expr;
+ret = expr;
     } else {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case S:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case S:{
         jj_consume_token(S);
-                ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
+ret = new ExpressionTemporal(ExpressionTemporal.R_S, null, null);
         break;
+        }
       default:
         jj_la1[85] = jj_gen;
         if (jj_2_18(2147483647)) {
           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); exprTemp.setUpperBound(expr); ret = exprTemp;
         } else {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case C:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case C:{
             jj_consume_token(C);
-                ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null);
+ret = new ExpressionTemporal(ExpressionTemporal.R_C, null, null);
             break;
-          case I:
+            }
+          case I:{
             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); exprTemp.setUpperBound(expr); ret = exprTemp;
             break;
+            }
           case A:
           case E:
           case FALSE:
@@ -2991,10 +3148,11 @@ public class PrismParser implements PrismParserConstants {
           case DQUOTE:
           case REG_INT:
           case REG_DOUBLE:
-          case REG_IDENT:
+          case REG_IDENT:{
             expr = Expression(prop, true);
-                                          ret = expr;
+ret = expr;
             break;
+            }
           default:
             jj_la1[86] = jj_gen;
             jj_consume_token(-1);
@@ -3003,224 +3161,243 @@ public class PrismParser implements PrismParserConstants {
         }
       }
     }
-          ret.setPosition(begin, getToken(0)); {if (true) return ret;}
+ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: CTL existential operator E
-  static final public Expression ExpressionExists(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionExists ret = new ExpressionExists();
+  static final public 
+Expression ExpressionExists(boolean prop, boolean pathprop) throws ParseException {ExpressionExists ret = new ExpressionExists();
         Expression expr;
         Token begin = null;
-          if (!prop) {if (true) throw generateParseException();}
+if (!prop) {if (true) throw generateParseException();}
     begin = jj_consume_token(E);
     jj_consume_token(LBRACKET);
     expr = Expression(prop, true);
     jj_consume_token(RBRACKET);
-                ret.setExpression(expr);
+ret.setExpression(expr);
                 ret.setPosition(begin, getToken(0));
-                {if (true) return ret;}
+                {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: CTL universal operator A
-  static final public Expression ExpressionForAll(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionForAll ret = new ExpressionForAll();
+  static final public 
+Expression ExpressionForAll(boolean prop, boolean pathprop) throws ParseException {ExpressionForAll ret = new ExpressionForAll();
         Expression expr;
         Token begin = null;
-          if (!prop) {if (true) throw generateParseException();}
+if (!prop) {if (true) throw generateParseException();}
     begin = jj_consume_token(A);
     jj_consume_token(LBRACKET);
     expr = Expression(prop, true);
     jj_consume_token(RBRACKET);
-                ret.setExpression(expr);
+ret.setExpression(expr);
                 ret.setPosition(begin, getToken(0));
-                {if (true) return ret;}
+                {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: ATL strategy operators <<>> and [[]]
-  static final public Expression ExpressionStrategy(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionStrategy ret;
+  static final public 
+Expression ExpressionStrategy(boolean prop, boolean pathprop) throws ParseException {ExpressionStrategy ret;
         Expression expr;
         Token begin = null;
-          if (!prop) {if (true) throw generateParseException();}
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case DLT:
+if (!prop) {if (true) throw generateParseException();}
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case DLT:{
       begin = jj_consume_token(DLT);
-                           ret = new ExpressionStrategy(true);
+ret = new ExpressionStrategy(true);
       ExpressionStrategyCoalition(ret);
       jj_consume_token(DGT);
       break;
-    case DLBRACKET:
+      }
+    case DLBRACKET:{
       begin = jj_consume_token(DLBRACKET);
-                                 ret = new ExpressionStrategy(false);
+ret = new ExpressionStrategy(false);
       ExpressionStrategyCoalition(ret);
       jj_consume_token(DRBRACKET);
       break;
+      }
     default:
       jj_la1[87] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PMAX:
     case PMIN:
     case P:
     case RMAX:
     case RMIN:
-    case R:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case R:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PMAX:
       case PMIN:
-      case P:
+      case P:{
         expr = ExpressionProb(prop, pathprop);
         break;
+        }
       case RMAX:
       case RMIN:
-      case R:
+      case R:{
         expr = ExpressionReward(prop, pathprop);
         break;
+        }
       default:
         jj_la1[88] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-          ret.setSingleOperand(expr);
+ret.setSingleOperand(expr);
       break;
-    case LPARENTH:
+      }
+    case LPARENTH:{
       expr = ExpressionParenth(prop, pathprop);
-          ret.addOperand(expr);
+ret.addOperand(expr);
       break;
+      }
     default:
       jj_la1[89] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-                ret.setPosition(begin, getToken(0));
-                {if (true) return ret;}
+ret.setPosition(begin, getToken(0));
+                {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Coalition (player list) for a strategy (<<>> or [[]]) operator
-  static final public void ExpressionStrategyCoalition(ExpressionStrategy exprStrat) throws ParseException {
-        List<String> coalition = new ArrayList<String>();
+  static final public 
+void ExpressionStrategyCoalition(ExpressionStrategy exprStrat) throws ParseException {List<String> coalition = new ArrayList<String>();
         String s;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case TIMES:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TIMES:{
       jj_consume_token(TIMES);
-                      exprStrat.setCoalitionAllPlayers();
+exprStrat.setCoalitionAllPlayers();
       break;
+      }
     default:
       jj_la1[92] = jj_gen;
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case REG_INT:
-      case REG_IDENT:
+      case REG_IDENT:{
         s = ExpressionStrategyCoalitionPlayer();
-                                                    coalition.add(s);
+coalition.add(s);
         label_28:
         while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case COMMA:
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
             ;
             break;
+            }
           default:
             jj_la1[90] = jj_gen;
             break label_28;
           }
           jj_consume_token(COMMA);
           s = ExpressionStrategyCoalitionPlayer();
-                                                             coalition.add(s);
+coalition.add(s);
         }
         break;
+        }
       default:
         jj_la1[91] = jj_gen;
         ;
       }
-          exprStrat.setCoalition(coalition);
+exprStrat.setCoalition(coalition);
     }
   }
 
 // Single player in a coalition for a strategy (<<>> or [[]]) operator
-  static final public String ExpressionStrategyCoalitionPlayer() throws ParseException {
-        String s;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_INT:
+  static final public 
+String ExpressionStrategyCoalitionPlayer() throws ParseException {String s;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_INT:{
       jj_consume_token(REG_INT);
       break;
-    case REG_IDENT:
+      }
+    case REG_IDENT:{
       jj_consume_token(REG_IDENT);
       break;
+      }
     default:
       jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-                                      s = getToken(0).image;
-          {if (true) return s;}
+s = getToken(0).image;
+{if ("" != null) return s;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: label (including "init")
-  static final public Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {
-        String s;
+  static final public 
+Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {String s;
         ExpressionLabel ret = null;
         Token begin;
-          if (!prop) {if (true) throw generateParseException();}
+if (!prop) {if (true) throw generateParseException();}
     begin = jj_consume_token(DQUOTE);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       s = Identifier();
       break;
-    case INIT:
+      }
+    case INIT:{
       jj_consume_token(INIT);
-                                                       s = "init";
+s = "init";
       break;
+      }
     default:
       jj_la1[94] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     jj_consume_token(DQUOTE);
-          ret = new ExpressionLabel(s); ret.setPosition(begin, getToken(0)); {if (true) return ret;}
+ret = new ExpressionLabel(s); ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // (Property) expression: filter (using "filter" keyword)
-  static final public Expression ExpressionFilter(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionFilter expr = null;
+  static final public 
+Expression ExpressionFilter(boolean prop, boolean pathprop) throws ParseException {ExpressionFilter expr = null;
         String op = null;
         Expression filter = null;
         Expression expr2 = null;
         Token begin = null;
-          if (!prop) {if (true) throw generateParseException();}
+if (!prop) {if (true) throw generateParseException();}
     // filter(
             begin = jj_consume_token(FILTER);
     jj_consume_token(LPARENTH);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case MIN:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case MIN:{
       jj_consume_token(MIN);
-                  op = "min";
+op = "min";
       break;
-    case MAX:
+      }
+    case MAX:{
       jj_consume_token(MAX);
-                                          op = "max";
+op = "max";
       break;
-    case PLUS:
+      }
+    case PLUS:{
       jj_consume_token(PLUS);
-                   op = "+";
+op = "+";
       break;
-    case AND:
+      }
+    case AND:{
       jj_consume_token(AND);
-                                         op = "&";
+op = "&";
       break;
-    case OR:
+      }
+    case OR:{
       jj_consume_token(OR);
-                                                              op = "|";
+op = "|";
       break;
-    case REG_IDENT:
+      }
+    case REG_IDENT:{
       op = Identifier();
       break;
+      }
     default:
       jj_la1[95] = jj_gen;
       jj_consume_token(-1);
@@ -3228,17 +3405,18 @@ public class PrismParser implements PrismParserConstants {
     }
     jj_consume_token(COMMA);
     expr2 = Expression(prop, pathprop);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case COMMA:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COMMA:{
       jj_consume_token(COMMA);
       filter = Expression(prop, pathprop);
       break;
+      }
     default:
       jj_la1[96] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
-          expr = new ExpressionFilter(op, expr2, filter); expr.setPosition(begin, getToken(0)); {if (true) return expr;}
+expr = new ExpressionFilter(op, expr2, filter); expr.setPosition(begin, getToken(0)); {if ("" != null) return expr;}
     throw new Error("Missing return statement in function");
   }
 
@@ -3247,70 +3425,78 @@ public class PrismParser implements PrismParserConstants {
 //-----------------------------------------------------------------------------------
 
 // Identifier (returns String)
-  static final public String Identifier() throws ParseException {
+  static final public 
+String Identifier() throws ParseException {
     jj_consume_token(REG_IDENT);
-                      {if (true) return getToken(0).image;}
+{if ("" != null) return getToken(0).image;}
     throw new Error("Missing return statement in function");
   }
 
 // Identifier (returns ExpressionIdent, storing position info)
-  static final public ExpressionIdent IdentifierExpression() throws ParseException {
-        String ident;
+  static final public 
+ExpressionIdent IdentifierExpression() throws ParseException {String ident;
         ExpressionIdent ret;
     ident = Identifier();
-          ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if (true) return ret;}
+ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Identifier or min/max keyword (returns ExpressionIdent, storing position info)
-  static final public ExpressionIdent IdentifierExpressionMinMax() throws ParseException {
-        String ident;
+  static final public 
+ExpressionIdent IdentifierExpressionMinMax() throws ParseException {String ident;
         ExpressionIdent ret;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       ident = Identifier();
       break;
-    case MIN:
+      }
+    case MIN:{
       jj_consume_token(MIN);
-                                         ident="min";
+ident="min";
       break;
-    case MAX:
+      }
+    case MAX:{
       jj_consume_token(MAX);
-                                                                  ident="max";
+ident="max";
       break;
+      }
     default:
       jj_la1[97] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if (true) return ret;}
+ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
 // Primed identifier
-  static final public ExpressionIdent IdentifierPrime() throws ParseException {
+  static final public 
+ExpressionIdent IdentifierPrime() throws ParseException {
     jj_consume_token(REG_IDENTPRIME);
-                // Remove prime, create new ident and return
+// Remove prime, create new ident and return
                 String s = getToken(0).image;
                 s = s.substring(0, s.length()-1);
                 ExpressionIdent expr = new ExpressionIdent(s);
                 expr.setPosition(token);
                 expr.setEndColumn(expr.getEndColumn() - 1);
-                {if (true) return expr;}
+                {if ("" != null) return expr;}
     throw new Error("Missing return statement in function");
   }
 
 // Equality operators: =, !=
-  static final public int EqNeq() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case EQ:
+  static final public 
+int EqNeq() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case EQ:{
       jj_consume_token(EQ);
-              {if (true) return ExpressionBinaryOp.EQ;}
+{if ("" != null) return ExpressionBinaryOp.EQ;}
       break;
-    case NE:
+      }
+    case NE:{
       jj_consume_token(NE);
-              {if (true) return ExpressionBinaryOp.NE;}
+{if ("" != null) return ExpressionBinaryOp.NE;}
       break;
+      }
     default:
       jj_la1[98] = jj_gen;
       jj_consume_token(-1);
@@ -3320,24 +3506,29 @@ public class PrismParser implements PrismParserConstants {
   }
 
 // Relational operators: >, <, >=, <=
-  static final public int LtGt() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case GT:
+  static final public 
+int LtGt() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case GT:{
       jj_consume_token(GT);
-              {if (true) return ExpressionBinaryOp.GT;}
+{if ("" != null) return ExpressionBinaryOp.GT;}
       break;
-    case LT:
+      }
+    case LT:{
       jj_consume_token(LT);
-              {if (true) return ExpressionBinaryOp.LT;}
+{if ("" != null) return ExpressionBinaryOp.LT;}
       break;
-    case GE:
+      }
+    case GE:{
       jj_consume_token(GE);
-               {if (true) return ExpressionBinaryOp.GE;}
+{if ("" != null) return ExpressionBinaryOp.GE;}
       break;
-    case LE:
+      }
+    case LE:{
       jj_consume_token(LE);
-              {if (true) return ExpressionBinaryOp.LE;}
+{if ("" != null) return ExpressionBinaryOp.LE;}
       break;
+      }
     default:
       jj_la1[99] = jj_gen;
       jj_consume_token(-1);
@@ -3347,168 +3538,189 @@ public class PrismParser implements PrismParserConstants {
   }
 
 // For loop
-  static final public ForLoop ForLoop() throws ParseException {
-        String s;
+  static final public 
+ForLoop ForLoop() throws ParseException {String s;
         Expression from = null, to = null, step = null;
         ForLoop fl = new ForLoop();
         Token begin;
-            begin = getToken(1);
+begin = getToken(1);
     s = Identifier();
     jj_consume_token(EQ);
     from = Expression(false, false);
     jj_consume_token(COLON);
     to = Expression(false, false);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case COLON:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COLON:{
       jj_consume_token(COLON);
       step = Expression(false, false);
       break;
+      }
     default:
       jj_la1[100] = jj_gen;
       ;
     }
     jj_consume_token(0);
-                fl.setLHS(s);
+fl.setLHS(s);
                 fl.setFrom(from);
                 fl.setTo(to);
                 if (step != null) fl.setStep(step);
                 fl.setPosition(begin, getToken(0));
-                {if (true) return fl;}
+                {if ("" != null) return fl;}
     throw new Error("Missing return statement in function");
   }
 
-  static private boolean jj_2_1(int xla) {
+  static private boolean jj_2_1(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_1(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(0, xla); }
   }
 
-  static private boolean jj_2_2(int xla) {
+  static private boolean jj_2_2(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_2(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(1, xla); }
   }
 
-  static private boolean jj_2_3(int xla) {
+  static private boolean jj_2_3(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_3(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(2, xla); }
   }
 
-  static private boolean jj_2_4(int xla) {
+  static private boolean jj_2_4(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_4(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(3, xla); }
   }
 
-  static private boolean jj_2_5(int xla) {
+  static private boolean jj_2_5(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_5(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(4, xla); }
   }
 
-  static private boolean jj_2_6(int xla) {
+  static private boolean jj_2_6(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_6(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(5, xla); }
   }
 
-  static private boolean jj_2_7(int xla) {
+  static private boolean jj_2_7(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_7(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(6, xla); }
   }
 
-  static private boolean jj_2_8(int xla) {
+  static private boolean jj_2_8(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_8(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(7, xla); }
   }
 
-  static private boolean jj_2_9(int xla) {
+  static private boolean jj_2_9(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_9(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(8, xla); }
   }
 
-  static private boolean jj_2_10(int xla) {
+  static private boolean jj_2_10(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_10(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(9, xla); }
   }
 
-  static private boolean jj_2_11(int xla) {
+  static private boolean jj_2_11(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_11(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(10, xla); }
   }
 
-  static private boolean jj_2_12(int xla) {
+  static private boolean jj_2_12(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_12(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(11, xla); }
   }
 
-  static private boolean jj_2_13(int xla) {
+  static private boolean jj_2_13(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_13(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(12, xla); }
   }
 
-  static private boolean jj_2_14(int xla) {
+  static private boolean jj_2_14(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_14(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(13, xla); }
   }
 
-  static private boolean jj_2_15(int xla) {
+  static private boolean jj_2_15(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_15(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(14, xla); }
   }
 
-  static private boolean jj_2_16(int xla) {
+  static private boolean jj_2_16(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_16(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(15, xla); }
   }
 
-  static private boolean jj_2_17(int xla) {
+  static private boolean jj_2_17(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_17(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(16, xla); }
   }
 
-  static private boolean jj_2_18(int xla) {
+  static private boolean jj_2_18(int xla)
+ {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_18(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(17, xla); }
   }
 
-  static private boolean jj_3R_164() {
+  static private boolean jj_3R_164()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_46() {
+  static private boolean jj_3R_46()
+ {
     if (jj_3R_55()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3516,131 +3728,155 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_184() {
+  static private boolean jj_3R_184()
+ {
     if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_90() {
+  static private boolean jj_3R_90()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_146() {
+  static private boolean jj_3R_146()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_32() {
+  static private boolean jj_3R_32()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_163() {
+  static private boolean jj_3R_163()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_157() {
+  static private boolean jj_3R_157()
+ {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_156() {
+  static private boolean jj_3R_156()
+ {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_183() {
+  static private boolean jj_3R_183()
+ {
     if (jj_scan_token(AND)) return true;
     return false;
   }
 
-  static private boolean jj_3R_181() {
+  static private boolean jj_3R_181()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_38() {
+  static private boolean jj_3R_38()
+ {
     if (jj_3R_46()) return true;
     return false;
   }
 
-  static private boolean jj_3R_29() {
+  static private boolean jj_3R_29()
+ {
     if (jj_scan_token(REG_IDENT)) return true;
     return false;
   }
 
-  static private boolean jj_3_4() {
+  static private boolean jj_3_4()
+ {
     if (jj_scan_token(LABEL)) return true;
     return false;
   }
 
-  static private boolean jj_3R_179() {
+  static private boolean jj_3R_179()
+ {
     if (jj_scan_token(INIT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_155() {
+  static private boolean jj_3R_155()
+ {
     if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
   }
 
-  static private boolean jj_3_3() {
+  static private boolean jj_3_3()
+ {
     if (jj_scan_token(LABEL)) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_186() {
+  static private boolean jj_3R_186()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_162() {
+  static private boolean jj_3R_162()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_79() {
+  static private boolean jj_3R_79()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_31()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_185() {
+  static private boolean jj_3R_185()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_182() {
+  static private boolean jj_3R_182()
+ {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_154() {
+  static private boolean jj_3R_154()
+ {
     if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_78() {
+  static private boolean jj_3R_78()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_180() {
+  static private boolean jj_3R_180()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_142() {
+  static private boolean jj_3R_142()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_154()) {
@@ -3656,28 +3892,33 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_178() {
+  static private boolean jj_3R_178()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_77() {
+  static private boolean jj_3R_77()
+ {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_70() {
+  static private boolean jj_3R_70()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_160() {
+  static private boolean jj_3R_160()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_68() {
+  static private boolean jj_3R_68()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_77()) {
@@ -3690,7 +3931,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_153() {
+  static private boolean jj_3R_153()
+ {
     if (jj_scan_token(FILTER)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
@@ -3719,7 +3961,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_161() {
+  static private boolean jj_3R_161()
+ {
     if (jj_3R_38()) return true;
     Token xsp;
     while (true) {
@@ -3729,7 +3972,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_91() {
+  static private boolean jj_3R_91()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(RENAME)) return true;
@@ -3737,14 +3981,16 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_9() {
+  static private boolean jj_3_9()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_81() {
+  static private boolean jj_3R_81()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(RENAME)) return true;
@@ -3758,7 +4004,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_50() {
+  static private boolean jj_3R_50()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
@@ -3766,7 +4013,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_145() {
+  static private boolean jj_3R_145()
+ {
     if (jj_scan_token(FUNC)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
@@ -3784,7 +4032,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_152() {
+  static private boolean jj_3R_152()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3796,12 +4045,14 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_207() {
+  static private boolean jj_3R_207()
+ {
     if (jj_3R_148()) return true;
     return false;
   }
 
-  static private boolean jj_3R_80() {
+  static private boolean jj_3R_80()
+ {
     if (jj_scan_token(DIVIDE)) return true;
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_29()) return true;
@@ -3814,7 +4065,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_69() {
+  static private boolean jj_3R_69()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_80()) {
@@ -3824,7 +4076,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_58() {
+  static private boolean jj_3R_58()
+ {
     if (jj_3R_68()) return true;
     Token xsp;
     while (true) {
@@ -3834,18 +4087,21 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_159() {
+  static private boolean jj_3R_159()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3_8() {
+  static private boolean jj_3_8()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_144() {
+  static private boolean jj_3R_144()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_159()) {
@@ -3858,7 +4114,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_217() {
+  static private boolean jj_3R_217()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(86)) {
@@ -3868,33 +4125,38 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_43() {
+  static private boolean jj_3R_43()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
     if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_158() {
+  static private boolean jj_3R_158()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_161()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_10() {
+  static private boolean jj_3_10()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_218() {
+  static private boolean jj_3R_218()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_217()) return true;
     return false;
   }
 
-  static private boolean jj_3R_214() {
+  static private boolean jj_3R_214()
+ {
     if (jj_3R_217()) return true;
     Token xsp;
     while (true) {
@@ -3904,14 +4166,16 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_210() {
+  static private boolean jj_3R_210()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_214()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_2() {
+  static private boolean jj_3_2()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(DQUOTE)) return true;
@@ -3919,7 +4183,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_143() {
+  static private boolean jj_3R_143()
+ {
     if (jj_3R_29()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3927,12 +4192,14 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_209() {
+  static private boolean jj_3R_209()
+ {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_205() {
+  static private boolean jj_3R_205()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_209()) {
@@ -3942,7 +4209,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_59() {
+  static private boolean jj_3R_59()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_29()) return true;
@@ -3957,7 +4225,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_49() {
+  static private boolean jj_3R_49()
+ {
     if (jj_3R_58()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -3965,37 +4234,44 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_141() {
+  static private boolean jj_3R_141()
+ {
     if (jj_3R_153()) return true;
     return false;
   }
 
-  static private boolean jj_3R_140() {
+  static private boolean jj_3R_140()
+ {
     if (jj_3R_152()) return true;
     return false;
   }
 
-  static private boolean jj_3R_177() {
+  static private boolean jj_3R_177()
+ {
     if (jj_3R_146()) return true;
     return false;
   }
 
-  static private boolean jj_3R_139() {
+  static private boolean jj_3R_139()
+ {
     if (jj_3R_151()) return true;
     return false;
   }
 
-  static private boolean jj_3R_206() {
+  static private boolean jj_3R_206()
+ {
     if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3R_138() {
+  static private boolean jj_3R_138()
+ {
     if (jj_3R_150()) return true;
     return false;
   }
 
-  static private boolean jj_3R_176() {
+  static private boolean jj_3R_176()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_206()) {
@@ -4005,51 +4281,60 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_175() {
+  static private boolean jj_3R_175()
+ {
     if (jj_scan_token(DLBRACKET)) return true;
     if (jj_3R_205()) return true;
     if (jj_scan_token(DRBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_137() {
+  static private boolean jj_3R_137()
+ {
     if (jj_3R_149()) return true;
     return false;
   }
 
-  static private boolean jj_3R_127() {
+  static private boolean jj_3R_127()
+ {
     if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_216() {
+  static private boolean jj_3R_216()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_174() {
+  static private boolean jj_3R_174()
+ {
     if (jj_scan_token(DLT)) return true;
     if (jj_3R_205()) return true;
     if (jj_scan_token(DGT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_136() {
+  static private boolean jj_3R_136()
+ {
     if (jj_3R_148()) return true;
     return false;
   }
 
-  static private boolean jj_3R_135() {
+  static private boolean jj_3R_135()
+ {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_134() {
+  static private boolean jj_3R_134()
+ {
     if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3R_151() {
+  static private boolean jj_3R_151()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_174()) {
@@ -4064,17 +4349,20 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_133() {
+  static private boolean jj_3R_133()
+ {
     if (jj_3R_146()) return true;
     return false;
   }
 
-  static private boolean jj_3R_132() {
+  static private boolean jj_3R_132()
+ {
     if (jj_3R_145()) return true;
     return false;
   }
 
-  static private boolean jj_3R_42() {
+  static private boolean jj_3R_42()
+ {
     if (jj_3R_49()) return true;
     Token xsp;
     while (true) {
@@ -4084,32 +4372,38 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_131() {
+  static private boolean jj_3R_131()
+ {
     if (jj_3R_144()) return true;
     return false;
   }
 
-  static private boolean jj_3R_130() {
+  static private boolean jj_3R_130()
+ {
     if (jj_3R_143()) return true;
     return false;
   }
 
-  static private boolean jj_3R_129() {
+  static private boolean jj_3R_129()
+ {
     if (jj_3R_142()) return true;
     return false;
   }
 
-  static private boolean jj_3R_212() {
+  static private boolean jj_3R_212()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_123() {
+  static private boolean jj_3R_123()
+ {
     if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_150() {
+  static private boolean jj_3R_150()
+ {
     if (jj_scan_token(A)) return true;
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_38()) return true;
@@ -4117,7 +4411,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_128() {
+  static private boolean jj_3R_128()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_129()) {
@@ -4160,18 +4455,21 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_125() {
+  static private boolean jj_3R_125()
+ {
     if (jj_3R_128()) return true;
     return false;
   }
 
-  static private boolean jj_3R_124() {
+  static private boolean jj_3R_124()
+ {
     if (jj_scan_token(MINUS)) return true;
     if (jj_3R_120()) return true;
     return false;
   }
 
-  static private boolean jj_3R_35() {
+  static private boolean jj_3R_35()
+ {
     if (jj_3R_42()) return true;
     Token xsp;
     while (true) {
@@ -4181,7 +4479,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_120() {
+  static private boolean jj_3R_120()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_124()) {
@@ -4191,7 +4490,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_149() {
+  static private boolean jj_3R_149()
+ {
     if (jj_scan_token(E)) return true;
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_38()) return true;
@@ -4199,17 +4499,20 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_126() {
+  static private boolean jj_3R_126()
+ {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_31() {
+  static private boolean jj_3R_31()
+ {
     if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_121() {
+  static private boolean jj_3R_121()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_126()) {
@@ -4220,7 +4523,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_7() {
+  static private boolean jj_3_7()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(DQUOTE)) return true;
@@ -4228,18 +4532,21 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_18() {
+  static private boolean jj_3_18()
+ {
     if (jj_scan_token(C)) return true;
     if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_204() {
+  static private boolean jj_3R_204()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_116() {
+  static private boolean jj_3R_116()
+ {
     if (jj_3R_120()) return true;
     Token xsp;
     while (true) {
@@ -4249,58 +4556,68 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_17() {
+  static private boolean jj_3_17()
+ {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_203() {
+  static private boolean jj_3R_203()
+ {
     if (jj_scan_token(I)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3_16() {
+  static private boolean jj_3_16()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_202() {
+  static private boolean jj_3R_202()
+ {
     if (jj_scan_token(C)) return true;
     return false;
   }
 
-  static private boolean jj_3R_201() {
+  static private boolean jj_3R_201()
+ {
     if (jj_scan_token(C)) return true;
     if (jj_scan_token(LE)) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_122() {
+  static private boolean jj_3R_122()
+ {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_200() {
+  static private boolean jj_3R_200()
+ {
     if (jj_scan_token(S)) return true;
     return false;
   }
 
-  static private boolean jj_3R_173() {
+  static private boolean jj_3R_173()
+ {
     if (jj_3R_47()) return true;
     return false;
   }
 
-  static private boolean jj_3_1() {
+  static private boolean jj_3_1()
+ {
     if (jj_scan_token(MODULE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_117() {
+  static private boolean jj_3R_117()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_122()) {
@@ -4311,19 +4628,22 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_199() {
+  static private boolean jj_3R_199()
+ {
     if (jj_3R_33()) return true;
     return false;
   }
 
-  static private boolean jj_3R_215() {
+  static private boolean jj_3R_215()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_172() {
+  static private boolean jj_3R_172()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_199()) {
@@ -4345,12 +4665,14 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_15() {
+  static private boolean jj_3_15()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_113() {
+  static private boolean jj_3R_113()
+ {
     if (jj_3R_116()) return true;
     Token xsp;
     while (true) {
@@ -4360,19 +4682,22 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_6() {
+  static private boolean jj_3_6()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_211() {
+  static private boolean jj_3R_211()
+ {
     if (jj_scan_token(DQUOTE)) return true;
     if (jj_3R_29()) return true;
     if (jj_scan_token(DQUOTE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_213() {
+  static private boolean jj_3R_213()
+ {
     if (jj_scan_token(DIVIDE)) return true;
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
@@ -4385,13 +4710,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_114() {
+  static private boolean jj_3R_114()
+ {
     if (jj_3R_45()) return true;
     if (jj_3R_113()) return true;
     return false;
   }
 
-  static private boolean jj_3R_208() {
+  static private boolean jj_3R_208()
+ {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4405,7 +4732,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_111() {
+  static private boolean jj_3R_111()
+ {
     if (jj_3R_113()) return true;
     Token xsp;
     while (true) {
@@ -4415,13 +4743,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_112() {
+  static private boolean jj_3R_112()
+ {
     if (jj_3R_115()) return true;
     if (jj_3R_111()) return true;
     return false;
   }
 
-  static private boolean jj_3R_110() {
+  static private boolean jj_3R_110()
+ {
     if (jj_3R_111()) return true;
     Token xsp;
     while (true) {
@@ -4431,90 +4761,105 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_109() {
+  static private boolean jj_3R_109()
+ {
     if (jj_3R_110()) return true;
     return false;
   }
 
-  static private boolean jj_3R_108() {
+  static private boolean jj_3R_108()
+ {
     if (jj_scan_token(NOT)) return true;
     if (jj_3R_106()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101() {
+  static private boolean jj_3R_101()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_99() {
+  static private boolean jj_3R_99()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_97() {
+  static private boolean jj_3R_97()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_95() {
+  static private boolean jj_3R_95()
+ {
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_195() {
+  static private boolean jj_3R_195()
+ {
     if (jj_3R_45()) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_194() {
+  static private boolean jj_3R_194()
+ {
     if (jj_3R_208()) return true;
     return false;
   }
 
-  static private boolean jj_3R_193() {
+  static private boolean jj_3R_193()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_32()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_41() {
+  static private boolean jj_3R_41()
+ {
     if (jj_scan_token(AND)) return true;
     if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_198() {
+  static private boolean jj_3R_198()
+ {
     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_171() {
+  static private boolean jj_3R_171()
+ {
     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_197() {
+  static private boolean jj_3R_197()
+ {
     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_170() {
+  static private boolean jj_3R_170()
+ {
     if (jj_scan_token(RMIN)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_106() {
+  static private boolean jj_3R_106()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_108()) {
@@ -4524,18 +4869,21 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_196() {
+  static private boolean jj_3R_196()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_39() {
+  static private boolean jj_3R_39()
+ {
     if (jj_3R_47()) return true;
     return false;
   }
 
-  static private boolean jj_3R_169() {
+  static private boolean jj_3R_169()
+ {
     if (jj_scan_token(R)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4556,13 +4904,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_107() {
+  static private boolean jj_3R_107()
+ {
     if (jj_scan_token(AND)) return true;
     if (jj_3R_106()) return true;
     return false;
   }
 
-  static private boolean jj_3R_148() {
+  static private boolean jj_3R_148()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_169()) {
@@ -4580,7 +4930,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_40() {
+  static private boolean jj_3R_40()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_48()) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4589,7 +4940,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_104() {
+  static private boolean jj_3R_104()
+ {
     if (jj_3R_106()) return true;
     Token xsp;
     while (true) {
@@ -4599,13 +4951,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_105() {
+  static private boolean jj_3R_105()
+ {
     if (jj_scan_token(OR)) return true;
     if (jj_3R_104()) return true;
     return false;
   }
 
-  static private boolean jj_3R_34() {
+  static private boolean jj_3R_34()
+ {
     if (jj_3R_40()) return true;
     Token xsp;
     while (true) {
@@ -4615,12 +4969,14 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_5() {
+  static private boolean jj_3_5()
+ {
     if (jj_3R_30()) return true;
     return false;
   }
 
-  static private boolean jj_3R_102() {
+  static private boolean jj_3R_102()
+ {
     if (jj_3R_104()) return true;
     Token xsp;
     while (true) {
@@ -4630,7 +4986,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_30() {
+  static private boolean jj_3R_30()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_34()) {
@@ -4640,13 +4997,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_103() {
+  static private boolean jj_3R_103()
+ {
     if (jj_scan_token(IFF)) return true;
     if (jj_3R_102()) return true;
     return false;
   }
 
-  static private boolean jj_3R_92() {
+  static private boolean jj_3R_92()
+ {
     if (jj_3R_102()) return true;
     Token xsp;
     while (true) {
@@ -4656,20 +5015,23 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_37() {
+  static private boolean jj_3R_37()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_44() {
+  static private boolean jj_3R_44()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_32()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_36() {
+  static private boolean jj_3R_36()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_44()) jj_scanpos = xsp;
@@ -4678,13 +5040,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_93() {
+  static private boolean jj_3R_93()
+ {
     if (jj_scan_token(IMPLIES)) return true;
     if (jj_3R_92()) return true;
     return false;
   }
 
-  static private boolean jj_3R_82() {
+  static private boolean jj_3R_82()
+ {
     if (jj_3R_92()) return true;
     Token xsp;
     while (true) {
@@ -4694,7 +5058,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_33() {
+  static private boolean jj_3R_33()
+ {
     if (jj_scan_token(S)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4710,7 +5075,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_83() {
+  static private boolean jj_3R_83()
+ {
     if (jj_scan_token(QMARK)) return true;
     if (jj_3R_82()) return true;
     if (jj_scan_token(COLON)) return true;
@@ -4718,46 +5084,54 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3_14() {
+  static private boolean jj_3_14()
+ {
     if (jj_3R_32()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_13() {
+  static private boolean jj_3_13()
+ {
     if (jj_3R_32()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_12() {
+  static private boolean jj_3_12()
+ {
     if (jj_3R_32()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3_11() {
+  static private boolean jj_3_11()
+ {
     if (jj_3R_32()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_168() {
+  static private boolean jj_3R_168()
+ {
     if (jj_3R_47()) return true;
     return false;
   }
 
-  static private boolean jj_3R_67() {
+  static private boolean jj_3R_67()
+ {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_66() {
+  static private boolean jj_3R_66()
+ {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_75() {
+  static private boolean jj_3R_75()
+ {
     if (jj_3R_82()) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4765,27 +5139,32 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_100() {
+  static private boolean jj_3R_100()
+ {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_98() {
+  static private boolean jj_3R_98()
+ {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_96() {
+  static private boolean jj_3R_96()
+ {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_94() {
+  static private boolean jj_3R_94()
+ {
     if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_57() {
+  static private boolean jj_3R_57()
+ {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4797,13 +5176,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_89() {
+  static private boolean jj_3R_89()
+ {
     if (jj_scan_token(EQ)) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_88() {
+  static private boolean jj_3R_88()
+ {
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(COMMA)) return true;
@@ -4812,7 +5193,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_47() {
+  static private boolean jj_3R_47()
+ {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_38()) return true;
     if (jj_scan_token(RBRACE)) return true;
@@ -4824,7 +5206,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_87() {
+  static private boolean jj_3R_87()
+ {
     if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4835,7 +5218,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_86() {
+  static private boolean jj_3R_86()
+ {
     if (jj_scan_token(GE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4846,7 +5230,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_85() {
+  static private boolean jj_3R_85()
+ {
     if (jj_scan_token(LT)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4857,7 +5242,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_84() {
+  static private boolean jj_3R_84()
+ {
     if (jj_scan_token(LE)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -4868,7 +5254,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_76() {
+  static private boolean jj_3R_76()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_84()) {
@@ -4890,32 +5277,38 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_61() {
+  static private boolean jj_3R_61()
+ {
     if (jj_3R_75()) return true;
     return false;
   }
 
-  static private boolean jj_3R_74() {
+  static private boolean jj_3R_74()
+ {
     if (jj_3R_76()) return true;
     return false;
   }
 
-  static private boolean jj_3R_73() {
+  static private boolean jj_3R_73()
+ {
     if (jj_scan_token(G)) return true;
     return false;
   }
 
-  static private boolean jj_3R_72() {
+  static private boolean jj_3R_72()
+ {
     if (jj_scan_token(F)) return true;
     return false;
   }
 
-  static private boolean jj_3R_71() {
+  static private boolean jj_3R_71()
+ {
     if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_60() {
+  static private boolean jj_3R_60()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_71()) {
@@ -4931,40 +5324,47 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_54() {
+  static private boolean jj_3R_54()
+ {
     if (jj_scan_token(LE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_189() {
+  static private boolean jj_3R_189()
+ {
     if (jj_3R_45()) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_188() {
+  static private boolean jj_3R_188()
+ {
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_32()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_53() {
+  static private boolean jj_3R_53()
+ {
     if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_52() {
+  static private boolean jj_3R_52()
+ {
     if (jj_scan_token(LT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_51() {
+  static private boolean jj_3R_51()
+ {
     if (jj_scan_token(GT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_45() {
+  static private boolean jj_3R_45()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_51()) {
@@ -4980,34 +5380,39 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_192() {
+  static private boolean jj_3R_192()
+ {
     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_191()
+ {
     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_190() {
+  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_167() {
+  static private boolean jj_3R_167()
+ {
     if (jj_scan_token(PMAX)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_55() {
+  static private boolean jj_3R_55()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_60()) {
@@ -5017,19 +5422,22 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_166() {
+  static private boolean jj_3R_166()
+ {
     if (jj_scan_token(PMIN)) return true;
     if (jj_scan_token(EQ)) return true;
     if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_119() {
+  static private boolean jj_3R_119()
+ {
     if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_115() {
+  static private boolean jj_3R_115()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_118()) {
@@ -5039,27 +5447,32 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_118() {
+  static private boolean jj_3R_118()
+ {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  static private boolean jj_3R_65() {
+  static private boolean jj_3R_65()
+ {
     if (jj_3R_76()) return true;
     return false;
   }
 
-  static private boolean jj_3R_64() {
+  static private boolean jj_3R_64()
+ {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_63() {
+  static private boolean jj_3R_63()
+ {
     if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_165() {
+  static private boolean jj_3R_165()
+ {
     if (jj_scan_token(P)) return true;
     Token xsp;
     xsp = jj_scanpos;
@@ -5078,12 +5491,14 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_62() {
+  static private boolean jj_3R_62()
+ {
     if (jj_scan_token(U)) return true;
     return false;
   }
 
-  static private boolean jj_3R_147() {
+  static private boolean jj_3R_147()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_165()) {
@@ -5101,7 +5516,8 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_56() {
+  static private boolean jj_3R_56()
+ {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_62()) {
@@ -5117,13 +5533,15 @@ public class PrismParser implements PrismParserConstants {
     return false;
   }
 
-  static private boolean jj_3R_187() {
+  static private boolean jj_3R_187()
+ {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_38()) return true;
     return false;
   }
 
-  static private boolean jj_3R_48() {
+  static private boolean jj_3R_48()
+ {
     if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
@@ -5279,6 +5697,7 @@ public class PrismParser implements PrismParserConstants {
     throw generateParseException();
   }
 
+  @SuppressWarnings("serial")
   static private final class LookaheadSuccess extends java.lang.Error { }
   static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
   static private boolean jj_scan_token(int kind) {
@@ -5322,7 +5741,7 @@ public class PrismParser implements PrismParserConstants {
     return t;
   }
 
-  static private int jj_ntk() {
+  static private int jj_ntk_f() {
     if ((jj_nt=token.next) == null)
       return (jj_ntk = (token.next=token_source.getNextToken()).kind);
     else
@@ -5461,3 +5880,6 @@ public class PrismParser implements PrismParserConstants {
   }
 
 }
+
+//-----------------------------------------------------------------------------------
+
diff --git a/prism/src/parser/PrismParser.jj b/prism/src/parser/PrismParser.jj
index a7850125..21f046cf 100644
--- a/prism/src/parser/PrismParser.jj
+++ b/prism/src/parser/PrismParser.jj
@@ -355,7 +355,7 @@ public class PrismParser
 	 */
 	public int getTabSize()
 	{
-		return SimpleCharStream.getTabSize(0);
+		return SimpleCharStream.getTabSize();
 	}
 	
 	/**
diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java
index 6920535b..d7397b9d 100644
--- a/prism/src/parser/PrismParserTokenManager.java
+++ b/prism/src/parser/PrismParserTokenManager.java
@@ -1,3 +1,4 @@
+/* PrismParserTokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. PrismParserTokenManager.java */
 package parser;
 import java.io.*;
@@ -13,15 +14,13 @@ import prism.ModelType;
 import prism.PrismLangException;
 
 /** Token Manager. */
-public class PrismParserTokenManager implements PrismParserConstants
-{
+@SuppressWarnings("unused")public class PrismParserTokenManager implements PrismParserConstants {
 
   /** Debug output. */
   public static  java.io.PrintStream debugStream = System.out;
   /** Set debug output. */
   public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
-{
+private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1){
    switch (pos)
    {
       case 0:
@@ -177,8 +176,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
          return -1;
    }
 }
-private static final int jjStartNfa_0(int pos, long active0, long active1)
-{
+private static final int jjStartNfa_0(int pos, long active0, long active1){
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
 }
 static private int jjStopAtPos(int pos, int kind)
@@ -187,8 +185,7 @@ static private int jjStopAtPos(int pos, int kind)
    jjmatchedPos = pos;
    return pos + 1;
 }
-static private int jjMoveStringLiteralDfa0_0()
-{
+static private int jjMoveStringLiteralDfa0_0(){
    switch(curChar)
    {
       case 33:
@@ -302,8 +299,7 @@ static private int jjMoveStringLiteralDfa0_0()
          return jjMoveNfa_0(0, 0);
    }
 }
-static private int jjMoveStringLiteralDfa1_0(long active0, long active1)
-{
+static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(0, active0, active1);
@@ -379,8 +375,7 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1)
    }
    return jjStartNfa_0(0, active0, active1);
 }
-static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
-{
+static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_0(0, old0, old1);
    try { curChar = input_stream.readChar(); }
@@ -441,8 +436,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
    }
    return jjStartNfa_0(1, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(1, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -512,8 +506,7 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0)
    }
    return jjStartNfa_0(2, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(2, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -558,8 +551,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0)
    }
    return jjStartNfa_0(3, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(3, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -608,8 +600,7 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0)
    }
    return jjStartNfa_0(4, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(4, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -642,8 +633,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0)
    }
    return jjStartNfa_0(5, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa7_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(5, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -668,8 +658,7 @@ static private int jjMoveStringLiteralDfa7_0(long old0, long active0)
    }
    return jjStartNfa_0(6, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa8_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa8_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(6, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -700,8 +689,7 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0)
    }
    return jjStartNfa_0(7, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa9_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa9_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(7, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -728,8 +716,7 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0)
    }
    return jjStartNfa_0(8, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa10_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa10_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(8, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -748,8 +735,7 @@ static private int jjMoveStringLiteralDfa10_0(long old0, long active0)
    }
    return jjStartNfa_0(9, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa11_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa11_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(9, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -770,8 +756,7 @@ static private int jjMoveStringLiteralDfa11_0(long old0, long active0)
    }
    return jjStartNfa_0(10, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa12_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa12_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(10, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -792,8 +777,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0)
    }
    return jjStartNfa_0(11, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa13_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa13_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(11, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -810,8 +794,7 @@ static private int jjMoveStringLiteralDfa13_0(long old0, long active0)
    }
    return jjStartNfa_0(12, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa14_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa14_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(12, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -828,8 +811,7 @@ static private int jjMoveStringLiteralDfa14_0(long old0, long active0)
    }
    return jjStartNfa_0(13, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa15_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa15_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(13, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -885,7 +867,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 89)
                         kind = 89;
-                     jjCheckNAdd(22);
+                     { jjCheckNAdd(22); }
                   }
                   else if (curChar == 39)
                   {
@@ -893,14 +875,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 88;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 87)
                         kind = 87;
-                     jjCheckNAddStates(0, 3);
+                     { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
                   {
@@ -908,16 +890,16 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;
                   }
                   else if (curChar == 35)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   else if (curChar == 46)
-                     jjCheckNAdd(11);
+                     { jjCheckNAdd(11); }
                   else if (curChar == 47)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
                      if (kind > 86)
                         kind = 86;
-                     jjCheckNAdd(8);
+                     { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
@@ -930,14 +912,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  jjCheckNAddStates(4, 6);
+                  { jjCheckNAddStates(4, 6); }
                   break;
                case 2:
                   if ((0xffffffffffffdbffL & l) == 0L)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  jjCheckNAddStates(4, 6);
+                  { jjCheckNAddStates(4, 6); }
                   break;
                case 3:
                   if ((0x2400L & l) != 0L && kind > 2)
@@ -960,14 +942,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 86)
                      kind = 86;
-                  jjCheckNAdd(8);
+                  { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 86)
                      kind = 86;
-                  jjCheckNAdd(8);
+                  { jjCheckNAdd(8); }
                   break;
                case 9:
                   if (curChar == 48 && kind > 86)
@@ -975,33 +957,33 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 10:
                   if (curChar == 46)
-                     jjCheckNAdd(11);
+                     { jjCheckNAdd(11); }
                   break;
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 87)
                      kind = 87;
-                  jjCheckNAddTwoStates(11, 12);
+                  { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(14);
+                     { jjCheckNAdd(14); }
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 87)
                      kind = 87;
-                  jjCheckNAdd(14);
+                  { jjCheckNAdd(14); }
                   break;
                case 15:
                   if (curChar == 35)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 16:
                   if ((0xfffffff7ffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
                   if (curChar == 35 && kind > 90)
@@ -1012,11 +994,11 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 87)
                      kind = 87;
-                  jjCheckNAddStates(0, 3);
+                  { jjCheckNAddStates(0, 3); }
                   break;
                case 20:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if (curChar == 39 && kind > 88)
@@ -1027,7 +1009,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 89)
                      kind = 89;
-                  jjCheckNAdd(22);
+                  { jjCheckNAdd(22); }
                   break;
                default : break;
             }
@@ -1045,40 +1027,40 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 89)
                         kind = 89;
-                     jjCheckNAdd(22);
+                     { jjCheckNAdd(22); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 89)
                      kind = 89;
-                  jjCheckNAddStates(7, 9);
+                  { jjCheckNAddStates(7, 9); }
                   break;
                case 2:
                   if (kind > 2)
                      kind = 2;
-                  jjAddStates(4, 6);
+                  { jjAddStates(4, 6); }
                   break;
                case 12:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(10, 11);
+                     { jjAddStates(10, 11); }
                   break;
                case 16:
-                  jjAddStates(12, 13);
+                  { jjAddStates(12, 13); }
                   break;
                case 20:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(20, 21);
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 22:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 89)
                      kind = 89;
-                  jjCheckNAdd(22);
+                  { jjCheckNAdd(22); }
                   break;
                default : break;
             }
@@ -1086,7 +1068,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
       }
       else
       {
-         int hiByte = (int)(curChar >> 8);
+         int hiByte = (curChar >> 8);
          int i1 = hiByte >> 6;
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
@@ -1100,13 +1082,13 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  jjAddStates(4, 6);
+                  { jjAddStates(4, 6); }
                   break;
                case 16:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(12, 13);
+                     { jjAddStates(12, 13); }
                   break;
-               default : break;
+               default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
          } while(i != startsAt);
       }
@@ -1158,69 +1140,6 @@ public static final String[] jjstrLiteralImages = {
 "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", 
 "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", 
 "\77", "\42", null, null, null, null, null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-static final long[] jjtoToken = {
-   0xfffffffffffffff9L, 0xfffffffL, 
-};
-static final long[] jjtoSkip = {
-   0x6L, 0x0L, 
-};
-static final long[] jjtoSpecial = {
-   0x6L, 0x0L, 
-};
-static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[23];
-static private final int[] jjstateSet = new int[46];
-static protected char curChar;
-/** Constructor. */
-public PrismParserTokenManager(SimpleCharStream stream){
-   if (input_stream != null)
-      throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
-   input_stream = stream;
-}
-
-/** Constructor. */
-public PrismParserTokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-static private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 23; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-static public void SwitchTo(int lexState)
-{
-   if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
-
 static protected Token jjFillToken()
 {
    final Token t;
@@ -1269,6 +1188,7 @@ public static Token getNextToken()
    catch(java.io.IOException e)
    {
       jjmatchedKind = 0;
+      jjmatchedPos = -1;
       matchedToken = jjFillToken();
       matchedToken.specialToken = specialToken;
       return matchedToken;
@@ -1357,4 +1277,72 @@ static private void jjCheckNAddStates(int start, int end)
    } while (start++ != end);
 }
 
+    /** Constructor. */
+    public PrismParserTokenManager(SimpleCharStream stream){
+
+      if (input_stream != null)
+        throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+
+    input_stream = stream;
+  }
+
+  /** Constructor. */
+  public PrismParserTokenManager (SimpleCharStream stream, int lexState){
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream)
+  {
+    jjmatchedPos = jjnewStateCnt = 0;
+    curLexState = defaultLexState;
+    input_stream = stream;
+    ReInitRounds();
+  }
+
+  static private void ReInitRounds()
+  {
+    int i;
+    jjround = 0x80000001;
+    for (i = 23; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream, int lexState)
+  {
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Switch to specified lex state. */
+  static public void SwitchTo(int lexState)
+  {
+    if (lexState >= 1 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+    else
+      curLexState = lexState;
+  }
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+};
+static final long[] jjtoToken = {
+   0xfffffffffffffff9L, 0xfffffffL, 
+};
+static final long[] jjtoSkip = {
+   0x6L, 0x0L, 
+};
+static final long[] jjtoSpecial = {
+   0x6L, 0x0L, 
+};
+    static protected SimpleCharStream  input_stream;
+
+    static private final int[] jjrounds = new int[23];
+    static private final int[] jjstateSet = new int[2 * 23];
+
+    
+    static protected char curChar;
 }
diff --git a/prism/src/parser/SimpleCharStream.java b/prism/src/parser/SimpleCharStream.java
index a585b13b..063996ff 100644
--- a/prism/src/parser/SimpleCharStream.java
+++ b/prism/src/parser/SimpleCharStream.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 6.0 */
 /* JavaCCOptions:STATIC=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package parser;
 
@@ -31,9 +31,10 @@ public class SimpleCharStream
   static protected int maxNextCharInd = 0;
   static protected int inBuf = 0;
   static protected int tabSize = 8;
+  static protected boolean trackLineColumn = true;
 
-  static protected void setTabSize(int i) { tabSize = i; }
-  static protected int getTabSize(int i) { return tabSize; }
+  static public void setTabSize(int i) { tabSize = i; }
+  static public int getTabSize() { return tabSize; }
 
 
   static protected void ExpandBuff(boolean wrapAround)
@@ -471,5 +472,7 @@ public class SimpleCharStream
     column = bufcolumn[j];
   }
 
+  static boolean getTrackLineColumn() { return trackLineColumn; }
+  static void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=63f42dc268ec5028b8be6ca7c2cc6f11 (do not edit this line) */
+/* JavaCC - OriginalChecksum=dcc1df1ef735c110db7f51764c3f7f64 (do not edit this line) */
diff --git a/prism/src/parser/Token.java b/prism/src/parser/Token.java
index 3ae6b848..acc5cc30 100644
--- a/prism/src/parser/Token.java
+++ b/prism/src/parser/Token.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 6.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package parser;
 
@@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=5577319da3c994ced3a7d8398937b710 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7d751264ae152bf5b6855a5f69a4ab67 (do not edit this line) */
diff --git a/prism/src/parser/TokenMgrError.java b/prism/src/parser/TokenMgrError.java
index f649b633..bc8ef8be 100644
--- a/prism/src/parser/TokenMgrError.java
+++ b/prism/src/parser/TokenMgrError.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 6.0 */
 /* JavaCCOptions: */
 package parser;
 
@@ -144,4 +144,4 @@ public class TokenMgrError extends Error
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=7ef45f5276cce4d58ec92f075d668e1f (do not edit this line) */
+/* JavaCC - OriginalChecksum=6c4705c2bebd89492711d8a1e624d837 (do not edit this line) */
diff --git a/prism/src/pta/parser/PTAParser.java b/prism/src/pta/parser/PTAParser.java
index 59513e31..741fe85b 100644
--- a/prism/src/pta/parser/PTAParser.java
+++ b/prism/src/pta/parser/PTAParser.java
@@ -1,3 +1,4 @@
+/* PTAParser.java */
 /* Generated By:JavaCC: Do not edit this line. PTAParser.java */
 package pta.parser;
 
@@ -194,14 +195,15 @@ public class PTAParser implements PTAParserConstants {
 //-----------------------------------------------------------------------------------
 
 // PTA
-  static final public astPTA PTA() throws ParseException {
-        astPTA pta = new astPTA();
+  static final public 
+astPTA PTA() throws ParseException {astPTA pta = new astPTA();
     label_1:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACE:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACE:{
         ;
         break;
+        }
       default:
         jj_la1[0] = jj_gen;
         break label_1;
@@ -209,47 +211,50 @@ public class PTAParser implements PTAParserConstants {
       Location(pta);
     }
     jj_consume_token(0);
-                {if (true) return pta;}
+{if ("" != null) return pta;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void Location(astPTA pta) throws ParseException {
-        String name;
+  static final public void Location(astPTA pta) throws ParseException {String name;
         LinkedHashSet<Constraint> constrs;
     jj_consume_token(LBRACE);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case INIT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INIT:{
       jj_consume_token(INIT);
       break;
+      }
     default:
       jj_la1[1] = jj_gen;
       ;
     }
     jj_consume_token(NODE);
     name = Identifier();
-                                   pta.addLocation(name);
+pta.addLocation(name);
     jj_consume_token(SEMICOLON);
     constrs = ConstraintList(pta);
-                                                  pta.setInvariantConditions(name, constrs);
+pta.setInvariantConditions(name, constrs);
     label_2:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case LBRACKET:
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:{
         ;
         break;
+        }
       default:
         jj_la1[2] = jj_gen;
         break label_2;
       }
       Transition(pta, name);
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case RBRACE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case RBRACE:{
       jj_consume_token(RBRACE);
       break;
-    case TIMES:
+      }
+    case TIMES:{
       jj_consume_token(TIMES);
       break;
+      }
     default:
       jj_la1[3] = jj_gen;
       jj_consume_token(-1);
@@ -257,17 +262,17 @@ public class PTAParser implements PTAParserConstants {
     }
   }
 
-  static final public void Transition(astPTA pta, String locName) throws ParseException {
-        astTransition tr;
+  static final public void Transition(astPTA pta, String locName) throws ParseException {astTransition tr;
     jj_consume_token(LBRACKET);
-                     tr = pta.addTransition(locName);
+tr = pta.addTransition(locName);
     label_3:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TRAN:
-      case REG_IDENT:
+      case REG_IDENT:{
         ;
         break;
+        }
       default:
         jj_la1[4] = jj_gen;
         break label_3;
@@ -277,18 +282,18 @@ public class PTAParser implements PTAParserConstants {
     jj_consume_token(RBRACKET);
   }
 
-  static final public void Edge(astPTA pta, astTransition tr) throws ParseException {
-        LinkedHashSet<Constraint> constrs;
+  static final public void Edge(astPTA pta, astTransition tr) throws ParseException {LinkedHashSet<Constraint> constrs;
         String action = null, dest;
         double p;
         astEdge edge;
         HashMap<Integer,Integer> resets;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       action = Identifier();
       jj_consume_token(OR);
       jj_consume_token(OR);
       break;
+      }
     default:
       jj_la1[5] = jj_gen;
       ;
@@ -301,23 +306,23 @@ public class PTAParser implements PTAParserConstants {
     resets = Resets(pta);
     jj_consume_token(SEMICOLON);
     p = Probability();
-                tr.setAction(action);
+tr.setAction(action);
                 edge = tr.addEdge(p, dest);
                 for (Map.Entry<Integer,Integer> e : resets.entrySet()) edge.addReset(e.getKey(), e.getValue());
                 for (Constraint c : constrs) tr.addGuardConstraint(c);
   }
 
-  static final public LinkedHashSet<Constraint> ConstraintList(astPTA pta) throws ParseException {
-        LinkedHashSet<Constraint> constrs = new LinkedHashSet<Constraint>();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+  static final public LinkedHashSet<Constraint> ConstraintList(astPTA pta) throws ParseException {LinkedHashSet<Constraint> constrs = new LinkedHashSet<Constraint>();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       Constraint(pta, constrs);
       label_4:
       while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case COMMA:
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
           ;
           break;
+          }
         default:
           jj_la1[6] = jj_gen;
           break label_4;
@@ -326,48 +331,54 @@ public class PTAParser implements PTAParserConstants {
         Constraint(pta, constrs);
       }
       break;
-    case TRUE:
+      }
+    case TRUE:{
       jj_consume_token(TRUE);
       break;
+      }
     default:
       jj_la1[7] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return constrs;}
+{if ("" != null) return constrs;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void Constraint(astPTA pta, LinkedHashSet<Constraint> constrs) throws ParseException {
-        String clock1Name, clock2Name;
+  static final public void Constraint(astPTA pta, LinkedHashSet<Constraint> constrs) throws ParseException {String clock1Name, clock2Name;
         int clock1, clock2, val;
         Token t;
     clock1Name = Identifier();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case LT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:{
       t = jj_consume_token(LT);
       break;
-    case LE:
+      }
+    case LE:{
       t = jj_consume_token(LE);
       break;
-    case GT:
+      }
+    case GT:{
       t = jj_consume_token(GT);
       break;
-    case GE:
+      }
+    case GE:{
       t = jj_consume_token(GE);
       break;
-    case EQ:
+      }
+    case EQ:{
       t = jj_consume_token(EQ);
       break;
+      }
     default:
       jj_la1[8] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_INT:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_INT:{
       val = Integer();
-                clock1 = pta.getOrAddClock(clock1Name);
+clock1 = pta.getOrAddClock(clock1Name);
                 switch (t.kind) {
                 case PTAParserConstants.LT:
                         constrs.add(Constraint.buildLt(clock1, val)); break;
@@ -382,9 +393,10 @@ public class PTAParser implements PTAParserConstants {
                         constrs.add(Constraint.buildGeq(clock1, val)); break;
                 }
       break;
-    case REG_IDENT:
+      }
+    case REG_IDENT:{
       clock2Name = Identifier();
-                clock1 = pta.getOrAddClock(clock1Name);
+clock1 = pta.getOrAddClock(clock1Name);
                 clock2 = pta.getOrAddClock(clock2Name);
                 switch (t.kind) {
                 case PTAParserConstants.LT:
@@ -393,6 +405,7 @@ public class PTAParser implements PTAParserConstants {
                         System.err.println("Error: Unsupported constraint type"); System.exit(1);
                 }
       break;
+      }
     default:
       jj_la1[9] = jj_gen;
       jj_consume_token(-1);
@@ -400,17 +413,17 @@ public class PTAParser implements PTAParserConstants {
     }
   }
 
-  static final public HashMap<Integer,Integer> Resets(astPTA pta) throws ParseException {
-        HashMap<Integer,Integer> resets = new HashMap<Integer,Integer>();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_IDENT:
+  static final public HashMap<Integer,Integer> Resets(astPTA pta) throws ParseException {HashMap<Integer,Integer> resets = new HashMap<Integer,Integer>();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_IDENT:{
       Reset(pta, resets);
       label_5:
       while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case COMMA:
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
           ;
           break;
+          }
         default:
           jj_la1[10] = jj_gen;
           break label_5;
@@ -419,45 +432,47 @@ public class PTAParser implements PTAParserConstants {
         Reset(pta, resets);
       }
       break;
-    case NULL:
+      }
+    case NULL:{
       jj_consume_token(NULL);
       break;
+      }
     default:
       jj_la1[11] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return resets;}
+{if ("" != null) return resets;}
     throw new Error("Missing return statement in function");
   }
 
-  static final public void Reset(astPTA pta, HashMap<Integer,Integer> resets) throws ParseException {
-        String clockName;
+  static final public void Reset(astPTA pta, HashMap<Integer,Integer> resets) throws ParseException {String clockName;
         int clock;
         int val;
     clockName = Identifier();
     jj_consume_token(EQ);
     val = Integer();
-                clock = pta.getOrAddClock(clockName);
+clock = pta.getOrAddClock(clockName);
                 resets.put(clock, val);
   }
 
-  static final public double Probability() throws ParseException {
-        Token t;
+  static final public double Probability() throws ParseException {Token t;
         double d;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case REG_DOUBLE:
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REG_DOUBLE:{
       t = jj_consume_token(REG_DOUBLE);
       break;
-    case REG_INT:
+      }
+    case REG_INT:{
       t = jj_consume_token(REG_INT);
       break;
+      }
     default:
       jj_la1[12] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-          {if (true) return Double.parseDouble(t.image);}
+{if ("" != null) return Double.parseDouble(t.image);}
     throw new Error("Missing return statement in function");
   }
 
@@ -466,16 +481,18 @@ public class PTAParser implements PTAParserConstants {
 //-----------------------------------------------------------------------------------
 
 // Identifier (returns String)
-  static final public String Identifier() throws ParseException {
+  static final public 
+String Identifier() throws ParseException {
     jj_consume_token(REG_IDENT);
-                      {if (true) return getToken(0).image;}
+{if ("" != null) return getToken(0).image;}
     throw new Error("Missing return statement in function");
   }
 
 // Integer
-  static final public int Integer() throws ParseException {
+  static final public 
+int Integer() throws ParseException {
     jj_consume_token(REG_INT);
-                    {if (true) return Integer.parseInt(getToken(0).image);}
+{if ("" != null) return Integer.parseInt(getToken(0).image);}
     throw new Error("Missing return statement in function");
   }
 
@@ -624,7 +641,7 @@ public class PTAParser implements PTAParserConstants {
     return t;
   }
 
-  static private int jj_ntk() {
+  static private int jj_ntk_f() {
     if ((jj_nt=token.next) == null)
       return (jj_ntk = (token.next=token_source.getNextToken()).kind);
     else
@@ -678,3 +695,6 @@ public class PTAParser implements PTAParserConstants {
   }
 
 }
+
+//-----------------------------------------------------------------------------------
+
diff --git a/prism/src/pta/parser/PTAParserTokenManager.java b/prism/src/pta/parser/PTAParserTokenManager.java
index d80906c3..b423b33b 100644
--- a/prism/src/pta/parser/PTAParserTokenManager.java
+++ b/prism/src/pta/parser/PTAParserTokenManager.java
@@ -1,3 +1,4 @@
+/* PTAParserTokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. PTAParserTokenManager.java */
 package pta.parser;
 import java.io.*;
@@ -6,15 +7,13 @@ import pta.*;
 import prism.PrismLangException;
 
 /** Token Manager. */
-public class PTAParserTokenManager implements PTAParserConstants
-{
+@SuppressWarnings("unused")public class PTAParserTokenManager implements PTAParserConstants {
 
   /** Debug output. */
   public static  java.io.PrintStream debugStream = System.out;
   /** Set debug output. */
   public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private static final int jjStopStringLiteralDfa_0(int pos, long active0)
-{
+private static final int jjStopStringLiteralDfa_0(int pos, long active0){
    switch (pos)
    {
       case 0:
@@ -46,8 +45,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0)
          return -1;
    }
 }
-private static final int jjStartNfa_0(int pos, long active0)
-{
+private static final int jjStartNfa_0(int pos, long active0){
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
 }
 static private int jjStopAtPos(int pos, int kind)
@@ -56,8 +54,7 @@ static private int jjStopAtPos(int pos, int kind)
    jjmatchedPos = pos;
    return pos + 1;
 }
-static private int jjMoveStringLiteralDfa0_0()
-{
+static private int jjMoveStringLiteralDfa0_0(){
    switch(curChar)
    {
       case 33:
@@ -121,8 +118,7 @@ static private int jjMoveStringLiteralDfa0_0()
          return jjMoveNfa_0(0, 0);
    }
 }
-static private int jjMoveStringLiteralDfa1_0(long active0)
-{
+static private int jjMoveStringLiteralDfa1_0(long active0){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(0, active0);
@@ -165,8 +161,7 @@ static private int jjMoveStringLiteralDfa1_0(long active0)
    }
    return jjStartNfa_0(0, active0);
 }
-static private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(0, old0);
    try { curChar = input_stream.readChar(); }
@@ -191,8 +186,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0)
    }
    return jjStartNfa_0(1, active0);
 }
-static private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
+static private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(1, old0);
    try { curChar = input_stream.readChar(); }
@@ -259,7 +253,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 38)
                         kind = 38;
-                     jjCheckNAddStates(0, 3);
+                     { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
                   {
@@ -267,14 +261,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;
                   }
                   else if (curChar == 46)
-                     jjCheckNAdd(10);
+                     { jjCheckNAdd(10); }
                   else if (curChar == 35)
-                     jjCheckNAddStates(4, 6);
+                     { jjCheckNAddStates(4, 6); }
                   if ((0x3fe000000000000L & l) != 0L)
                   {
                      if (kind > 37)
                         kind = 37;
-                     jjCheckNAdd(7);
+                     { jjCheckNAdd(7); }
                   }
                   else if (curChar == 48)
                   {
@@ -287,7 +281,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 40)
                         kind = 40;
-                     jjCheckNAdd(18);
+                     { jjCheckNAdd(18); }
                   }
                   else if (curChar == 39)
                   {
@@ -295,15 +289,15 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 39;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 1:
                   if (curChar == 35)
-                     jjCheckNAddStates(4, 6);
+                     { jjCheckNAddStates(4, 6); }
                   break;
                case 2:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     jjCheckNAddStates(4, 6);
+                     { jjCheckNAddStates(4, 6); }
                   break;
                case 3:
                   if ((0x2400L & l) != 0L && kind > 2)
@@ -322,14 +316,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 37)
                      kind = 37;
-                  jjCheckNAdd(7);
+                  { jjCheckNAdd(7); }
                   break;
                case 7:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 37)
                      kind = 37;
-                  jjCheckNAdd(7);
+                  { jjCheckNAdd(7); }
                   break;
                case 8:
                   if (curChar == 48 && kind > 37)
@@ -337,36 +331,36 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 9:
                   if (curChar == 46)
-                     jjCheckNAdd(10);
+                     { jjCheckNAdd(10); }
                   break;
                case 10:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 38)
                      kind = 38;
-                  jjCheckNAddTwoStates(10, 11);
+                  { jjCheckNAddTwoStates(10, 11); }
                   break;
                case 12:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(13);
+                     { jjCheckNAdd(13); }
                   break;
                case 13:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 38)
                      kind = 38;
-                  jjCheckNAdd(13);
+                  { jjCheckNAdd(13); }
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 38)
                      kind = 38;
-                  jjCheckNAddStates(0, 3);
+                  { jjCheckNAddStates(0, 3); }
                   break;
                case 16:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
                   if (curChar == 39 && kind > 39)
@@ -377,7 +371,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  jjCheckNAdd(18);
+                  { jjCheckNAdd(18); }
                   break;
                default : break;
             }
@@ -395,35 +389,35 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  jjCheckNAddStates(7, 9);
+                  { jjCheckNAddStates(7, 9); }
                   break;
                case 19:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 40)
                         kind = 40;
-                     jjCheckNAdd(18);
+                     { jjCheckNAdd(18); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 2:
-                  jjAddStates(4, 6);
+                  { jjAddStates(4, 6); }
                   break;
                case 11:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(10, 11);
+                     { jjAddStates(10, 11); }
                   break;
                case 16:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
+                     { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 18:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 40)
                      kind = 40;
-                  jjCheckNAdd(18);
+                  { jjCheckNAdd(18); }
                   break;
                default : break;
             }
@@ -439,7 +433,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
             {
                case 2:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(4, 6);
+                     { jjAddStates(4, 6); }
                   break;
                default : break;
             }
@@ -469,69 +463,6 @@ public static final String[] jjstrLiteralImages = {
 "\54", "\56\56", "\50", "\51", "\133", "\135", "\173", "\175", "\75", "\41\75", 
 "\74", "\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", "\77", 
 "\42", null, null, null, null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-static final long[] jjtoToken = {
-   0x3fffffffff9L, 
-};
-static final long[] jjtoSkip = {
-   0x6L, 
-};
-static final long[] jjtoSpecial = {
-   0x6L, 
-};
-static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[19];
-static private final int[] jjstateSet = new int[38];
-static protected char curChar;
-/** Constructor. */
-public PTAParserTokenManager(SimpleCharStream stream){
-   if (input_stream != null)
-      throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
-   input_stream = stream;
-}
-
-/** Constructor. */
-public PTAParserTokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-static private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 19; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-static public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-static public void SwitchTo(int lexState)
-{
-   if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
-
 static protected Token jjFillToken()
 {
    final Token t;
@@ -580,6 +511,7 @@ public static Token getNextToken()
    catch(java.io.IOException e)
    {
       jjmatchedKind = 0;
+      jjmatchedPos = -1;
       matchedToken = jjFillToken();
       matchedToken.specialToken = specialToken;
       return matchedToken;
@@ -668,4 +600,72 @@ static private void jjCheckNAddStates(int start, int end)
    } while (start++ != end);
 }
 
+    /** Constructor. */
+    public PTAParserTokenManager(SimpleCharStream stream){
+
+      if (input_stream != null)
+        throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+
+    input_stream = stream;
+  }
+
+  /** Constructor. */
+  public PTAParserTokenManager (SimpleCharStream stream, int lexState){
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream)
+  {
+    jjmatchedPos = jjnewStateCnt = 0;
+    curLexState = defaultLexState;
+    input_stream = stream;
+    ReInitRounds();
+  }
+
+  static private void ReInitRounds()
+  {
+    int i;
+    jjround = 0x80000001;
+    for (i = 19; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+  }
+
+  /** Reinitialise parser. */
+  static public void ReInit(SimpleCharStream stream, int lexState)
+  {
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Switch to specified lex state. */
+  static public void SwitchTo(int lexState)
+  {
+    if (lexState >= 1 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+    else
+      curLexState = lexState;
+  }
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+};
+static final long[] jjtoToken = {
+   0x3fffffffff9L, 
+};
+static final long[] jjtoSkip = {
+   0x6L, 
+};
+static final long[] jjtoSpecial = {
+   0x6L, 
+};
+    static protected SimpleCharStream  input_stream;
+
+    static private final int[] jjrounds = new int[19];
+    static private final int[] jjstateSet = new int[2 * 19];
+
+    
+    static protected char curChar;
 }
diff --git a/prism/src/pta/parser/ParseException.java b/prism/src/pta/parser/ParseException.java
index 7cb8e768..76200ca2 100644
--- a/prism/src/pta/parser/ParseException.java
+++ b/prism/src/pta/parser/ParseException.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 6.0 */
 /* JavaCCOptions:KEEP_LINE_COL=null */
 package pta.parser;
 
@@ -184,4 +184,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=66646d5c4f8e1407808fefab06fde22c (do not edit this line) */
+/* JavaCC - OriginalChecksum=7c64fc0ab38b25558450547c14c3b451 (do not edit this line) */
diff --git a/prism/src/pta/parser/SimpleCharStream.java b/prism/src/pta/parser/SimpleCharStream.java
index ff3c7516..a2d3b7a2 100644
--- a/prism/src/pta/parser/SimpleCharStream.java
+++ b/prism/src/pta/parser/SimpleCharStream.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 6.0 */
 /* JavaCCOptions:STATIC=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package pta.parser;
 
@@ -31,9 +31,10 @@ public class SimpleCharStream
   static protected int maxNextCharInd = 0;
   static protected int inBuf = 0;
   static protected int tabSize = 8;
+  static protected boolean trackLineColumn = true;
 
-  static protected void setTabSize(int i) { tabSize = i; }
-  static protected int getTabSize(int i) { return tabSize; }
+  static public void setTabSize(int i) { tabSize = i; }
+  static public int getTabSize() { return tabSize; }
 
 
   static protected void ExpandBuff(boolean wrapAround)
@@ -471,5 +472,7 @@ public class SimpleCharStream
     column = bufcolumn[j];
   }
 
+  static boolean getTrackLineColumn() { return trackLineColumn; }
+  static void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=3508e18b871f03c08f232f31778aadb6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=2c820e3833e159fe44638fac71ff5bb8 (do not edit this line) */
diff --git a/prism/src/pta/parser/Token.java b/prism/src/pta/parser/Token.java
index 71e83f03..6b0844c6 100644
--- a/prism/src/pta/parser/Token.java
+++ b/prism/src/pta/parser/Token.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 6.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package pta.parser;
 
@@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=30180ca4550a56d1b05d411407c9e400 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7324b9615dc37b7f09c5841bfcbd980c (do not edit this line) */
diff --git a/prism/src/pta/parser/TokenMgrError.java b/prism/src/pta/parser/TokenMgrError.java
index c38f52c5..8d23a25b 100644
--- a/prism/src/pta/parser/TokenMgrError.java
+++ b/prism/src/pta/parser/TokenMgrError.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 6.0 */
 /* JavaCCOptions: */
 package pta.parser;
 
@@ -144,4 +144,4 @@ public class TokenMgrError extends Error
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=3ba52b1aad3a7caf3b9352f06a64b532 (do not edit this line) */
+/* JavaCC - OriginalChecksum=baf3841bbc9582adae0bb96d10781ed7 (do not edit this line) */