diff --git a/lib/metagrammar.js b/lib/metagrammar.js
index 38241e3..7f8b6c5 100644
--- a/lib/metagrammar.js
+++ b/lib/metagrammar.js
@@ -5,7 +5,7 @@ PEG.grammarParser = (function(){
     this._cache["grammar"] = this._cache["grammar"] || [];
     var cachedResult = this._cache["grammar"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -62,8 +62,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["grammar"][pos] = {
-      length: this._pos - pos,
-      result: result0
+      nextPos: this._pos,
+      result:  result0
     };
     return result0;
   };
@@ -72,7 +72,7 @@ PEG.grammarParser = (function(){
     this._cache["rule"] = this._cache["rule"] || [];
     var cachedResult = this._cache["rule"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -132,8 +132,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["rule"][pos] = {
-      length: this._pos - pos,
-      result: result8
+      nextPos: this._pos,
+      result:  result8
     };
     return result8;
   };
@@ -142,7 +142,7 @@ PEG.grammarParser = (function(){
     this._cache["expression"] = this._cache["expression"] || [];
     var cachedResult = this._cache["expression"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -154,8 +154,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["expression"][pos] = {
-      length: this._pos - pos,
-      result: result16
+      nextPos: this._pos,
+      result:  result16
     };
     return result16;
   };
@@ -164,7 +164,7 @@ PEG.grammarParser = (function(){
     this._cache["choice"] = this._cache["choice"] || [];
     var cachedResult = this._cache["choice"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -230,8 +230,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["choice"][pos] = {
-      length: this._pos - pos,
-      result: result17
+      nextPos: this._pos,
+      result:  result17
     };
     return result17;
   };
@@ -240,7 +240,7 @@ PEG.grammarParser = (function(){
     this._cache["sequence"] = this._cache["sequence"] || [];
     var cachedResult = this._cache["sequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -296,8 +296,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["sequence"][pos] = {
-      length: this._pos - pos,
-      result: result24
+      nextPos: this._pos,
+      result:  result24
     };
     return result24;
   };
@@ -306,7 +306,7 @@ PEG.grammarParser = (function(){
     this._cache["prefixed"] = this._cache["prefixed"] || [];
     var cachedResult = this._cache["prefixed"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -367,8 +367,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["prefixed"][pos] = {
-      length: this._pos - pos,
-      result: result33
+      nextPos: this._pos,
+      result:  result33
     };
     return result33;
   };
@@ -377,7 +377,7 @@ PEG.grammarParser = (function(){
     this._cache["suffixed"] = this._cache["suffixed"] || [];
     var cachedResult = this._cache["suffixed"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -464,8 +464,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["suffixed"][pos] = {
-      length: this._pos - pos,
-      result: result43
+      nextPos: this._pos,
+      result:  result43
     };
     return result43;
   };
@@ -474,7 +474,7 @@ PEG.grammarParser = (function(){
     this._cache["primary"] = this._cache["primary"] || [];
     var cachedResult = this._cache["primary"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -606,8 +606,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["primary"][pos] = {
-      length: this._pos - pos,
-      result: result57
+      nextPos: this._pos,
+      result:  result57
     };
     return result57;
   };
@@ -616,7 +616,7 @@ PEG.grammarParser = (function(){
     this._cache["action"] = this._cache["action"] || [];
     var cachedResult = this._cache["action"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -647,8 +647,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["action"][pos] = {
-      length: this._pos - pos,
-      result: result78
+      nextPos: this._pos,
+      result:  result78
     };
     return result78;
   };
@@ -657,7 +657,7 @@ PEG.grammarParser = (function(){
     this._cache["braced"] = this._cache["braced"] || [];
     var cachedResult = this._cache["braced"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -732,8 +732,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["braced"][pos] = {
-      length: this._pos - pos,
-      result: result82
+      nextPos: this._pos,
+      result:  result82
     };
     return result82;
   };
@@ -742,7 +742,7 @@ PEG.grammarParser = (function(){
     this._cache["nonBraceCharacters"] = this._cache["nonBraceCharacters"] || [];
     var cachedResult = this._cache["nonBraceCharacters"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -782,8 +782,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["nonBraceCharacters"][pos] = {
-      length: this._pos - pos,
-      result: result90
+      nextPos: this._pos,
+      result:  result90
     };
     return result90;
   };
@@ -792,7 +792,7 @@ PEG.grammarParser = (function(){
     this._cache["nonBraceCharacter"] = this._cache["nonBraceCharacter"] || [];
     var cachedResult = this._cache["nonBraceCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -864,8 +864,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["nonBraceCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result96
+      nextPos: this._pos,
+      result:  result96
     };
     return result96;
   };
@@ -874,7 +874,7 @@ PEG.grammarParser = (function(){
     this._cache["colon"] = this._cache["colon"] || [];
     var cachedResult = this._cache["colon"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -910,8 +910,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["colon"][pos] = {
-      length: this._pos - pos,
-      result: result103
+      nextPos: this._pos,
+      result:  result103
     };
     return result103;
   };
@@ -920,7 +920,7 @@ PEG.grammarParser = (function(){
     this._cache["slash"] = this._cache["slash"] || [];
     var cachedResult = this._cache["slash"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -956,8 +956,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["slash"][pos] = {
-      length: this._pos - pos,
-      result: result107
+      nextPos: this._pos,
+      result:  result107
     };
     return result107;
   };
@@ -966,7 +966,7 @@ PEG.grammarParser = (function(){
     this._cache["and"] = this._cache["and"] || [];
     var cachedResult = this._cache["and"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1002,8 +1002,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["and"][pos] = {
-      length: this._pos - pos,
-      result: result111
+      nextPos: this._pos,
+      result:  result111
     };
     return result111;
   };
@@ -1012,7 +1012,7 @@ PEG.grammarParser = (function(){
     this._cache["not"] = this._cache["not"] || [];
     var cachedResult = this._cache["not"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1048,8 +1048,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["not"][pos] = {
-      length: this._pos - pos,
-      result: result115
+      nextPos: this._pos,
+      result:  result115
     };
     return result115;
   };
@@ -1058,7 +1058,7 @@ PEG.grammarParser = (function(){
     this._cache["question"] = this._cache["question"] || [];
     var cachedResult = this._cache["question"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1094,8 +1094,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["question"][pos] = {
-      length: this._pos - pos,
-      result: result119
+      nextPos: this._pos,
+      result:  result119
     };
     return result119;
   };
@@ -1104,7 +1104,7 @@ PEG.grammarParser = (function(){
     this._cache["star"] = this._cache["star"] || [];
     var cachedResult = this._cache["star"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1140,8 +1140,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["star"][pos] = {
-      length: this._pos - pos,
-      result: result123
+      nextPos: this._pos,
+      result:  result123
     };
     return result123;
   };
@@ -1150,7 +1150,7 @@ PEG.grammarParser = (function(){
     this._cache["plus"] = this._cache["plus"] || [];
     var cachedResult = this._cache["plus"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1186,8 +1186,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["plus"][pos] = {
-      length: this._pos - pos,
-      result: result127
+      nextPos: this._pos,
+      result:  result127
     };
     return result127;
   };
@@ -1196,7 +1196,7 @@ PEG.grammarParser = (function(){
     this._cache["lparen"] = this._cache["lparen"] || [];
     var cachedResult = this._cache["lparen"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1232,8 +1232,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["lparen"][pos] = {
-      length: this._pos - pos,
-      result: result131
+      nextPos: this._pos,
+      result:  result131
     };
     return result131;
   };
@@ -1242,7 +1242,7 @@ PEG.grammarParser = (function(){
     this._cache["rparen"] = this._cache["rparen"] || [];
     var cachedResult = this._cache["rparen"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1278,8 +1278,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["rparen"][pos] = {
-      length: this._pos - pos,
-      result: result135
+      nextPos: this._pos,
+      result:  result135
     };
     return result135;
   };
@@ -1288,7 +1288,7 @@ PEG.grammarParser = (function(){
     this._cache["dot"] = this._cache["dot"] || [];
     var cachedResult = this._cache["dot"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1324,8 +1324,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["dot"][pos] = {
-      length: this._pos - pos,
-      result: result139
+      nextPos: this._pos,
+      result:  result139
     };
     return result139;
   };
@@ -1334,7 +1334,7 @@ PEG.grammarParser = (function(){
     this._cache["identifier"] = this._cache["identifier"] || [];
     var cachedResult = this._cache["identifier"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1481,8 +1481,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["identifier"][pos] = {
-      length: this._pos - pos,
-      result: result143
+      nextPos: this._pos,
+      result:  result143
     };
     return result143;
   };
@@ -1491,7 +1491,7 @@ PEG.grammarParser = (function(){
     this._cache["literal"] = this._cache["literal"] || [];
     var cachedResult = this._cache["literal"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1532,8 +1532,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["literal"][pos] = {
-      length: this._pos - pos,
-      result: result156
+      nextPos: this._pos,
+      result:  result156
     };
     return result156;
   };
@@ -1542,7 +1542,7 @@ PEG.grammarParser = (function(){
     this._cache["doubleQuotedLiteral"] = this._cache["doubleQuotedLiteral"] || [];
     var cachedResult = this._cache["doubleQuotedLiteral"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1597,8 +1597,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["doubleQuotedLiteral"][pos] = {
-      length: this._pos - pos,
-      result: result162
+      nextPos: this._pos,
+      result:  result162
     };
     return result162;
   };
@@ -1607,7 +1607,7 @@ PEG.grammarParser = (function(){
     this._cache["doubleQuotedCharacter"] = this._cache["doubleQuotedCharacter"] || [];
     var cachedResult = this._cache["doubleQuotedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1649,8 +1649,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["doubleQuotedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result168
+      nextPos: this._pos,
+      result:  result168
     };
     return result168;
   };
@@ -1659,7 +1659,7 @@ PEG.grammarParser = (function(){
     this._cache["simpleDoubleQuotedCharacter"] = this._cache["simpleDoubleQuotedCharacter"] || [];
     var cachedResult = this._cache["simpleDoubleQuotedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1736,8 +1736,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["simpleDoubleQuotedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result175
+      nextPos: this._pos,
+      result:  result175
     };
     return result175;
   };
@@ -1746,7 +1746,7 @@ PEG.grammarParser = (function(){
     this._cache["singleQuotedLiteral"] = this._cache["singleQuotedLiteral"] || [];
     var cachedResult = this._cache["singleQuotedLiteral"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1801,8 +1801,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["singleQuotedLiteral"][pos] = {
-      length: this._pos - pos,
-      result: result183
+      nextPos: this._pos,
+      result:  result183
     };
     return result183;
   };
@@ -1811,7 +1811,7 @@ PEG.grammarParser = (function(){
     this._cache["singleQuotedCharacter"] = this._cache["singleQuotedCharacter"] || [];
     var cachedResult = this._cache["singleQuotedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1853,8 +1853,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["singleQuotedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result189
+      nextPos: this._pos,
+      result:  result189
     };
     return result189;
   };
@@ -1863,7 +1863,7 @@ PEG.grammarParser = (function(){
     this._cache["simpleSingleQuotedCharacter"] = this._cache["simpleSingleQuotedCharacter"] || [];
     var cachedResult = this._cache["simpleSingleQuotedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -1940,8 +1940,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["simpleSingleQuotedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result196
+      nextPos: this._pos,
+      result:  result196
     };
     return result196;
   };
@@ -1950,7 +1950,7 @@ PEG.grammarParser = (function(){
     this._cache["class"] = this._cache["class"] || [];
     var cachedResult = this._cache["class"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2036,8 +2036,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["class"][pos] = {
-      length: this._pos - pos,
-      result: result204
+      nextPos: this._pos,
+      result:  result204
     };
     return result204;
   };
@@ -2046,7 +2046,7 @@ PEG.grammarParser = (function(){
     this._cache["classCharacterRange"] = this._cache["classCharacterRange"] || [];
     var cachedResult = this._cache["classCharacterRange"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2102,8 +2102,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["classCharacterRange"][pos] = {
-      length: this._pos - pos,
-      result: result213
+      nextPos: this._pos,
+      result:  result213
     };
     return result213;
   };
@@ -2112,7 +2112,7 @@ PEG.grammarParser = (function(){
     this._cache["classCharacter"] = this._cache["classCharacter"] || [];
     var cachedResult = this._cache["classCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2124,8 +2124,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["classCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result218
+      nextPos: this._pos,
+      result:  result218
     };
     return result218;
   };
@@ -2134,7 +2134,7 @@ PEG.grammarParser = (function(){
     this._cache["bracketDelimitedCharacter"] = this._cache["bracketDelimitedCharacter"] || [];
     var cachedResult = this._cache["bracketDelimitedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2176,8 +2176,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["bracketDelimitedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result219
+      nextPos: this._pos,
+      result:  result219
     };
     return result219;
   };
@@ -2186,7 +2186,7 @@ PEG.grammarParser = (function(){
     this._cache["simpleBracketDelimitedCharacter"] = this._cache["simpleBracketDelimitedCharacter"] || [];
     var cachedResult = this._cache["simpleBracketDelimitedCharacter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2263,8 +2263,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["simpleBracketDelimitedCharacter"][pos] = {
-      length: this._pos - pos,
-      result: result226
+      nextPos: this._pos,
+      result:  result226
     };
     return result226;
   };
@@ -2273,7 +2273,7 @@ PEG.grammarParser = (function(){
     this._cache["simpleEscapeSequence"] = this._cache["simpleEscapeSequence"] || [];
     var cachedResult = this._cache["simpleEscapeSequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2377,8 +2377,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["simpleEscapeSequence"][pos] = {
-      length: this._pos - pos,
-      result: result234
+      nextPos: this._pos,
+      result:  result234
     };
     return result234;
   };
@@ -2387,7 +2387,7 @@ PEG.grammarParser = (function(){
     this._cache["zeroEscapeSequence"] = this._cache["zeroEscapeSequence"] || [];
     var cachedResult = this._cache["zeroEscapeSequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2433,8 +2433,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["zeroEscapeSequence"][pos] = {
-      length: this._pos - pos,
-      result: result244
+      nextPos: this._pos,
+      result:  result244
     };
     return result244;
   };
@@ -2443,7 +2443,7 @@ PEG.grammarParser = (function(){
     this._cache["hexEscapeSequence"] = this._cache["hexEscapeSequence"] || [];
     var cachedResult = this._cache["hexEscapeSequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2487,8 +2487,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["hexEscapeSequence"][pos] = {
-      length: this._pos - pos,
-      result: result249
+      nextPos: this._pos,
+      result:  result249
     };
     return result249;
   };
@@ -2497,7 +2497,7 @@ PEG.grammarParser = (function(){
     this._cache["unicodeEscapeSequence"] = this._cache["unicodeEscapeSequence"] || [];
     var cachedResult = this._cache["unicodeEscapeSequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2553,8 +2553,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["unicodeEscapeSequence"][pos] = {
-      length: this._pos - pos,
-      result: result254
+      nextPos: this._pos,
+      result:  result254
     };
     return result254;
   };
@@ -2563,7 +2563,7 @@ PEG.grammarParser = (function(){
     this._cache["eolEscapeSequence"] = this._cache["eolEscapeSequence"] || [];
     var cachedResult = this._cache["eolEscapeSequence"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2599,8 +2599,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["eolEscapeSequence"][pos] = {
-      length: this._pos - pos,
-      result: result261
+      nextPos: this._pos,
+      result:  result261
     };
     return result261;
   };
@@ -2609,7 +2609,7 @@ PEG.grammarParser = (function(){
     this._cache["digit"] = this._cache["digit"] || [];
     var cachedResult = this._cache["digit"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -2751,8 +2751,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["digit"][pos] = {
-      length: this._pos - pos,
-      result: result265
+      nextPos: this._pos,
+      result:  result265
     };
     return result265;
   };
@@ -2761,7 +2761,7 @@ PEG.grammarParser = (function(){
     this._cache["hexDigit"] = this._cache["hexDigit"] || [];
     var cachedResult = this._cache["hexDigit"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3059,8 +3059,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["hexDigit"][pos] = {
-      length: this._pos - pos,
-      result: result276
+      nextPos: this._pos,
+      result:  result276
     };
     return result276;
   };
@@ -3069,7 +3069,7 @@ PEG.grammarParser = (function(){
     this._cache["letter"] = this._cache["letter"] || [];
     var cachedResult = this._cache["letter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3091,8 +3091,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["letter"][pos] = {
-      length: this._pos - pos,
-      result: result299
+      nextPos: this._pos,
+      result:  result299
     };
     return result299;
   };
@@ -3101,7 +3101,7 @@ PEG.grammarParser = (function(){
     this._cache["lowerCaseLetter"] = this._cache["lowerCaseLetter"] || [];
     var cachedResult = this._cache["lowerCaseLetter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3451,8 +3451,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["lowerCaseLetter"][pos] = {
-      length: this._pos - pos,
-      result: result302
+      nextPos: this._pos,
+      result:  result302
     };
     return result302;
   };
@@ -3461,7 +3461,7 @@ PEG.grammarParser = (function(){
     this._cache["upperCaseLetter"] = this._cache["upperCaseLetter"] || [];
     var cachedResult = this._cache["upperCaseLetter"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3811,8 +3811,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["upperCaseLetter"][pos] = {
-      length: this._pos - pos,
-      result: result329
+      nextPos: this._pos,
+      result:  result329
     };
     return result329;
   };
@@ -3821,7 +3821,7 @@ PEG.grammarParser = (function(){
     this._cache["__"] = this._cache["__"] || [];
     var cachedResult = this._cache["__"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3868,8 +3868,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["__"][pos] = {
-      length: this._pos - pos,
-      result: result356
+      nextPos: this._pos,
+      result:  result356
     };
     return result356;
   };
@@ -3878,7 +3878,7 @@ PEG.grammarParser = (function(){
     this._cache["comment"] = this._cache["comment"] || [];
     var cachedResult = this._cache["comment"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -3903,8 +3903,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["comment"][pos] = {
-      length: this._pos - pos,
-      result: result361
+      nextPos: this._pos,
+      result:  result361
     };
     return result361;
   };
@@ -3913,7 +3913,7 @@ PEG.grammarParser = (function(){
     this._cache["singleLineComment"] = this._cache["singleLineComment"] || [];
     var cachedResult = this._cache["singleLineComment"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -4013,8 +4013,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["singleLineComment"][pos] = {
-      length: this._pos - pos,
-      result: result364
+      nextPos: this._pos,
+      result:  result364
     };
     return result364;
   };
@@ -4023,7 +4023,7 @@ PEG.grammarParser = (function(){
     this._cache["multiLineComment"] = this._cache["multiLineComment"] || [];
     var cachedResult = this._cache["multiLineComment"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -4153,8 +4153,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["multiLineComment"][pos] = {
-      length: this._pos - pos,
-      result: result371
+      nextPos: this._pos,
+      result:  result371
     };
     return result371;
   };
@@ -4163,7 +4163,7 @@ PEG.grammarParser = (function(){
     this._cache["eol"] = this._cache["eol"] || [];
     var cachedResult = this._cache["eol"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -4243,8 +4243,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["eol"][pos] = {
-      length: this._pos - pos,
-      result: result379
+      nextPos: this._pos,
+      result:  result379
     };
     return result379;
   };
@@ -4253,7 +4253,7 @@ PEG.grammarParser = (function(){
     this._cache["eolChar"] = this._cache["eolChar"] || [];
     var cachedResult = this._cache["eolChar"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -4317,8 +4317,8 @@ PEG.grammarParser = (function(){
     
     
     this._cache["eolChar"][pos] = {
-      length: this._pos - pos,
-      result: result385
+      nextPos: this._pos,
+      result:  result385
     };
     return result385;
   };
@@ -4327,7 +4327,7 @@ PEG.grammarParser = (function(){
     this._cache["whitespace"] = this._cache["whitespace"] || [];
     var cachedResult = this._cache["whitespace"][this._pos];
     if (cachedResult !== undefined) {
-      this._pos += cachedResult.length;
+      this._pos = cachedResult.nextPos;
       return cachedResult.result;
     }
     
@@ -4615,8 +4615,8 @@ PEG.grammarParser = (function(){
     }
     
     this._cache["whitespace"][pos] = {
-      length: this._pos - pos,
-      result: result390
+      nextPos: this._pos,
+      result:  result390
     };
     return result390;
   };