diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
index 51c18ffe..9c5b55a8 100644
--- a/prism/src/parser/PrismParser.java
+++ b/prism/src/parser/PrismParser.java
@@ -533,10 +533,10 @@ begin = getToken(1);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         ;
         break;
         }
@@ -565,10 +565,10 @@ begin = getToken(1);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         prop = Property();
 pf.addProperty(prop);
         label_3:
@@ -640,10 +640,10 @@ begin = getToken(1);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         ;
         break;
         }
@@ -672,10 +672,10 @@ begin = getToken(1);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         prop = Property();
         label_5:
         while (true) {
@@ -722,9 +722,7 @@ Property Property() throws ParseException {String name = null;
         Token begin = null;
 begin = getToken(1);
     if (jj_2_2(2147483647)) {
-      jj_consume_token(DQUOTE);
-      name = Identifier();
-      jj_consume_token(DQUOTE);
+      name = QuotedIdentifier();
       jj_consume_token(COLON);
     } else {
       ;
@@ -850,9 +848,7 @@ void LabelDef(LabelList labelList) throws ParseException, PrismLangException {Ex
         Expression expr = null;
     if (jj_2_3(2147483647)) {
       jj_consume_token(LABEL);
-      jj_consume_token(DQUOTE);
-      name = IdentifierExpression();
-      jj_consume_token(DQUOTE);
+      name = QuotedIdentifierExpression();
       jj_consume_token(EQ);
       expr = Expression(false, false);
       jj_consume_token(SEMICOLON);
@@ -1147,10 +1143,10 @@ updates.addUpdate(null, update);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         prob = Expression(false, false);
         jj_consume_token(COLON);
         update = Update();
@@ -1278,9 +1274,7 @@ RewardStruct RewardStruct() throws ParseException {String name = null, s = null;
         Token begin = null, begin2 = null;
     begin = jj_consume_token(REWARDS);
     if (jj_2_6(2147483647)) {
-      jj_consume_token(DQUOTE);
-      name = Identifier();
-      jj_consume_token(DQUOTE);
+      name = QuotedIdentifier();
 rs.setName(name);
     } else {
       ;
@@ -1312,10 +1306,10 @@ rs.setName(name);
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         ;
         break;
         }
@@ -1371,9 +1365,7 @@ void SystemEndsystem(ModulesFile mf) throws ParseException {String name = null;
         SystemDefn sysdef;
     jj_consume_token(SYSTEM);
     if (jj_2_7(2147483647)) {
-      jj_consume_token(DQUOTE);
-      name = Identifier();
-      jj_consume_token(DQUOTE);
+      name = QuotedIdentifier();
     } else {
       ;
     }
@@ -1594,10 +1586,8 @@ begin = getToken(1);
 sys = new SystemModule(name);
       break;
       }
-    case DQUOTE:{
-      jj_consume_token(DQUOTE);
-      name = Identifier();
-      jj_consume_token(DQUOTE);
+    case REG_QUOTED_IDENT:{
+      name = QuotedIdentifier();
 sys = new SystemReference(name);
       break;
       }
@@ -1778,10 +1768,10 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
     case DLBRACKET:
     case DLT:
     case MINUS:
-    case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:{
+    case REG_IDENT:
+    case REG_QUOTED_IDENT:{
       ret = ExpressionITE(prop, pathprop);
       break;
       }
@@ -1828,10 +1818,10 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB
         case DLBRACKET:
         case DLT:
         case MINUS:
-        case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:{
+        case REG_IDENT:
+        case REG_QUOTED_IDENT:{
           uBound = Expression(false, false);
           break;
           }
@@ -1873,10 +1863,10 @@ exprTemp.setUpperBound(uBound, false);
         case DLBRACKET:
         case DLT:
         case MINUS:
-        case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:{
+        case REG_IDENT:
+        case REG_QUOTED_IDENT:{
           uBound = Expression(false, false);
           break;
           }
@@ -1918,10 +1908,10 @@ exprTemp.setUpperBound(uBound, true);
         case DLBRACKET:
         case DLT:
         case MINUS:
-        case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:{
+        case REG_IDENT:
+        case REG_QUOTED_IDENT:{
           lBound = Expression(false, false);
           break;
           }
@@ -1963,10 +1953,10 @@ exprTemp.setLowerBound(lBound, false);
         case DLBRACKET:
         case DLT:
         case MINUS:
-        case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:{
+        case REG_IDENT:
+        case REG_QUOTED_IDENT:{
           lBound = Expression(false, false);
           break;
           }
@@ -2154,10 +2144,10 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin,
     case DLBRACKET:
     case DLT:
     case MINUS:
-    case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:{
+    case REG_IDENT:
+    case REG_QUOTED_IDENT:{
       ret = ExpressionEquality(prop, pathprop);
       break;
       }
@@ -2346,10 +2336,10 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi
     case LPARENTH:
     case DLBRACKET:
     case DLT:
-    case DQUOTE:
     case REG_INT:
     case REG_DOUBLE:
-    case REG_IDENT:{
+    case REG_IDENT:
+    case REG_QUOTED_IDENT:{
       ret = ExpressionBasic(prop, pathprop);
       break;
       }
@@ -2420,7 +2410,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException
       ret = ExpressionStrategy(prop, pathprop);
       break;
       }
-    case DQUOTE:{
+    case REG_QUOTED_IDENT:{
       ret = ExpressionLabel(prop, pathprop);
       break;
       }
@@ -2979,9 +2969,7 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index =
         Object indexDiv = null;
     jj_consume_token(LBRACE);
     if (jj_2_15(2147483647)) {
-      jj_consume_token(DQUOTE);
-      index = Identifier();
-      jj_consume_token(DQUOTE);
+      index = QuotedIdentifier();
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case A:
@@ -3007,10 +2995,10 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index =
       case DLBRACKET:
       case DLT:
       case MINUS:
-      case DQUOTE:
       case REG_INT:
       case REG_DOUBLE:
-      case REG_IDENT:{
+      case REG_IDENT:
+      case REG_QUOTED_IDENT:{
         index = Expression(false, false);
         break;
         }
@@ -3026,9 +3014,7 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index =
       jj_consume_token(DIVIDE);
       jj_consume_token(LBRACE);
       if (jj_2_16(2147483647)) {
-        jj_consume_token(DQUOTE);
-        indexDiv = Identifier();
-        jj_consume_token(DQUOTE);
+        indexDiv = QuotedIdentifier();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case A:
@@ -3054,10 +3040,10 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index =
         case DLBRACKET:
         case DLT:
         case MINUS:
-        case DQUOTE:
         case REG_INT:
         case REG_DOUBLE:
-        case REG_IDENT:{
+        case REG_IDENT:
+        case REG_QUOTED_IDENT:{
           indexDiv = Expression(false, false);
           break;
           }
@@ -3145,10 +3131,10 @@ exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); exprTemp.
           case DLBRACKET:
           case DLT:
           case MINUS:
-          case DQUOTE:
           case REG_INT:
           case REG_DOUBLE:
-          case REG_IDENT:{
+          case REG_IDENT:
+          case REG_QUOTED_IDENT:{
             expr = Expression(prop, true);
 ret = expr;
             break;
@@ -3332,28 +3318,13 @@ s = getToken(0).image;
 
 // (Property) expression: label (including "init")
   static final public 
-Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {String s;
+Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent qi;
         ExpressionLabel ret = null;
         Token begin;
 if (!prop) {if (true) throw generateParseException();}
-    begin = jj_consume_token(DQUOTE);
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REG_IDENT:{
-      s = Identifier();
-      break;
-      }
-    case INIT:{
-      jj_consume_token(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 ("" != null) return ret;}
+    // Label can be arbitary quoted identifier
+            qi = QuotedIdentifierExpression();
+ret = new ExpressionLabel(qi.getName()); ret.setPosition(qi,qi); {if ("" != null) return ret;}
     throw new Error("Missing return statement in function");
   }
 
@@ -3399,7 +3370,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[94] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3412,7 +3383,7 @@ op = "|";
       break;
       }
     default:
-      jj_la1[96] = jj_gen;
+      jj_la1[95] = jj_gen;
       ;
     }
     jj_consume_token(RPARENTH);
@@ -3432,6 +3403,14 @@ String Identifier() throws ParseException {
     throw new Error("Missing return statement in function");
   }
 
+  static final public String QuotedIdentifier() throws ParseException {
+    jj_consume_token(REG_QUOTED_IDENT);
+String s = getToken(0).image;
+          // remove "
+          {if ("" != null) return s.substring(1,s.length()-1);}
+    throw new Error("Missing return statement in function");
+  }
+
 // Identifier (returns ExpressionIdent, storing position info)
   static final public 
 ExpressionIdent IdentifierExpression() throws ParseException {String ident;
@@ -3441,6 +3420,17 @@ ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if ("" != null)
     throw new Error("Missing return statement in function");
   }
 
+// QuotedIdentifier (returns ExpressionIdent, storing position info)
+  static final public 
+ExpressionIdent QuotedIdentifierExpression() throws ParseException {String ident;
+        ExpressionIdent ret;
+        Token begin;
+begin = getToken(1);
+    ident = QuotedIdentifier();
+ret = new ExpressionIdent(ident); ret.setPosition(begin, 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;
@@ -3461,7 +3451,7 @@ ident="max";
       break;
       }
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[96] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3498,7 +3488,7 @@ int EqNeq() throws ParseException {
       break;
       }
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[97] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3530,7 +3520,7 @@ int LtGt() throws ParseException {
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[98] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3556,7 +3546,7 @@ begin = getToken(1);
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[99] = jj_gen;
       ;
     }
     jj_consume_token(0);
@@ -3713,18 +3703,18 @@ fl.setLHS(s);
     finally { jj_save(17, xla); }
   }
 
-  static private boolean jj_3R_164()
+  static private boolean jj_3R_166()
  {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_46()
+  static private boolean jj_3R_48()
  {
-    if (jj_3R_55()) return true;
+    if (jj_3R_57()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_56()) jj_scanpos = xsp;
+    if (jj_3R_58()) jj_scanpos = xsp;
     return false;
   }
 
@@ -3734,40 +3724,46 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_90()
+  static private boolean jj_3R_92()
  {
     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_34()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_38()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_32()
+  static private boolean jj_3R_148()
  {
-    if (jj_3R_29()) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_40()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_163()
+  static private boolean jj_3R_165()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_157()
+  static private boolean jj_3R_159()
  {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_156()
+  static private boolean jj_3R_30()
+ {
+    if (jj_scan_token(REG_QUOTED_IDENT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_158()
  {
     if (jj_scan_token(TRUE)) return true;
     return false;
@@ -3785,9 +3781,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_38()
+  static private boolean jj_3R_40()
  {
-    if (jj_3R_46()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
@@ -3803,13 +3799,7 @@ fl.setLHS(s);
     return false;
   }
 
-  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_157()
  {
     if (jj_scan_token(REG_DOUBLE)) return true;
     return false;
@@ -3818,27 +3808,27 @@ fl.setLHS(s);
   static private boolean jj_3_3()
  {
     if (jj_scan_token(LABEL)) return true;
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
   static private boolean jj_3R_186()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_162()
+  static private boolean jj_3R_164()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_79()
+  static private boolean jj_3R_81()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_31()) return true;
+    if (jj_3R_33()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
@@ -3855,17 +3845,15 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_154()
+  static private boolean jj_3R_156()
  {
     if (jj_scan_token(REG_INT)) return true;
     return false;
   }
 
-  static private boolean jj_3R_78()
+  static private boolean jj_3R_80()
  {
-    if (jj_scan_token(DQUOTE)) return true;
-    if (jj_3R_29()) return true;
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
@@ -3875,63 +3863,57 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_142()
+  static private boolean jj_3R_144()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_154()) {
+    if (jj_3R_156()) {
     jj_scanpos = xsp;
-    if (jj_3R_155()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_156()) {
+    if (jj_3R_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_157()) return true;
+    if (jj_3R_159()) return true;
     }
     }
     }
     return false;
   }
 
-  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_79()
  {
     if (jj_3R_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_70()
+  static private boolean jj_3R_72()
  {
     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_162()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_68()
+  static private boolean jj_3R_70()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_77()) {
+    if (jj_3R_79()) {
     jj_scanpos = xsp;
-    if (jj_3R_78()) {
+    if (jj_3R_80()) {
     jj_scanpos = xsp;
-    if (jj_3R_79()) return true;
+    if (jj_3R_81()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_153()
+  static private boolean jj_3R_155()
  {
     if (jj_scan_token(FILTER)) return true;
     if (jj_scan_token(LPARENTH)) return true;
@@ -3954,16 +3936,16 @@ fl.setLHS(s);
     }
     }
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     xsp = jj_scanpos;
     if (jj_3R_186()) jj_scanpos = xsp;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_161()
+  static private boolean jj_3R_163()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -3972,7 +3954,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_91()
+  static private boolean jj_3R_93()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_29()) return true;
@@ -3989,7 +3971,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_81()
+  static private boolean jj_3R_52()
+ {
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_scan_token(OR)) return true;
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_83()
  {
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_29()) return true;
@@ -3998,96 +3989,80 @@ fl.setLHS(s);
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_91()) { jj_scanpos = xsp; break; }
+      if (jj_3R_93()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  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;
-    if (jj_3R_35()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_145()
+  static private boolean jj_3R_147()
  {
     if (jj_scan_token(FUNC)) return true;
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
+    if (jj_3R_164()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) {
+    if (jj_3R_165()) {
     jj_scanpos = xsp;
-    if (jj_3R_164()) return true;
+    if (jj_3R_166()) return true;
     }
     }
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_163()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_152()
+  static private boolean jj_3R_154()
  {
-    if (jj_scan_token(DQUOTE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_178()) {
-    jj_scanpos = xsp;
-    if (jj_3R_179()) return true;
-    }
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
   static private boolean jj_3R_207()
  {
-    if (jj_3R_148()) return true;
+    if (jj_3R_150()) return true;
     return false;
   }
 
-  static private boolean jj_3R_80()
+  static private boolean jj_3R_71()
  {
-    if (jj_scan_token(DIVIDE)) return true;
-    if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_29()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_90()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_83()) return true;
     }
-    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_69()
+  static private boolean jj_3R_82()
  {
+    if (jj_scan_token(DIVIDE)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_29()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_81()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_92()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_58()
+  static private boolean jj_3R_60()
  {
-    if (jj_3R_68()) return true;
+    if (jj_3R_70()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_69()) { jj_scanpos = xsp; break; }
+      if (jj_3R_71()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_159()
+  static private boolean jj_3R_161()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
@@ -4100,16 +4075,16 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_144()
+  static private boolean jj_3R_146()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_159()) {
+    if (jj_3R_161()) {
     jj_scanpos = xsp;
-    if (jj_3R_160()) return true;
+    if (jj_3R_162()) return true;
     }
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_163()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
@@ -4118,25 +4093,25 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(86)) {
+    if (jj_scan_token(85)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(89)) return true;
+    if (jj_scan_token(88)) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_43()
+  static private boolean jj_3R_45()
  {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_49()) return true;
+    if (jj_3R_51()) return true;
     return false;
   }
 
-  static private boolean jj_3R_158()
+  static private boolean jj_3R_160()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_163()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
@@ -4176,19 +4151,17 @@ fl.setLHS(s);
 
   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;
+    if (jj_3R_30()) return true;
     if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  static private boolean jj_3R_143()
+  static private boolean jj_3R_145()
  {
     if (jj_3R_29()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_158()) jj_scanpos = xsp;
+    if (jj_3R_160()) jj_scanpos = xsp;
     return false;
   }
 
@@ -4209,7 +4182,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_59()
+  static private boolean jj_3R_61()
  {
     if (jj_scan_token(OR)) return true;
     if (jj_scan_token(LBRACKET)) return true;
@@ -4217,60 +4190,60 @@ fl.setLHS(s);
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_70()) { jj_scanpos = xsp; break; }
+      if (jj_3R_72()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RBRACKET)) return true;
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_58()) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
-  static private boolean jj_3R_49()
+  static private boolean jj_3R_51()
  {
-    if (jj_3R_58()) return true;
+    if (jj_3R_60()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_59()) jj_scanpos = xsp;
+    if (jj_3R_61()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_141()
+  static private boolean jj_3R_143()
  {
-    if (jj_3R_153()) return true;
+    if (jj_3R_155()) return true;
     return false;
   }
 
-  static private boolean jj_3R_140()
+  static private boolean jj_3R_142()
  {
-    if (jj_3R_152()) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
-  static private boolean jj_3R_177()
+  static private boolean jj_3R_179()
  {
-    if (jj_3R_146()) return true;
+    if (jj_3R_148()) return true;
     return false;
   }
 
-  static private boolean jj_3R_139()
+  static private boolean jj_3R_141()
  {
-    if (jj_3R_151()) return true;
+    if (jj_3R_153()) return true;
     return false;
   }
 
   static private boolean jj_3R_206()
  {
-    if (jj_3R_147()) return true;
+    if (jj_3R_149()) return true;
     return false;
   }
 
-  static private boolean jj_3R_138()
+  static private boolean jj_3R_140()
  {
-    if (jj_3R_150()) return true;
+    if (jj_3R_152()) return true;
     return false;
   }
 
-  static private boolean jj_3R_176()
+  static private boolean jj_3R_178()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4281,7 +4254,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_175()
+  static private boolean jj_3R_177()
  {
     if (jj_scan_token(DLBRACKET)) return true;
     if (jj_3R_205()) return true;
@@ -4289,25 +4262,19 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_137()
+  static private boolean jj_3R_139()
  {
-    if (jj_3R_149()) return true;
+    if (jj_3R_151()) return true;
     return false;
   }
 
-  static private boolean jj_3R_127()
+  static private boolean jj_3R_129()
  {
     if (jj_scan_token(DIVIDE)) return true;
     return false;
   }
 
-  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_176()
  {
     if (jj_scan_token(DLT)) return true;
     if (jj_3R_205()) return true;
@@ -4315,110 +4282,112 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_136()
+  static private boolean jj_3R_138()
  {
-    if (jj_3R_148()) return true;
+    if (jj_3R_150()) return true;
     return false;
   }
 
-  static private boolean jj_3R_135()
+  static private boolean jj_3R_216()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_134()
+  static private boolean jj_3R_137()
  {
-    if (jj_3R_147()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  static private boolean jj_3R_151()
+  static private boolean jj_3R_136()
+ {
+    if (jj_3R_149()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_153()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_174()) {
+    if (jj_3R_176()) {
     jj_scanpos = xsp;
-    if (jj_3R_175()) return true;
+    if (jj_3R_177()) return true;
     }
     xsp = jj_scanpos;
-    if (jj_3R_176()) {
+    if (jj_3R_178()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_179()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_133()
+  static private boolean jj_3R_135()
  {
-    if (jj_3R_146()) return true;
+    if (jj_3R_148()) return true;
     return false;
   }
 
-  static private boolean jj_3R_132()
+  static private boolean jj_3R_134()
  {
-    if (jj_3R_145()) return true;
+    if (jj_3R_147()) return true;
     return false;
   }
 
-  static private boolean jj_3R_42()
+  static private boolean jj_3R_44()
  {
-    if (jj_3R_49()) return true;
+    if (jj_3R_51()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_50()) { jj_scanpos = xsp; break; }
+      if (jj_3R_52()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_131()
+  static private boolean jj_3R_133()
  {
-    if (jj_3R_144()) return true;
+    if (jj_3R_146()) return true;
     return false;
   }
 
-  static private boolean jj_3R_130()
+  static private boolean jj_3R_132()
  {
-    if (jj_3R_143()) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
-  static private boolean jj_3R_129()
+  static private boolean jj_3R_131()
  {
-    if (jj_3R_142()) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
-  static private boolean jj_3R_212()
+  static private boolean jj_3R_125()
  {
-    if (jj_3R_38()) return true;
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
-  static private boolean jj_3R_123()
+  static private boolean jj_3R_212()
  {
-    if (jj_scan_token(MINUS)) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_150()
+  static private boolean jj_3R_152()
  {
     if (jj_scan_token(A)) return true;
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_128()
+  static private boolean jj_3R_130()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_129()) {
-    jj_scanpos = xsp;
-    if (jj_3R_130()) {
-    jj_scanpos = xsp;
     if (jj_3R_131()) {
     jj_scanpos = xsp;
     if (jj_3R_132()) {
@@ -4439,7 +4408,11 @@ fl.setLHS(s);
     jj_scanpos = xsp;
     if (jj_3R_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_141()) return true;
+    if (jj_3R_141()) {
+    jj_scanpos = xsp;
+    if (jj_3R_142()) {
+    jj_scanpos = xsp;
+    if (jj_3R_143()) return true;
     }
     }
     }
@@ -4455,80 +4428,78 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_125()
+  static private boolean jj_3R_127()
  {
-    if (jj_3R_128()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
-  static private boolean jj_3R_124()
+  static private boolean jj_3R_126()
  {
     if (jj_scan_token(MINUS)) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
-  static private boolean jj_3R_35()
+  static private boolean jj_3R_37()
  {
-    if (jj_3R_42()) return true;
+    if (jj_3R_44()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_43()) { jj_scanpos = xsp; break; }
+      if (jj_3R_45()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_120()
+  static private boolean jj_3R_122()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_124()) {
+    if (jj_3R_126()) {
     jj_scanpos = xsp;
-    if (jj_3R_125()) return true;
+    if (jj_3R_127()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_149()
+  static private boolean jj_3R_151()
  {
     if (jj_scan_token(E)) return true;
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_126()
+  static private boolean jj_3R_128()
  {
     if (jj_scan_token(TIMES)) return true;
     return false;
   }
 
-  static private boolean jj_3R_31()
+  static private boolean jj_3R_33()
  {
-    if (jj_3R_35()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  static private boolean jj_3R_121()
+  static private boolean jj_3R_123()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_126()) {
+    if (jj_3R_128()) {
     jj_scanpos = xsp;
-    if (jj_3R_127()) return true;
+    if (jj_3R_129()) return true;
     }
-    if (jj_3R_120()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
   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;
-    if (jj_3R_31()) return true;
+    if (jj_3R_30()) return true;
+    if (jj_3R_33()) return true;
     return false;
   }
 
@@ -4541,24 +4512,24 @@ fl.setLHS(s);
 
   static private boolean jj_3R_204()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_116()
+  static private boolean jj_3R_118()
  {
-    if (jj_3R_120()) return true;
+    if (jj_3R_122()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_121()) { jj_scanpos = xsp; break; }
+      if (jj_3R_123()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
   static private boolean jj_3_17()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
@@ -4566,13 +4537,13 @@ fl.setLHS(s);
  {
     if (jj_scan_token(I)) return true;
     if (jj_scan_token(EQ)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
   static private boolean jj_3_16()
  {
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
@@ -4586,11 +4557,11 @@ fl.setLHS(s);
  {
     if (jj_scan_token(C)) return true;
     if (jj_scan_token(LE)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_122()
+  static private boolean jj_3R_124()
  {
     if (jj_scan_token(PLUS)) return true;
     return false;
@@ -4602,9 +4573,9 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_173()
+  static private boolean jj_3R_175()
  {
-    if (jj_3R_47()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -4616,33 +4587,31 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_117()
+  static private boolean jj_3R_119()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_122()) {
+    if (jj_3R_124()) {
     jj_scanpos = xsp;
-    if (jj_3R_123()) return true;
+    if (jj_3R_125()) return true;
     }
-    if (jj_3R_116()) return true;
+    if (jj_3R_118()) return true;
     return false;
   }
 
   static private boolean jj_3R_199()
  {
-    if (jj_3R_33()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
   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;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  static private boolean jj_3R_172()
+  static private boolean jj_3R_174()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4667,32 +4636,30 @@ fl.setLHS(s);
 
   static private boolean jj_3_15()
  {
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  static private boolean jj_3R_113()
+  static private boolean jj_3R_115()
  {
-    if (jj_3R_116()) return true;
+    if (jj_3R_118()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_117()) { jj_scanpos = xsp; break; }
+      if (jj_3R_119()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
   static private boolean jj_3_6()
  {
-    if (jj_scan_token(DQUOTE)) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
   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;
+    if (jj_3R_30()) return true;
     return false;
   }
 
@@ -4710,10 +4677,10 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_114()
+  static private boolean jj_3R_116()
  {
-    if (jj_3R_45()) return true;
-    if (jj_3R_113()) return true;
+    if (jj_3R_47()) return true;
+    if (jj_3R_115()) return true;
     return false;
   }
 
@@ -4732,76 +4699,76 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_111()
+  static private boolean jj_3R_113()
  {
-    if (jj_3R_113()) return true;
+    if (jj_3R_115()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_114()) { jj_scanpos = xsp; break; }
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_112()
+  static private boolean jj_3R_114()
  {
-    if (jj_3R_115()) return true;
-    if (jj_3R_111()) return true;
+    if (jj_3R_117()) return true;
+    if (jj_3R_113()) return true;
     return false;
   }
 
-  static private boolean jj_3R_110()
+  static private boolean jj_3R_112()
  {
-    if (jj_3R_111()) return true;
+    if (jj_3R_113()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_112()) { jj_scanpos = xsp; break; }
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_109()
+  static private boolean jj_3R_111()
  {
-    if (jj_3R_110()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
-  static private boolean jj_3R_108()
+  static private boolean jj_3R_110()
  {
     if (jj_scan_token(NOT)) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
-  static private boolean jj_3R_101()
+  static private boolean jj_3R_103()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_99()
+  static private boolean jj_3R_101()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_97()
+  static private boolean jj_3R_99()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_95()
+  static private boolean jj_3R_97()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
   static private boolean jj_3R_195()
  {
-    if (jj_3R_45()) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_47()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
@@ -4814,15 +4781,15 @@ fl.setLHS(s);
   static private boolean jj_3R_193()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_41()
+  static private boolean jj_3R_43()
  {
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_40()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
@@ -4834,7 +4801,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_171()
+  static private boolean jj_3R_173()
  {
     if (jj_scan_token(RMAX)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4850,7 +4817,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_170()
+  static private boolean jj_3R_172()
  {
     if (jj_scan_token(RMIN)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -4858,13 +4825,13 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_106()
+  static private boolean jj_3R_108()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_108()) {
+    if (jj_3R_110()) {
     jj_scanpos = xsp;
-    if (jj_3R_109()) return true;
+    if (jj_3R_111()) return true;
     }
     return false;
   }
@@ -4876,13 +4843,13 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_39()
+  static private boolean jj_3R_41()
  {
-    if (jj_3R_47()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_169()
+  static private boolean jj_3R_171()
  {
     if (jj_scan_token(R)) return true;
     Token xsp;
@@ -4904,371 +4871,412 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_107()
+  static private boolean jj_3R_109()
  {
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
-  static private boolean jj_3R_148()
+  static private boolean jj_3R_150()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_169()) {
+    if (jj_3R_171()) {
     jj_scanpos = xsp;
-    if (jj_3R_170()) {
+    if (jj_3R_172()) {
     jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
+    if (jj_3R_173()) return true;
     }
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_172()) return true;
+    if (jj_3R_174()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_173()) jj_scanpos = xsp;
+    if (jj_3R_175()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_40()
+  static private boolean jj_3R_42()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_48()) return true;
+    if (jj_3R_50()) return true;
     if (jj_scan_token(EQ)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_104()
+  static private boolean jj_3R_106()
  {
-    if (jj_3R_106()) return true;
+    if (jj_3R_108()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_107()) { jj_scanpos = xsp; break; }
+      if (jj_3R_109()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_105()
+  static private boolean jj_3R_107()
  {
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
-  static private boolean jj_3R_34()
+  static private boolean jj_3R_36()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_42()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_41()) { jj_scanpos = xsp; break; }
+      if (jj_3R_43()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
   static private boolean jj_3_5()
  {
-    if (jj_3R_30()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  static private boolean jj_3R_102()
+  static private boolean jj_3R_104()
  {
-    if (jj_3R_104()) return true;
+    if (jj_3R_106()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_105()) { jj_scanpos = xsp; break; }
+      if (jj_3R_107()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_30()
+  static private boolean jj_3R_32()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_34()) {
+    if (jj_3R_36()) {
     jj_scanpos = xsp;
     if (jj_scan_token(49)) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_103()
+  static private boolean jj_3R_105()
  {
     if (jj_scan_token(IFF)) return true;
-    if (jj_3R_102()) return true;
+    if (jj_3R_104()) return true;
     return false;
   }
 
-  static private boolean jj_3R_92()
+  static private boolean jj_3R_94()
  {
-    if (jj_3R_102()) return true;
+    if (jj_3R_104()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_103()) { jj_scanpos = xsp; break; }
+      if (jj_3R_105()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_37()
+  static private boolean jj_3R_46()
  {
-    if (jj_scan_token(EQ)) return true;
-    if (jj_scan_token(QMARK)) return true;
+    if (jj_scan_token(LPARENTH)) return true;
+    if (jj_3R_34()) return true;
+    if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_44()
+  static private boolean jj_3R_39()
  {
-    if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_32()) return true;
-    if (jj_scan_token(RPARENTH)) return true;
+    if (jj_scan_token(EQ)) return true;
+    if (jj_scan_token(QMARK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_36()
+  static private boolean jj_3R_38()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_44()) jj_scanpos = xsp;
-    if (jj_3R_45()) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_46()) jj_scanpos = xsp;
+    if (jj_3R_47()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_93()
+  static private boolean jj_3R_95()
  {
     if (jj_scan_token(IMPLIES)) return true;
-    if (jj_3R_92()) return true;
+    if (jj_3R_94()) return true;
     return false;
   }
 
-  static private boolean jj_3R_82()
+  static private boolean jj_3R_84()
  {
-    if (jj_3R_92()) return true;
+    if (jj_3R_94()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_93()) { jj_scanpos = xsp; break; }
+      if (jj_3R_95()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_33()
+  static private boolean jj_3R_35()
  {
     if (jj_scan_token(S)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_36()) {
+    if (jj_3R_38()) {
     jj_scanpos = xsp;
-    if (jj_3R_37()) return true;
+    if (jj_3R_39()) return true;
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_39()) jj_scanpos = xsp;
+    if (jj_3R_41()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_83()
+  static private boolean jj_3R_85()
  {
     if (jj_scan_token(QMARK)) return true;
-    if (jj_3R_82()) return true;
+    if (jj_3R_84()) return true;
     if (jj_scan_token(COLON)) return true;
-    if (jj_3R_75()) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
   static private boolean jj_3_14()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
   static private boolean jj_3_13()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
   static private boolean jj_3_12()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
   static private boolean jj_3_11()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(LPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_168()
+  static private boolean jj_3R_170()
  {
-    if (jj_3R_47()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
-  static private boolean jj_3R_67()
+  static private boolean jj_3R_69()
  {
     if (jj_scan_token(MAX)) return true;
     return false;
   }
 
-  static private boolean jj_3R_66()
+  static private boolean jj_3R_68()
  {
     if (jj_scan_token(MIN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_75()
+  static private boolean jj_3R_77()
  {
-    if (jj_3R_82()) return true;
+    if (jj_3R_84()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_83()) jj_scanpos = xsp;
+    if (jj_3R_85()) jj_scanpos = xsp;
+    return false;
+  }
+
+  static private boolean jj_3R_102()
+ {
+    if (jj_3R_34()) return true;
     return false;
   }
 
   static private boolean jj_3R_100()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
   static private boolean jj_3R_98()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_56()
+ {
+    if (jj_scan_token(LE)) return true;
     return false;
   }
 
   static private boolean jj_3R_96()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     return false;
   }
 
-  static private boolean jj_3R_94()
+  static private boolean jj_3R_55()
  {
-    if (jj_3R_32()) return true;
+    if (jj_scan_token(GE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_57()
+  static private boolean jj_3R_54()
+ {
+    if (jj_scan_token(LT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_59()
  {
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_66()) {
+    if (jj_3R_68()) {
     jj_scanpos = xsp;
-    if (jj_3R_67()) return true;
+    if (jj_3R_69()) return true;
     }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_89()
+  static private boolean jj_3R_53()
+ {
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_47()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_53()) {
+    jj_scanpos = xsp;
+    if (jj_3R_54()) {
+    jj_scanpos = xsp;
+    if (jj_3R_55()) {
+    jj_scanpos = xsp;
+    if (jj_3R_56()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  static private boolean jj_3R_91()
  {
     if (jj_scan_token(EQ)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  static private boolean jj_3R_88()
+  static private boolean jj_3R_90()
  {
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_47()
+  static private boolean jj_3R_49()
  {
     if (jj_scan_token(LBRACE)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     if (jj_scan_token(RBRACE)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_57()) { jj_scanpos = xsp; break; }
+      if (jj_3R_59()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_87()
+  static private boolean jj_3R_89()
  {
     if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_100()) {
+    if (jj_3R_102()) {
     jj_scanpos = xsp;
-    if (jj_3R_101()) return true;
+    if (jj_3R_103()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_86()
+  static private boolean jj_3R_88()
  {
     if (jj_scan_token(GE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_98()) {
+    if (jj_3R_100()) {
     jj_scanpos = xsp;
-    if (jj_3R_99()) return true;
+    if (jj_3R_101()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_85()
+  static private boolean jj_3R_87()
  {
     if (jj_scan_token(LT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_96()) {
+    if (jj_3R_98()) {
     jj_scanpos = xsp;
-    if (jj_3R_97()) return true;
+    if (jj_3R_99()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_84()
+  static private boolean jj_3R_86()
  {
     if (jj_scan_token(LE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_94()) {
+    if (jj_3R_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_95()) return true;
+    if (jj_3R_97()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_76()
+  static private boolean jj_3R_78()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_84()) {
-    jj_scanpos = xsp;
-    if (jj_3R_85()) {
-    jj_scanpos = xsp;
     if (jj_3R_86()) {
     jj_scanpos = xsp;
     if (jj_3R_87()) {
     jj_scanpos = xsp;
     if (jj_3R_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_89()) return true;
+    if (jj_3R_89()) {
+    jj_scanpos = xsp;
+    if (jj_3R_90()) {
+    jj_scanpos = xsp;
+    if (jj_3R_91()) return true;
     }
     }
     }
@@ -5277,106 +5285,94 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_61()
+  static private boolean jj_3R_121()
  {
-    if (jj_3R_75()) return true;
+    if (jj_scan_token(NE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_74()
+  static private boolean jj_3R_117()
  {
-    if (jj_3R_76()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_120()) {
+    jj_scanpos = xsp;
+    if (jj_3R_121()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_73()
+  static private boolean jj_3R_120()
+ {
+    if (jj_scan_token(EQ)) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_63()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_76()
+ {
+    if (jj_3R_78()) return true;
+    return false;
+  }
+
+  static private boolean jj_3R_75()
  {
     if (jj_scan_token(G)) return true;
     return false;
   }
 
-  static private boolean jj_3R_72()
+  static private boolean jj_3R_74()
  {
     if (jj_scan_token(F)) return true;
     return false;
   }
 
-  static private boolean jj_3R_71()
+  static private boolean jj_3R_73()
  {
     if (jj_scan_token(X)) return true;
     return false;
   }
 
-  static private boolean jj_3R_60()
+  static private boolean jj_3R_62()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_71()) {
+    if (jj_3R_73()) {
     jj_scanpos = xsp;
-    if (jj_3R_72()) {
+    if (jj_3R_74()) {
     jj_scanpos = xsp;
-    if (jj_3R_73()) return true;
+    if (jj_3R_75()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_74()) jj_scanpos = xsp;
-    if (jj_3R_55()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_54()
- {
-    if (jj_scan_token(LE)) return true;
+    if (jj_3R_76()) jj_scanpos = xsp;
+    if (jj_3R_57()) return true;
     return false;
   }
 
   static private boolean jj_3R_189()
  {
-    if (jj_3R_45()) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_47()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
   static private boolean jj_3R_188()
  {
     if (jj_scan_token(LPARENTH)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_34()) return true;
     if (jj_scan_token(RPARENTH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_53()
- {
-    if (jj_scan_token(GE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_52()
- {
-    if (jj_scan_token(LT)) return true;
-    return false;
-  }
-
-  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_50()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(REG_IDENTPRIME)) return true;
     return false;
   }
 
@@ -5403,7 +5399,7 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_167()
+  static private boolean jj_3R_169()
  {
     if (jj_scan_token(PMAX)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -5411,18 +5407,18 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_55()
+  static private boolean jj_3R_57()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_60()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
+    if (jj_3R_63()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_166()
+  static private boolean jj_3R_168()
  {
     if (jj_scan_token(PMIN)) return true;
     if (jj_scan_token(EQ)) return true;
@@ -5430,48 +5426,25 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_119()
- {
-    if (jj_scan_token(NE)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_115()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_118()) {
-    jj_scanpos = xsp;
-    if (jj_3R_119()) return true;
-    }
-    return false;
-  }
-
-  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_67()
  {
-    if (jj_3R_76()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
-  static private boolean jj_3R_64()
+  static private boolean jj_3R_66()
  {
     if (jj_scan_token(R)) return true;
     return false;
   }
 
-  static private boolean jj_3R_63()
+  static private boolean jj_3R_65()
  {
     if (jj_scan_token(W)) return true;
     return false;
   }
 
-  static private boolean jj_3R_165()
+  static private boolean jj_3R_167()
  {
     if (jj_scan_token(P)) return true;
     Token xsp;
@@ -5491,58 +5464,58 @@ fl.setLHS(s);
     return false;
   }
 
-  static private boolean jj_3R_62()
+  static private boolean jj_3R_64()
  {
     if (jj_scan_token(U)) return true;
     return false;
   }
 
-  static private boolean jj_3R_147()
+  static private boolean jj_3R_149()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_165()) {
+    if (jj_3R_167()) {
     jj_scanpos = xsp;
-    if (jj_3R_166()) {
+    if (jj_3R_168()) {
     jj_scanpos = xsp;
-    if (jj_3R_167()) return true;
+    if (jj_3R_169()) return true;
     }
     }
     if (jj_scan_token(LBRACKET)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_40()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_168()) jj_scanpos = xsp;
+    if (jj_3R_170()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  static private boolean jj_3R_56()
+  static private boolean jj_3R_58()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_62()) {
+    if (jj_3R_64()) {
     jj_scanpos = xsp;
-    if (jj_3R_63()) {
+    if (jj_3R_65()) {
     jj_scanpos = xsp;
-    if (jj_3R_64()) return true;
+    if (jj_3R_66()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_65()) jj_scanpos = xsp;
-    if (jj_3R_55()) return true;
+    if (jj_3R_67()) jj_scanpos = xsp;
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  static private boolean jj_3R_187()
+  static private boolean jj_3R_31()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_38()) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  static private boolean jj_3R_48()
+  static private boolean jj_3R_187()
  {
-    if (jj_scan_token(REG_IDENTPRIME)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
@@ -5558,7 +5531,7 @@ fl.setLHS(s);
   static private Token jj_scanpos, jj_lastpos;
   static private int jj_la;
   static private int jj_gen;
-  static final private int[] jj_la1 = new int[101];
+  static final private int[] jj_la1 = new int[100];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5568,13 +5541,13 @@ fl.setLHS(s);
       jj_la1_init_2();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0xa0ba0808,0x0,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0xa0000000,0x0,0xa0000000,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0xa0ba0808,0x0,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0xa0000000,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0xc2000,0x2,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x4012783a,0x4012783a,0x0,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x4000000,};
+      jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0xc2000,0x2,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x4012783a,0x4012783a,0x0,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x4000000,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x2e08404,0x0,0x2e08404,0x2e08404,0x0,0x2e08404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x2000000,0x0,0x1,0x2000000,0x4000,0x2e08404,0x0,0x0,0x0,0x2e08405,0x2000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x2200000,0x0,0x3341,0x0,0x0,0x3341,0x2e08404,0x2e08404,0x2e08404,0x2e08404,0x2e08404,0x3341,0x100000,0x0,0x0,0x0,0x0,0x2e08404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x2e08404,0x2e00404,0x0,0x0,0x2000000,0x0,0xc00000,0x0,0x3340,0x0,0x10,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x2e08404,0x2e08404,0x20000,0x0,0x2e08404,0x404,0x0,0x0,0x0,0x2400000,0x10000,0x2400000,0x2000000,0x2004000,0x0,0x2000000,0xc0,0x3300,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x0,0x3608404,0x0,0x3608404,0x3608404,0x0,0x3608404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x1000000,0x0,0x1,0x1000000,0x4000,0x3608404,0x0,0x0,0x0,0x3608405,0x1000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x3000000,0x0,0x3341,0x0,0x0,0x3341,0x3608404,0x3608404,0x3608404,0x3608404,0x3608404,0x3341,0x100000,0x0,0x0,0x0,0x0,0x3608404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x3608404,0x3600404,0x0,0x0,0x1000000,0x0,0x600000,0x0,0x3340,0x0,0x10,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x3608404,0x3608404,0x20000,0x0,0x3608404,0x404,0x0,0x0,0x0,0x1200000,0x10000,0x1200000,0x1004000,0x0,0x1000000,0xc0,0x3300,0x0,};
    }
   static final private JJCalls[] jj_2_rtns = new JJCalls[18];
   static private boolean jj_rescan = false;
@@ -5598,7 +5571,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5613,7 +5586,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5631,7 +5604,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5642,7 +5615,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5659,7 +5632,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5669,7 +5642,7 @@ fl.setLHS(s);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 101; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 100; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -5787,7 +5760,7 @@ fl.setLHS(s);
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 101; i++) {
+    for (int i = 0; i < 100; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
diff --git a/prism/src/parser/PrismParserConstants.java b/prism/src/parser/PrismParserConstants.java
index 724ec615..4a890c4f 100644
--- a/prism/src/parser/PrismParserConstants.java
+++ b/prism/src/parser/PrismParserConstants.java
@@ -179,15 +179,15 @@ public interface PrismParserConstants {
   /** RegularExpression Id. */
   int QMARK = 84;
   /** RegularExpression Id. */
-  int DQUOTE = 85;
+  int REG_INT = 85;
   /** RegularExpression Id. */
-  int REG_INT = 86;
+  int REG_DOUBLE = 86;
   /** RegularExpression Id. */
-  int REG_DOUBLE = 87;
+  int REG_IDENTPRIME = 87;
   /** RegularExpression Id. */
-  int REG_IDENTPRIME = 88;
+  int REG_IDENT = 88;
   /** RegularExpression Id. */
-  int REG_IDENT = 89;
+  int REG_QUOTED_IDENT = 89;
   /** RegularExpression Id. */
   int PREPROC = 90;
   /** RegularExpression Id. */
@@ -283,11 +283,11 @@ public interface PrismParserConstants {
     "\"\\\'\"",
     "\"<-\"",
     "\"?\"",
-    "\"\\\"\"",
     "<REG_INT>",
     "<REG_DOUBLE>",
     "<REG_IDENTPRIME>",
     "<REG_IDENT>",
+    "<REG_QUOTED_IDENT>",
     "<PREPROC>",
     "<LEXICAL_ERROR>",
   };
diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java
index d7397b9d..e1109231 100644
--- a/prism/src/parser/PrismParserTokenManager.java
+++ b/prism/src/parser/PrismParserTokenManager.java
@@ -26,11 +26,11 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 0:
          if ((active0 & 0x387c5fb5ff6f0L) != 0L)
          {
-            jjmatchedKind = 89;
-            return 23;
+            jjmatchedKind = 88;
+            return 27;
          }
          if ((active0 & 0xc783a04a00908L) != 0L)
-            return 23;
+            return 27;
          if ((active1 & 0x20000L) != 0L)
             return 1;
          if ((active0 & 0x2000000000000000L) != 0L)
@@ -41,135 +41,135 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 89;
+               jjmatchedKind = 88;
                jjmatchedPos = 1;
             }
-            return 23;
+            return 27;
          }
          return -1;
       case 2:
-         if ((active0 & 0x100e8000000L) != 0L)
-            return 23;
          if ((active0 & 0x39edd135ff6f0L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 2;
-            return 23;
+            return 27;
          }
+         if ((active0 & 0x100e8000000L) != 0L)
+            return 27;
          return -1;
       case 3:
          if ((active0 & 0x18405124ff260L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 89;
+               jjmatchedKind = 88;
                jjmatchedPos = 3;
             }
-            return 23;
+            return 27;
          }
          if ((active0 & 0x21ad801100490L) != 0L)
-            return 23;
+            return 27;
          return -1;
       case 4:
          if ((active0 & 0x18445024df200L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 4;
-            return 23;
+            return 27;
          }
          if ((active0 & 0x10020060L) != 0L)
-            return 23;
+            return 27;
          return -1;
       case 5:
-         if ((active0 & 0x1000100480200L) != 0L)
-            return 23;
          if ((active0 & 0x84440205f000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 5;
-            return 23;
+            return 27;
          }
+         if ((active0 & 0x1000100480200L) != 0L)
+            return 27;
          return -1;
       case 6:
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 6;
-            return 23;
+            return 27;
          }
          if ((active0 & 0x40000041000L) != 0L)
-            return 23;
+            return 27;
          return -1;
       case 7:
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 7;
-            return 23;
+            return 27;
          }
          return -1;
       case 8:
-         if ((active0 & 0x2014000L) != 0L)
-            return 23;
          if ((active0 & 0x80440000a000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 8;
-            return 23;
+            return 27;
          }
+         if ((active0 & 0x2014000L) != 0L)
+            return 27;
          return -1;
       case 9:
-         if ((active0 & 0x800000008000L) != 0L)
-            return 23;
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 9;
-            return 23;
+            return 27;
          }
+         if ((active0 & 0x800000008000L) != 0L)
+            return 27;
          return -1;
       case 10:
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 10;
-            return 23;
+            return 27;
          }
          return -1;
       case 11:
          if ((active0 & 0x2000L) != 0L)
-            return 23;
+            return 27;
          if ((active0 & 0x4400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 11;
-            return 23;
+            return 27;
          }
          return -1;
       case 12:
          if ((active0 & 0x4000000000L) != 0L)
-            return 23;
+            return 27;
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 12;
-            return 23;
+            return 27;
          }
          return -1;
       case 13:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 13;
-            return 23;
+            return 27;
          }
          return -1;
       case 14:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 14;
-            return 23;
+            return 27;
          }
          return -1;
       default :
@@ -191,8 +191,6 @@ static private int jjMoveStringLiteralDfa0_0(){
       case 33:
          jjmatchedKind = 52;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x80L);
-      case 34:
-         return jjStopAtPos(0, 85);
       case 38:
          return jjStopAtPos(0, 53);
       case 39:
@@ -230,17 +228,17 @@ static private int jjMoveStringLiteralDfa0_0(){
       case 63:
          return jjStopAtPos(0, 84);
       case 65:
-         return jjStartNfaWithStates_0(0, 3, 23);
+         return jjStartNfaWithStates_0(0, 3, 27);
       case 67:
-         return jjStartNfaWithStates_0(0, 8, 23);
+         return jjStartNfaWithStates_0(0, 8, 27);
       case 69:
-         return jjStartNfaWithStates_0(0, 11, 23);
+         return jjStartNfaWithStates_0(0, 11, 27);
       case 70:
-         return jjStartNfaWithStates_0(0, 21, 23);
+         return jjStartNfaWithStates_0(0, 21, 27);
       case 71:
-         return jjStartNfaWithStates_0(0, 23, 23);
+         return jjStartNfaWithStates_0(0, 23, 27);
       case 73:
-         return jjStartNfaWithStates_0(0, 26, 23);
+         return jjStartNfaWithStates_0(0, 26, 27);
       case 80:
          jjmatchedKind = 37;
          return jjMoveStringLiteralDfa1_0(0x1800000000L, 0x0L);
@@ -248,13 +246,13 @@ static private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 45;
          return jjMoveStringLiteralDfa1_0(0x180000000000L, 0x0L);
       case 83:
-         return jjStartNfaWithStates_0(0, 46, 23);
+         return jjStartNfaWithStates_0(0, 46, 27);
       case 85:
-         return jjStartNfaWithStates_0(0, 50, 23);
+         return jjStartNfaWithStates_0(0, 50, 27);
       case 87:
-         return jjStartNfaWithStates_0(0, 51, 23);
+         return jjStartNfaWithStates_0(0, 51, 27);
       case 88:
-         return jjStartNfaWithStates_0(0, 33, 23);
+         return jjStartNfaWithStates_0(0, 33, 27);
       case 91:
          jjmatchedKind = 64;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x4L);
@@ -391,7 +389,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
          break;
       case 97:
          if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 40, 23);
+            return jjStartNfaWithStates_0(2, 40, 27);
          return jjMoveStringLiteralDfa3_0(active0, 0x80800000000L);
       case 98:
          return jjMoveStringLiteralDfa3_0(active0, 0x10000000L);
@@ -405,13 +403,13 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa3_0(active0, 0x480L);
       case 110:
          if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 31, 23);
+            return jjStartNfaWithStates_0(2, 31, 27);
          return jjMoveStringLiteralDfa3_0(active0, 0x400100040L);
       case 111:
          return jjMoveStringLiteralDfa3_0(active0, 0x80c000400030L);
       case 112:
          if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 30, 23);
+            return jjStartNfaWithStates_0(2, 30, 27);
          break;
       case 114:
          return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
@@ -419,7 +417,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L);
       case 116:
          if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 27, 23);
+            return jjStartNfaWithStates_0(2, 27, 27);
          return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L);
       case 117:
          return jjMoveStringLiteralDfa3_0(active0, 0x2000000000200L);
@@ -429,7 +427,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L);
       case 120:
          if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 29, 23);
+            return jjStartNfaWithStates_0(2, 29, 27);
          break;
       default :
          break;
@@ -457,33 +455,33 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){
          return jjMoveStringLiteralDfa4_0(active0, 0x4000400200L);
       case 99:
          if ((active0 & 0x80L) != 0L)
-            return jjStartNfaWithStates_0(3, 7, 23);
+            return jjStartNfaWithStates_0(3, 7, 27);
          else if ((active0 & 0x400L) != 0L)
-            return jjStartNfaWithStates_0(3, 10, 23);
+            return jjStartNfaWithStates_0(3, 10, 27);
          else if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_0(3, 20, 23);
+            return jjStartNfaWithStates_0(3, 20, 27);
          return jjMoveStringLiteralDfa4_0(active0, 0x800000000020L);
       case 100:
          return jjMoveStringLiteralDfa4_0(active0, 0x400000000L);
       case 101:
          if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 41, 23);
+            return jjStartNfaWithStates_0(3, 41, 27);
          else if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 49, 23);
+            return jjStartNfaWithStates_0(3, 49, 27);
          return jjMoveStringLiteralDfa4_0(active0, 0x10000000L);
       case 105:
          return jjMoveStringLiteralDfa4_0(active0, 0x3000L);
       case 108:
          if ((active0 & 0x10L) != 0L)
-            return jjStartNfaWithStates_0(3, 4, 23);
+            return jjStartNfaWithStates_0(3, 4, 27);
          break;
       case 109:
          return jjMoveStringLiteralDfa4_0(active0, 0x44000L);
       case 110:
          if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 36, 23);
+            return jjStartNfaWithStates_0(3, 36, 27);
          else if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 44, 23);
+            return jjStartNfaWithStates_0(3, 44, 27);
          break;
       case 114:
          return jjMoveStringLiteralDfa4_0(active0, 0x8000L);
@@ -491,15 +489,15 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){
          return jjMoveStringLiteralDfa4_0(active0, 0x30040L);
       case 116:
          if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 24, 23);
+            return jjStartNfaWithStates_0(3, 24, 27);
          return jjMoveStringLiteralDfa4_0(active0, 0x1000000080000L);
       case 117:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);
       case 120:
          if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 35, 23);
+            return jjStartNfaWithStates_0(3, 35, 27);
          else if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 43, 23);
+            return jjStartNfaWithStates_0(3, 43, 27);
          break;
       default :
          break;
@@ -520,17 +518,17 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
          return jjMoveStringLiteralDfa5_0(active0, 0x4000400000L);
       case 101:
          if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_0(4, 17, 23);
+            return jjStartNfaWithStates_0(4, 17, 27);
          return jjMoveStringLiteralDfa5_0(active0, 0x1000400088000L);
       case 104:
          return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L);
       case 107:
          if ((active0 & 0x20L) != 0L)
-            return jjStartNfaWithStates_0(4, 5, 23);
+            return jjStartNfaWithStates_0(4, 5, 27);
          break;
       case 108:
          if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 28, 23);
+            return jjStartNfaWithStates_0(4, 28, 27);
          return jjMoveStringLiteralDfa5_0(active0, 0x100000200L);
       case 110:
          return jjMoveStringLiteralDfa5_0(active0, 0x3000L);
@@ -540,7 +538,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
          return jjMoveStringLiteralDfa5_0(active0, 0x40002000000L);
       case 116:
          if ((active0 & 0x40L) != 0L)
-            return jjStartNfaWithStates_0(4, 6, 23);
+            return jjStartNfaWithStates_0(4, 6, 27);
          break;
       case 117:
          return jjMoveStringLiteralDfa5_0(active0, 0x40000L);
@@ -569,23 +567,23 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
          return jjMoveStringLiteralDfa6_0(active0, 0x40000004000L);
       case 101:
          if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(5, 9, 23);
+            return jjStartNfaWithStates_0(5, 9, 27);
          else if ((active0 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 32, 23);
+            return jjStartNfaWithStates_0(5, 32, 27);
          break;
       case 105:
          return jjMoveStringLiteralDfa6_0(active0, 0x2001000L);
       case 108:
          if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_0(5, 22, 23);
+            return jjStartNfaWithStates_0(5, 22, 27);
          return jjMoveStringLiteralDfa6_0(active0, 0x40000L);
       case 109:
          if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 48, 23);
+            return jjStartNfaWithStates_0(5, 48, 27);
          break;
       case 114:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_0(5, 19, 23);
+            return jjStartNfaWithStates_0(5, 19, 27);
          break;
       case 115:
          return jjMoveStringLiteralDfa6_0(active0, 0x10000L);
@@ -612,7 +610,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    {
       case 97:
          if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(6, 18, 23);
+            return jjStartNfaWithStates_0(6, 18, 27);
          return jjMoveStringLiteralDfa7_0(active0, 0x200a000L);
       case 101:
          return jjMoveStringLiteralDfa7_0(active0, 0x400000000L);
@@ -620,11 +618,11 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
          return jjMoveStringLiteralDfa7_0(active0, 0x4000000000L);
       case 115:
          if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 42, 23);
+            return jjStartNfaWithStates_0(6, 42, 27);
          return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L);
       case 116:
          if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(6, 12, 23);
+            return jjStartNfaWithStates_0(6, 12, 27);
          return jjMoveStringLiteralDfa7_0(active0, 0x10000L);
       case 117:
          return jjMoveStringLiteralDfa7_0(active0, 0x4000L);
@@ -672,17 +670,17 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0){
          return jjMoveStringLiteralDfa9_0(active0, 0x8000L);
       case 101:
          if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(8, 14, 23);
+            return jjStartNfaWithStates_0(8, 14, 27);
          break;
       case 105:
          return jjMoveStringLiteralDfa9_0(active0, 0x804000002000L);
       case 109:
          if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(8, 16, 23);
+            return jjStartNfaWithStates_0(8, 16, 27);
          return jjMoveStringLiteralDfa9_0(active0, 0x400000000L);
       case 116:
          if ((active0 & 0x2000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 25, 23);
+            return jjStartNfaWithStates_0(8, 25, 27);
          break;
       default :
          break;
@@ -703,13 +701,13 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0){
          return jjMoveStringLiteralDfa10_0(active0, 0x2000L);
       case 99:
          if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 47, 23);
+            return jjStartNfaWithStates_0(9, 47, 27);
          break;
       case 105:
          return jjMoveStringLiteralDfa10_0(active0, 0x400000000L);
       case 115:
          if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(9, 15, 23);
+            return jjStartNfaWithStates_0(9, 15, 27);
          return jjMoveStringLiteralDfa10_0(active0, 0x4000000000L);
       default :
          break;
@@ -749,7 +747,7 @@ static private int jjMoveStringLiteralDfa11_0(long old0, long active0){
          return jjMoveStringLiteralDfa12_0(active0, 0x4400000000L);
       case 116:
          if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(11, 13, 23);
+            return jjStartNfaWithStates_0(11, 13, 27);
          break;
       default :
          break;
@@ -768,7 +766,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0){
    {
       case 99:
          if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_0(12, 38, 23);
+            return jjStartNfaWithStates_0(12, 38, 27);
          break;
       case 115:
          return jjMoveStringLiteralDfa13_0(active0, 0x400000000L);
@@ -823,7 +821,7 @@ static private int jjMoveStringLiteralDfa15_0(long old0, long active0){
    {
       case 99:
          if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_0(15, 34, 23);
+            return jjStartNfaWithStates_0(15, 34, 27);
          break;
       default :
          break;
@@ -847,7 +845,7 @@ static final long[] jjbitVec2 = {
 static private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 23;
+   jjnewStateCnt = 27;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -862,26 +860,26 @@ static private int jjMoveNfa_0(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
-               case 23:
+               case 27:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 89)
-                        kind = 89;
-                     { jjCheckNAdd(22); }
+                     if (kind > 88)
+                        kind = 88;
+                     { jjCheckNAdd(26); }
                   }
                   else if (curChar == 39)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 87)
+                        kind = 87;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(24, 25); }
                   break;
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 87)
-                        kind = 87;
+                     if (kind > 86)
+                        kind = 86;
                      { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
@@ -890,21 +888,23 @@ static private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;
                   }
                   else if (curChar == 35)
-                     { jjCheckNAddTwoStates(16, 17); }
+                     { jjCheckNAddTwoStates(20, 21); }
+                  else if (curChar == 34)
+                     jjstateSet[jjnewStateCnt++] = 16;
                   else if (curChar == 46)
                      { jjCheckNAdd(11); }
                   else if (curChar == 47)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 85)
+                        kind = 85;
                      { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 85)
+                        kind = 85;
                   }
                   break;
                case 1:
@@ -940,20 +940,20 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 7:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAdd(8); }
                   break;
                case 9:
-                  if (curChar == 48 && kind > 86)
-                     kind = 86;
+                  if (curChar == 48 && kind > 85)
+                     kind = 85;
                   break;
                case 10:
                   if (curChar == 46)
@@ -962,8 +962,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
@@ -973,43 +973,55 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAdd(14); }
                   break;
                case 15:
+                  if (curChar == 34)
+                     jjstateSet[jjnewStateCnt++] = 16;
+                  break;
+               case 17:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjAddStates(7, 8); }
+                  break;
+               case 18:
+                  if (curChar == 34 && kind > 89)
+                     kind = 89;
+                  break;
+               case 19:
                   if (curChar == 35)
-                     { jjCheckNAddTwoStates(16, 17); }
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
-               case 16:
+               case 20:
                   if ((0xfffffff7ffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(16, 17); }
+                     { jjCheckNAddTwoStates(20, 21); }
                   break;
-               case 17:
+               case 21:
                   if (curChar == 35 && kind > 90)
                      kind = 90;
                   break;
-               case 18:
+               case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 87)
-                     kind = 87;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAddStates(0, 3); }
                   break;
-               case 20:
+               case 24:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(24, 25); }
                   break;
-               case 21:
-                  if (curChar == 39 && kind > 88)
-                     kind = 88;
+               case 25:
+                  if (curChar == 39 && kind > 87)
+                     kind = 87;
                   break;
-               case 22:
+               case 26:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
-                  { jjCheckNAdd(22); }
+                  if (kind > 88)
+                     kind = 88;
+                  { jjCheckNAdd(26); }
                   break;
                default : break;
             }
@@ -1022,22 +1034,22 @@ static private int jjMoveNfa_0(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
-               case 23:
+               case 27:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 89)
-                        kind = 89;
-                     { jjCheckNAdd(22); }
+                     if (kind > 88)
+                        kind = 88;
+                     { jjCheckNAdd(26); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(24, 25); }
                   break;
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
-                  { jjCheckNAddStates(7, 9); }
+                  if (kind > 88)
+                     kind = 88;
+                  { jjCheckNAddStates(9, 11); }
                   break;
                case 2:
                   if (kind > 2)
@@ -1046,21 +1058,26 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 12:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(10, 11); }
+                     { jjAddStates(12, 13); }
                   break;
                case 16:
-                  { jjAddStates(12, 13); }
+               case 17:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     { jjCheckNAddTwoStates(17, 18); }
                   break;
                case 20:
+                  { jjAddStates(14, 15); }
+                  break;
+               case 24:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(24, 25); }
                   break;
-               case 22:
+               case 26:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 89)
-                     kind = 89;
-                  { jjCheckNAdd(22); }
+                  if (kind > 88)
+                     kind = 88;
+                  { jjCheckNAdd(26); }
                   break;
                default : break;
             }
@@ -1084,9 +1101,9 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      kind = 2;
                   { jjAddStates(4, 6); }
                   break;
-               case 16:
+               case 20:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(12, 13); }
+                     { jjAddStates(14, 15); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -1099,14 +1116,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 23 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 27 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   10, 11, 12, 18, 2, 3, 5, 20, 21, 22, 13, 14, 16, 17, 
+   10, 11, 12, 22, 2, 3, 5, 17, 18, 24, 25, 26, 13, 14, 20, 21, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -1139,7 +1156,7 @@ public static final String[] jjstrLiteralImages = {
 "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", 
 "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", 
 "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", 
-"\77", "\42", null, null, null, null, null, null, };
+"\77", null, null, null, null, null, null, null, };
 static protected Token jjFillToken()
 {
    final Token t;
@@ -1305,7 +1322,7 @@ static private void jjCheckNAddStates(int start, int end)
   {
     int i;
     jjround = 0x80000001;
-    for (i = 23; i-- > 0;)
+    for (i = 27; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -1340,8 +1357,8 @@ static final long[] jjtoSpecial = {
 };
     static protected SimpleCharStream  input_stream;
 
-    static private final int[] jjrounds = new int[23];
-    static private final int[] jjstateSet = new int[2 * 23];
+    static private final int[] jjrounds = new int[27];
+    static private final int[] jjstateSet = new int[2 * 27];
 
     
     static protected char curChar;