@7mind.io/baboon 0.0.167 → 0.0.171

package/io.septimalmind.baboon.parser.defns.-Def-Model.js

@@ -40,20 +40,20 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefModel(context, meta, defEnum, defDto, defAdt, defForeign, defContract, defService) {
-  this.Dc = null;
-  this.akb = null;
-  this.aka = null;
-  this.ak8 = null;
-  this.akc = null;
-  this.ak9 = null;
-  this.akd = null;
-  this.Dc = meta;
-  this.akb = defEnum;
-  this.aka = defDto;
-  this.ak8 = defAdt;
-  this.akc = defForeign;
-  this.ak9 = defContract;
-  this.akd = defService;
+  this.Dp = null;
+  this.akN = null;
+  this.akM = null;
+  this.akK = null;
+  this.akO = null;
+  this.akL = null;
+  this.akP = null;
+  this.Dp = meta;
+  this.akN = defEnum;
+  this.akM = defDto;
+  this.akK = defAdt;
+  this.akO = defForeign;
+  this.akL = defContract;
+  this.akP = defService;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefModel as $c_Lio_septimalmind_baboon_parser_defns_DefModel };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefModel.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -63,19 +63,19 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefModel() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefModel as $h_Lio_septimalmind_baboon_parser_defns_DefModel };
 $h_Lio_septimalmind_baboon_parser_defns_DefModel.prototype = $p;
-$p.aM5 = (function(evidence$1) {
+$p.aML = (function(evidence$1) {
   var startIndex = evidence$1.c;
   var instrument = (evidence$1.M !== null);
   if (instrument) {
-    evidence$1.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, startIndex);
+    evidence$1.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, startIndex);
   }
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
   var preLhsIndex$macro$62 = evidence$1.c;
   var input$macro$71 = evidence$1.T;
-  var x1$5 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().aj9;
+  var x1$5 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().ajL;
   var preLhsIndex$macro$47 = evidence$1.c;
   var input$macro$56 = evidence$1.T;
-  var x1$7 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$7 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$32 = evidence$1.c;
   var input$macro$41 = evidence$1.T;
   var x1$9 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -88,18 +88,18 @@ $p.aM5 = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.v;
+    var lhsAggregate$macro$6 = evidence$1.r;
     var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        this.aJR(evidence$1);
-        var rhsAggregate$macro$7 = evidence$1.v;
+        this.aKw(evidence$1);
+        var rhsAggregate$macro$7 = evidence$1.r;
         var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
@@ -110,7 +110,7 @@ $p.aM5 = (function(evidence$1) {
           if (rhsMadeProgress$macro$10) {
             evidence$1.P();
           }
-          var res$macro$14 = evidence$1.ab(evidence$1.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$1.a8(evidence$1.D, nextIndex$macro$13);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
@@ -121,19 +121,19 @@ $p.aM5 = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.v;
+    var lhsAggregate$macro$21 = evidence$1.r;
     var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$1.P();
     }
     var lhsValue$macro$27 = evidence$1.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
-        this.aQV(evidence$1);
-        var rhsAggregate$macro$22 = evidence$1.v;
+        this.aRB(evidence$1);
+        var rhsAggregate$macro$22 = evidence$1.r;
         var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
@@ -144,7 +144,7 @@ $p.aM5 = (function(evidence$1) {
           if (rhsMadeProgress$macro$25) {
             evidence$1.P();
           }
-          var res$macro$29 = evidence$1.ab(x1$9.aG(lhsValue$macro$27, evidence$1.D), nextIndex$macro$28);
+          var res$macro$29 = evidence$1.a8(x1$9.aG(lhsValue$macro$27, evidence$1.D), nextIndex$macro$28);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
@@ -155,38 +155,38 @@ $p.aM5 = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$33 = evidence$1.c;
-    var lhsAggregate$macro$36 = evidence$1.v;
+    var lhsAggregate$macro$36 = evidence$1.r;
     var lhsMsg$macro$39 = evidence$1.F;
     if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
       evidence$1.P();
     }
     var lhsValue$macro$42 = evidence$1.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$34 = evidence$1.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AW();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().ua();
         var startPos = evidence$1.c;
-        var startCut = evidence$1.p;
-        evidence$1.p = false;
-        this.aJW(evidence$1);
+        var startCut = evidence$1.o;
+        evidence$1.o = false;
+        this.aKB(evidence$1);
         var postSuccess = evidence$1.d;
         if (postSuccess) {
-          var res = evidence$1.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$1.D));
-          res.p = (!(!(res.p | startCut)));
-        } else if (evidence$1.p) {
+          var res = evidence$1.ja(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$1.D));
+          res.o = (!(!(res.o | startCut)));
+        } else if (evidence$1.o) {
         } else {
-          var res$2 = evidence$1.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-          res$2.p = (!(!(res$2.p | startCut)));
+          var res$2 = evidence$1.a8($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+          res$2.o = (!(!(res$2.o | startCut)));
         }
         if (evidence$1.C) {
           var msg = evidence$1.F;
           if ((!postSuccess)) {
-            evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(msg.dL) + ".?")))), evidence$1.v, false);
+            evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(msg.dp) + ".?")))), evidence$1.r, false);
           }
         }
-        var rhsAggregate$macro$37 = evidence$1.v;
+        var rhsAggregate$macro$37 = evidence$1.r;
         var rhsMsg$macro$38 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$44 = evidence$1;
@@ -197,7 +197,7 @@ $p.aM5 = (function(evidence$1) {
           if (rhsMadeProgress$macro$40) {
             evidence$1.P();
           }
-          var res$macro$44 = evidence$1.ab(x1$7.aG(lhsValue$macro$42, evidence$1.D), nextIndex$macro$43);
+          var res$macro$44 = evidence$1.a8(x1$7.aG(lhsValue$macro$42, evidence$1.D), nextIndex$macro$43);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$1.S));
@@ -208,19 +208,19 @@ $p.aM5 = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$48 = evidence$1.c;
-    var lhsAggregate$macro$51 = evidence$1.v;
+    var lhsAggregate$macro$51 = evidence$1.r;
     var lhsMsg$macro$54 = evidence$1.F;
     if ((postLhsIndex$macro$48 > preLhsIndex$macro$47)) {
       evidence$1.P();
     }
     var lhsValue$macro$57 = evidence$1.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$49 = evidence$1.c;
-        this.afZ(evidence$1);
-        var rhsAggregate$macro$52 = evidence$1.v;
+        this.agC(evidence$1);
+        var rhsAggregate$macro$52 = evidence$1.r;
         var rhsMsg$macro$53 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$59 = evidence$1;
@@ -231,7 +231,7 @@ $p.aM5 = (function(evidence$1) {
           if (rhsMadeProgress$macro$55) {
             evidence$1.P();
           }
-          var res$macro$59 = evidence$1.ab(x1$5.aG(lhsValue$macro$57, evidence$1.D), nextIndex$macro$58);
+          var res$macro$59 = evidence$1.a8(x1$5.aG(lhsValue$macro$57, evidence$1.D), nextIndex$macro$58);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$54, rhsMsg$macro$53), lhsAggregate$macro$51.W(rhsAggregate$macro$52), (preRhsIndex$macro$49 === evidence$1.S));
@@ -243,20 +243,20 @@ $p.aM5 = (function(evidence$1) {
     var x1$14 = evidence$1;
   } else {
     var postLhsIndex$macro$63 = evidence$1.c;
-    var lhsAggregate$macro$66 = evidence$1.v;
+    var lhsAggregate$macro$66 = evidence$1.r;
     var lhsMsg$macro$69 = evidence$1.F;
     if ((postLhsIndex$macro$63 > preLhsIndex$macro$62)) {
       evidence$1.P();
     }
     var lhsValue$macro$72 = evidence$1.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
         var x1$14 = evidence$1;
       } else {
         var preRhsIndex$macro$64 = evidence$1.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__End__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$1);
-        var rhsAggregate$macro$67 = evidence$1.v;
+        var rhsAggregate$macro$67 = evidence$1.r;
         var rhsMsg$macro$68 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$74 = evidence$1;
@@ -267,7 +267,7 @@ $p.aM5 = (function(evidence$1) {
           if (rhsMadeProgress$macro$70) {
             evidence$1.P();
           }
-          var res$macro$74 = evidence$1.ab(lhsValue$macro$72, nextIndex$macro$73);
+          var res$macro$74 = evidence$1.a8(lhsValue$macro$72, nextIndex$macro$73);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$69, rhsMsg$macro$68), lhsAggregate$macro$66.W(rhsAggregate$macro$67), (preRhsIndex$macro$64 === evidence$1.S));
@@ -279,14 +279,14 @@ $p.aM5 = (function(evidence$1) {
     }
   }
   if (instrument) {
-    evidence$1.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, x1$14.c, x1$14.d);
+    evidence$1.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, x1$14.c, x1$14.d);
   }
   if (x1$14.C) {
-    var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B)));
+    var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B)));
     var forceAggregate = (startIndex < x1$14.S);
-    x1$14.K(newshortMsg$1, x1$14.v, forceAggregate);
+    x1$14.K(newshortMsg$1, x1$14.r, forceAggregate);
     if ((!x1$14.d)) {
-      x1$14.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, startIndex), x1$14.Y);
+      x1$14.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, startIndex), x1$14.a0);
     }
   }
   if ((!x1$14.d)) {
@@ -296,18 +296,18 @@ $p.aM5 = (function(evidence$1) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    x1$14.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wv, x0.ww, x0.Af, x0.tI);
+    x1$14.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wG, x0.wH, x0.Aw, x0.tU);
     return x1$14;
   }
 });
-$p.aJR = (function(evidence$2) {
-  var this$1 = this.Dc;
+$p.aKw = (function(evidence$2) {
+  var this$1 = this.Dp;
   var startIndex = evidence$2.c;
   var instrument = (evidence$2.M !== null);
   if (instrument) {
-    evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
+    evidence$2.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$2.c;
   var input$macro$26 = evidence$2.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -317,26 +317,26 @@ $p.aJR = (function(evidence$2) {
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$2.c;
-    var lhsAggregate$macro$6 = evidence$2.v;
+    var lhsAggregate$macro$6 = evidence$2.r;
     var lhsMsg$macro$9 = evidence$2.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$2.P();
     }
     var lhsValue$macro$12 = evidence$2.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
-      if (((!evidence$2.d) && evidence$2.p)) {
+      if (((!evidence$2.d) && evidence$2.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$2.c;
         var startIndex$1 = evidence$2.c;
         var instrument$1 = (evidence$2.M !== null);
         if (instrument$1) {
-          evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, startIndex$1);
+          evidence$2.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, startIndex$1);
         }
         var startIndex$2 = evidence$2.c;
         var instrument$2 = (evidence$2.M !== null);
         if (instrument$2) {
-          evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$2.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$2.c;
@@ -346,23 +346,23 @@ $p.aJR = (function(evidence$2) {
           var x1$4$1 = evidence$2;
         } else {
           var postLhsIndex$macro$3$1 = evidence$2.c;
-          var lhsAggregate$macro$6$1 = evidence$2.v;
+          var lhsAggregate$macro$6$1 = evidence$2.r;
           var lhsMsg$macro$9$1 = evidence$2.F;
-          evidence$2.p = true;
+          evidence$2.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$2.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
           if (evidence$2.d) {
-            if (((!evidence$2.d) && evidence$2.p)) {
+            if (((!evidence$2.d) && evidence$2.o)) {
               var x1$4$1 = evidence$2;
             } else {
               var preRhsIndex$macro$4$1 = evidence$2.c;
               $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbolSeq__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$2);
-              var rhsAggregate$macro$7 = evidence$2.v;
+              var rhsAggregate$macro$7 = evidence$2.r;
               var rhsMsg$macro$8 = evidence$2.F;
               if ((!evidence$2.d)) {
-                evidence$2.p = true;
+                evidence$2.o = true;
                 var res$macro$14 = evidence$2;
               } else {
                 var postRhsIndex$macro$5 = evidence$2.c;
@@ -371,7 +371,7 @@ $p.aJR = (function(evidence$2) {
                 if (rhsMadeProgress$macro$10) {
                   evidence$2.P();
                 }
-                var res$macro$14 = evidence$2.ab(evidence$2.D, nextIndex$macro$13);
+                var res$macro$14 = evidence$2.a8(evidence$2.D, nextIndex$macro$13);
               }
               if (evidence$2.C) {
                 evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$2.S));
@@ -383,28 +383,28 @@ $p.aJR = (function(evidence$2) {
           }
         }
         if (instrument$2) {
-          evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$2.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
+          x1$4$1.K(newshortMsg, x1$4$1.r, forceAggregate);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
         if (instrument$1) {
-          evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, x1$4$1.c, x1$4$1.d);
+          evidence$2.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B)));
+          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
+          x1$4$1.K(newshortMsg$1, x1$4$1.r, forceAggregate$1);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, startIndex$1), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, startIndex$1), x1$4$1.a0);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$2.v;
+        var rhsAggregate$macro$7$1 = evidence$2.r;
         var rhsMsg$macro$8$1 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$14$1 = evidence$2;
@@ -415,7 +415,7 @@ $p.aJR = (function(evidence$2) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$2.P();
           }
-          var res$macro$14$1 = evidence$2.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$2.D), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$2.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$2.D), nextIndex$macro$13$1);
         }
         if (evidence$2.C) {
           evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$2.S));
@@ -427,20 +427,20 @@ $p.aJR = (function(evidence$2) {
     var parse0$3 = evidence$2;
   } else {
     var postLhsIndex$macro$18 = evidence$2.c;
-    var lhsAggregate$macro$21 = evidence$2.v;
+    var lhsAggregate$macro$21 = evidence$2.r;
     var lhsMsg$macro$24 = evidence$2.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$2.P();
     }
     var lhsValue$macro$27 = evidence$2.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
-      if (((!evidence$2.d) && evidence$2.p)) {
+      if (((!evidence$2.d) && evidence$2.o)) {
         var parse0$3 = evidence$2;
       } else {
         var preRhsIndex$macro$19 = evidence$2.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$2);
-        var rhsAggregate$macro$22 = evidence$2.v;
+        var rhsAggregate$macro$22 = evidence$2.r;
         var rhsMsg$macro$23 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$29 = evidence$2;
@@ -451,7 +451,7 @@ $p.aJR = (function(evidence$2) {
           if (rhsMadeProgress$macro$25) {
             evidence$2.P();
           }
-          var res$macro$29 = evidence$2.ab(x1$2.aG(lhsValue$macro$27, (evidence$2.D | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$2.a8(x1$2.aG(lhsValue$macro$27, (evidence$2.D | 0)), nextIndex$macro$28);
         }
         if (evidence$2.C) {
           evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$2.S));
@@ -469,23 +469,23 @@ $p.aJR = (function(evidence$2) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
-    evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$2.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
-    x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
+    x1$2$1.K(newshortMsg$2, x1$2$1.r, forceAggregate$2);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -509,14 +509,14 @@ $p.aJR = (function(evidence$2) {
     return parse0$4;
   }
 });
-$p.aQV = (function(evidence$3) {
-  var this$1 = this.Dc;
+$p.aRB = (function(evidence$3) {
+  var this$1 = this.Dp;
   var startIndex = evidence$3.c;
   var instrument = (evidence$3.M !== null);
   if (instrument) {
-    evidence$3.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
+    evidence$3.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$3.c;
   var input$macro$26 = evidence$3.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -526,26 +526,26 @@ $p.aQV = (function(evidence$3) {
   if ((!evidence$3.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.v;
+    var lhsAggregate$macro$6 = evidence$3.r;
     var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$3.P();
     }
     var lhsValue$macro$12 = evidence$3.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
-      if (((!evidence$3.d) && evidence$3.p)) {
+      if (((!evidence$3.d) && evidence$3.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$3.c;
         var startIndex$1 = evidence$3.c;
         var instrument$1 = (evidence$3.M !== null);
         if (instrument$1) {
-          evidence$3.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, startIndex$1);
+          evidence$3.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, startIndex$1);
         }
         var startIndex$2 = evidence$3.c;
         var instrument$2 = (evidence$3.M !== null);
         if (instrument$2) {
-          evidence$3.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$3.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$3.c;
@@ -555,23 +555,23 @@ $p.aQV = (function(evidence$3) {
           var x1$4$1 = evidence$3;
         } else {
           var postLhsIndex$macro$3$1 = evidence$3.c;
-          var lhsAggregate$macro$6$1 = evidence$3.v;
+          var lhsAggregate$macro$6$1 = evidence$3.r;
           var lhsMsg$macro$9$1 = evidence$3.F;
-          evidence$3.p = true;
+          evidence$3.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$3.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
           if (evidence$3.d) {
-            if (((!evidence$3.d) && evidence$3.p)) {
+            if (((!evidence$3.d) && evidence$3.o)) {
               var x1$4$1 = evidence$3;
             } else {
               var preRhsIndex$macro$4$1 = evidence$3.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().I9(evidence$3);
-              var rhsAggregate$macro$7 = evidence$3.v;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Iu(evidence$3);
+              var rhsAggregate$macro$7 = evidence$3.r;
               var rhsMsg$macro$8 = evidence$3.F;
               if ((!evidence$3.d)) {
-                evidence$3.p = true;
+                evidence$3.o = true;
                 var res$macro$14 = evidence$3;
               } else {
                 var postRhsIndex$macro$5 = evidence$3.c;
@@ -580,7 +580,7 @@ $p.aQV = (function(evidence$3) {
                 if (rhsMadeProgress$macro$10) {
                   evidence$3.P();
                 }
-                var res$macro$14 = evidence$3.ab(evidence$3.D, nextIndex$macro$13);
+                var res$macro$14 = evidence$3.a8(evidence$3.D, nextIndex$macro$13);
               }
               if (evidence$3.C) {
                 evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$3.S));
@@ -592,28 +592,28 @@ $p.aQV = (function(evidence$3) {
           }
         }
         if (instrument$2) {
-          evidence$3.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$3.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
+          x1$4$1.K(newshortMsg, x1$4$1.r, forceAggregate);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
         if (instrument$1) {
-          evidence$3.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, x1$4$1.c, x1$4$1.d);
+          evidence$3.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B)));
+          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
+          x1$4$1.K(newshortMsg$1, x1$4$1.r, forceAggregate$1);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, startIndex$1), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, startIndex$1), x1$4$1.a0);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$3.v;
+        var rhsAggregate$macro$7$1 = evidence$3.r;
         var rhsMsg$macro$8$1 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14$1 = evidence$3;
@@ -624,7 +624,7 @@ $p.aQV = (function(evidence$3) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$3.P();
           }
-          var res$macro$14$1 = evidence$3.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$3.D), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$3.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$3.D), nextIndex$macro$13$1);
         }
         if (evidence$3.C) {
           evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$3.S));
@@ -636,20 +636,20 @@ $p.aQV = (function(evidence$3) {
     var parse0$3 = evidence$3;
   } else {
     var postLhsIndex$macro$18 = evidence$3.c;
-    var lhsAggregate$macro$21 = evidence$3.v;
+    var lhsAggregate$macro$21 = evidence$3.r;
     var lhsMsg$macro$24 = evidence$3.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$3.P();
     }
     var lhsValue$macro$27 = evidence$3.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
-      if (((!evidence$3.d) && evidence$3.p)) {
+      if (((!evidence$3.d) && evidence$3.o)) {
         var parse0$3 = evidence$3;
       } else {
         var preRhsIndex$macro$19 = evidence$3.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$3);
-        var rhsAggregate$macro$22 = evidence$3.v;
+        var rhsAggregate$macro$22 = evidence$3.r;
         var rhsMsg$macro$23 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$29 = evidence$3;
@@ -660,7 +660,7 @@ $p.aQV = (function(evidence$3) {
           if (rhsMadeProgress$macro$25) {
             evidence$3.P();
           }
-          var res$macro$29 = evidence$3.ab(x1$2.aG(lhsValue$macro$27, (evidence$3.D | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$3.a8(x1$2.aG(lhsValue$macro$27, (evidence$3.D | 0)), nextIndex$macro$28);
         }
         if (evidence$3.C) {
           evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$3.S));
@@ -678,23 +678,23 @@ $p.aQV = (function(evidence$3) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
-    evidence$3.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$3.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
-    x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
+    x1$2$1.K(newshortMsg$2, x1$2$1.r, forceAggregate$2);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -718,14 +718,14 @@ $p.aQV = (function(evidence$3) {
     return parse0$4;
   }
 });
-$p.aJW = (function(evidence$4) {
-  var this$1 = this.Dc;
+$p.aKB = (function(evidence$4) {
+  var this$1 = this.Dp;
   var startIndex = evidence$4.c;
   var instrument = (evidence$4.M !== null);
   if (instrument) {
-    evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
+    evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$4.c;
   var input$macro$26 = evidence$4.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -735,38 +735,38 @@ $p.aJW = (function(evidence$4) {
   if ((!evidence$4.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$4.c;
-    var lhsAggregate$macro$6 = evidence$4.v;
+    var lhsAggregate$macro$6 = evidence$4.r;
     var lhsMsg$macro$9 = evidence$4.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$4.P();
     }
     var lhsValue$macro$12 = evidence$4.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$4.c;
         var startIndex$1 = evidence$4.c;
         var instrument$1 = (evidence$4.M !== null);
         if (instrument$1) {
-          evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, startIndex$1);
+          evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, startIndex$1);
         }
         var x1$3 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
         var preLhsIndex$macro$64 = evidence$4.c;
         var input$macro$73 = evidence$4.T;
-        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
         var preLhsIndex$macro$32 = evidence$4.c;
         var input$macro$41 = evidence$4.T;
-        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
         var preLhsIndex$macro$17$1 = evidence$4.c;
         var input$macro$26$1 = evidence$4.T;
-        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
         var preLhsIndex$macro$2$1 = evidence$4.c;
         var input$macro$11$1 = evidence$4.T;
         var startIndex$2 = evidence$4.c;
         var instrument$2 = (evidence$4.M !== null);
         if (instrument$2) {
-          evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$2 = evidence$4.c;
@@ -776,23 +776,23 @@ $p.aJW = (function(evidence$4) {
           var x1$4$1 = evidence$4;
         } else {
           var postLhsIndex$macro$3$1 = evidence$4.c;
-          var lhsAggregate$macro$6$1 = evidence$4.v;
+          var lhsAggregate$macro$6$1 = evidence$4.r;
           var lhsMsg$macro$9$1 = evidence$4.F;
-          evidence$4.p = true;
+          evidence$4.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$2)) {
             evidence$4.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
               var x1$4$1 = evidence$4;
             } else {
               var preRhsIndex$macro$4$1 = evidence$4.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().I9(evidence$4);
-              var rhsAggregate$macro$7 = evidence$4.v;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Iu(evidence$4);
+              var rhsAggregate$macro$7 = evidence$4.r;
               var rhsMsg$macro$8 = evidence$4.F;
               if ((!evidence$4.d)) {
-                evidence$4.p = true;
+                evidence$4.o = true;
                 var res$macro$14 = evidence$4;
               } else {
                 var postRhsIndex$macro$5 = evidence$4.c;
@@ -801,7 +801,7 @@ $p.aJW = (function(evidence$4) {
                 if (rhsMadeProgress$macro$10) {
                   evidence$4.P();
                 }
-                var res$macro$14 = evidence$4.ab(evidence$4.D, nextIndex$macro$13);
+                var res$macro$14 = evidence$4.a8(evidence$4.D, nextIndex$macro$13);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$4.S));
@@ -813,28 +813,28 @@ $p.aJW = (function(evidence$4) {
           }
         }
         if (instrument$2) {
-          evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
+          x1$4$1.K(newshortMsg, x1$4$1.r, forceAggregate);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$3$2 = evidence$4.c;
-          var lhsAggregate$macro$6$2 = evidence$4.v;
+          var lhsAggregate$macro$6$2 = evidence$4.r;
           var lhsMsg$macro$9$2 = evidence$4.F;
           if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$1)) {
             evidence$4.P();
           }
           var lhsValue$macro$12$2 = evidence$4.D;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
             } else {
               var preRhsIndex$macro$4$2 = evidence$4.c;
               var input = evidence$4.T;
@@ -842,12 +842,12 @@ $p.aJW = (function(evidence$4) {
               if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
                 evidence$4.aJ(((1 + index) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aE();
               }
               if (evidence$4.C) {
-                evidence$4.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                evidence$4.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
               }
-              var rhsAggregate$macro$7$1 = evidence$4.v;
+              var rhsAggregate$macro$7$1 = evidence$4.r;
               var rhsMsg$macro$8$1 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$14$1 = evidence$4;
@@ -858,7 +858,7 @@ $p.aJW = (function(evidence$4) {
                 if (rhsMadeProgress$macro$10$1) {
                   evidence$4.P();
                 }
-                var res$macro$14$1 = evidence$4.ab(lhsValue$macro$12$2, nextIndex$macro$13$1);
+                var res$macro$14$1 = evidence$4.a8(lhsValue$macro$12$2, nextIndex$macro$13$1);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$1), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$2 === evidence$4.S));
@@ -869,15 +869,15 @@ $p.aJW = (function(evidence$4) {
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$18 = evidence$4.c;
-          var lhsAggregate$macro$21 = evidence$4.v;
+          var lhsAggregate$macro$21 = evidence$4.r;
           var lhsMsg$macro$24 = evidence$4.F;
           if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
             evidence$4.P();
           }
           var lhsValue$macro$27 = evidence$4.D;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
             } else {
               var preRhsIndex$macro$19 = evidence$4.c;
               var input$2 = evidence$4.T;
@@ -885,12 +885,12 @@ $p.aJW = (function(evidence$4) {
               if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 42))) {
                 evidence$4.aJ(((1 + index$2) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aE();
               }
               if (evidence$4.C) {
-                evidence$4.av(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"*\""))));
+                evidence$4.at(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"*\""))));
               }
-              var rhsAggregate$macro$22 = evidence$4.v;
+              var rhsAggregate$macro$22 = evidence$4.r;
               var rhsMsg$macro$23 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$29 = evidence$4;
@@ -901,7 +901,7 @@ $p.aJW = (function(evidence$4) {
                 if (rhsMadeProgress$macro$25) {
                   evidence$4.P();
                 }
-                var res$macro$29 = evidence$4.ab(lhsValue$macro$27, nextIndex$macro$28);
+                var res$macro$29 = evidence$4.a8(lhsValue$macro$27, nextIndex$macro$28);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$4.S));
@@ -912,15 +912,15 @@ $p.aJW = (function(evidence$4) {
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$33 = evidence$4.c;
-          var lhsAggregate$macro$36 = evidence$4.v;
+          var lhsAggregate$macro$36 = evidence$4.r;
           var lhsMsg$macro$39 = evidence$4.F;
           if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
             evidence$4.P();
           }
           var lhsValue$macro$42 = evidence$4.D;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
             } else {
               var preRhsIndex$macro$34 = evidence$4.c;
               var input$3 = evidence$4.T;
@@ -928,12 +928,12 @@ $p.aJW = (function(evidence$4) {
               if ((input$3.V(index$3) && (input$3.as.charCodeAt(index$3) === 125))) {
                 evidence$4.aJ(((1 + index$3) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aE();
               }
               if (evidence$4.C) {
-                evidence$4.av(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
+                evidence$4.at(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
               }
-              var rhsAggregate$macro$37 = evidence$4.v;
+              var rhsAggregate$macro$37 = evidence$4.r;
               var rhsMsg$macro$38 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$44 = evidence$4;
@@ -944,7 +944,7 @@ $p.aJW = (function(evidence$4) {
                 if (rhsMadeProgress$macro$40) {
                   evidence$4.P();
                 }
-                var res$macro$44 = evidence$4.ab(lhsValue$macro$42, nextIndex$macro$43);
+                var res$macro$44 = evidence$4.a8(lhsValue$macro$42, nextIndex$macro$43);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$4.S));
@@ -956,22 +956,22 @@ $p.aJW = (function(evidence$4) {
           var x1$18 = evidence$4;
         } else {
           var postLhsIndex$macro$65 = evidence$4.c;
-          var lhsAggregate$macro$68 = evidence$4.v;
+          var lhsAggregate$macro$68 = evidence$4.r;
           var lhsMsg$macro$71 = evidence$4.F;
           if ((postLhsIndex$macro$65 > preLhsIndex$macro$64)) {
             evidence$4.P();
           }
           var lhsValue$macro$74 = evidence$4.D;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
               var x1$18 = evidence$4;
             } else {
               var preRhsIndex$macro$66 = evidence$4.c;
-              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AW();
+              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().ua();
               var startPos = evidence$4.c;
-              var startCut = evidence$4.p;
-              evidence$4.p = false;
+              var startCut = evidence$4.o;
+              evidence$4.o = false;
               $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
               var preLhsIndex$macro$49 = evidence$4.c;
               var input$macro$58 = evidence$4.T;
@@ -1021,46 +1021,46 @@ $p.aJW = (function(evidence$4) {
               if ($x_1) {
                 evidence$4.aJ(end);
               } else {
-                evidence$4.aH();
+                evidence$4.aE();
               }
               if (evidence$4.C) {
-                evidence$4.av(index$4, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"without\""))));
+                evidence$4.at(index$4, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"without\""))));
               }
               if ((!evidence$4.d)) {
               } else {
                 var postLhsIndex$macro$50 = evidence$4.c;
-                var lhsAggregate$macro$53 = evidence$4.v;
+                var lhsAggregate$macro$53 = evidence$4.r;
                 var lhsMsg$macro$56 = evidence$4.F;
                 if ((postLhsIndex$macro$50 > preLhsIndex$macro$49)) {
                   evidence$4.P();
                 }
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                 if (evidence$4.d) {
-                  if (((!evidence$4.d) && evidence$4.p)) {
+                  if (((!evidence$4.d) && evidence$4.o)) {
                   } else {
                     var preRhsIndex$macro$51 = evidence$4.c;
                     var f = (() => {
-                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
+                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nm();
                       var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
                       var this$37 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-                      var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
+                      var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
                       var startIndex$3 = evidence$4.c;
                       var count = 0;
                       var precut = false;
-                      var outerCut = evidence$4.p;
+                      var outerCut = evidence$4.o;
                       var sepMsg = null;
                       var lastAgg = null;
                       while (true) {
-                        evidence$4.p = (!(!(precut | ((count < 0) && outerCut))));
+                        evidence$4.o = (!(!(precut | ((count < 0) && outerCut))));
                         $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$4);
                         var parsedMsg = evidence$4.F;
-                        var parsedAgg = evidence$4.v;
-                        var postCut = evidence$4.p;
+                        var parsedAgg = evidence$4.r;
+                        var postCut = evidence$4.o;
                         var verboseFailures = evidence$4.C;
                         if ((!evidence$4.d)) {
                           var res$1 = (postCut ? evidence$4 : $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$37, startIndex$3, startIndex$3, count, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc));
                           if (verboseFailures) {
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
                           }
                           return res$1;
                         } else {
@@ -1070,14 +1070,14 @@ $p.aJW = (function(evidence$4) {
                           if ((nextCount === 2147483647)) {
                             var res$2$1 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$37, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc);
                             if (verboseFailures) {
-                              evidence$4.av(startIndex$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(parsedMsg.dL) + ".rep")))(parsedMsg))));
+                              evidence$4.at(startIndex$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(parsedMsg.dp) + ".rep")))(parsedMsg))));
                             }
                             return res$2$1;
-                          } else if ((!((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$4), (!((!evidence$4.d) && evidence$4.p)))))) {
+                          } else if ((!((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab(whitespace, evidence$4), (!((!evidence$4.d) && evidence$4.o)))))) {
                             return evidence$4;
                           } else {
-                            evidence$4.p = false;
-                            var sepCut = evidence$4.p;
+                            evidence$4.o = false;
+                            var sepCut = evidence$4.o;
                             var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
                             startIndex$3 = beforeSepIndex;
                             count = nextCount;
@@ -1092,17 +1092,17 @@ $p.aJW = (function(evidence$4) {
                     var startIndex$4 = evidence$4.c;
                     var instrument$3 = (evidence$4.M !== null);
                     if (instrument$3) {
-                      evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$4);
+                      evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$4);
                     }
-                    var oldCut = evidence$4.p;
-                    evidence$4.p = false;
+                    var oldCut = evidence$4.o;
+                    evidence$4.o = false;
                     var startPos$1 = evidence$4.c;
                     var startIndex$5 = evidence$4.c;
                     var instrument$4 = (evidence$4.M !== null);
                     if (instrument$4) {
-                      evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5);
+                      evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
                     var preLhsIndex$macro$17$2 = evidence$4.c;
                     var input$macro$26$2 = evidence$4.T;
                     $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -1113,26 +1113,26 @@ $p.aJW = (function(evidence$4) {
                     if ((input$1.V(index$10) && (input$1.as.charCodeAt(index$10) === 123))) {
                       evidence$4.aJ(((1 + index$10) | 0));
                     } else {
-                      evidence$4.aH();
+                      evidence$4.aE();
                     }
                     if (evidence$4.C) {
-                      evidence$4.av(index$10, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                      evidence$4.at(index$10, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$4.d)) {
                     } else {
                       var postLhsIndex$macro$3$3 = evidence$4.c;
-                      var lhsAggregate$macro$6$3 = evidence$4.v;
+                      var lhsAggregate$macro$6$3 = evidence$4.r;
                       var lhsMsg$macro$9$3 = evidence$4.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$4.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
-                        if (((!evidence$4.d) && evidence$4.p)) {
+                        if (((!evidence$4.d) && evidence$4.o)) {
                         } else {
                           var preRhsIndex$macro$4$3 = evidence$4.c;
                           f();
-                          var rhsAggregate$macro$7$2 = evidence$4.v;
+                          var rhsAggregate$macro$7$2 = evidence$4.r;
                           var rhsMsg$macro$8$2 = evidence$4.F;
                           if ((!evidence$4.d)) {
                             var res$macro$14$2 = evidence$4;
@@ -1143,7 +1143,7 @@ $p.aJW = (function(evidence$4) {
                             if (rhsMadeProgress$macro$10$2) {
                               evidence$4.P();
                             }
-                            var res$macro$14$2 = evidence$4.ab(evidence$4.D, nextIndex$macro$13$2);
+                            var res$macro$14$2 = evidence$4.a8(evidence$4.D, nextIndex$macro$13$2);
                           }
                           if (evidence$4.C) {
                             evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$4.S));
@@ -1155,15 +1155,15 @@ $p.aJW = (function(evidence$4) {
                       var x1$8 = evidence$4;
                     } else {
                       var postLhsIndex$macro$18$1 = evidence$4.c;
-                      var lhsAggregate$macro$21$1 = evidence$4.v;
+                      var lhsAggregate$macro$21$1 = evidence$4.r;
                       var lhsMsg$macro$24$1 = evidence$4.F;
                       if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
                         evidence$4.P();
                       }
                       var lhsValue$macro$27$1 = evidence$4.D;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
-                        if (((!evidence$4.d) && evidence$4.p)) {
+                        if (((!evidence$4.d) && evidence$4.o)) {
                           var x1$8 = evidence$4;
                         } else {
                           var preRhsIndex$macro$19$1 = evidence$4.c;
@@ -1172,12 +1172,12 @@ $p.aJW = (function(evidence$4) {
                           if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 125))) {
                             evidence$4.aJ(((1 + index$2$1) | 0));
                           } else {
-                            evidence$4.aH();
+                            evidence$4.aE();
                           }
                           if (evidence$4.C) {
-                            evidence$4.av(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
+                            evidence$4.at(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
-                          var rhsAggregate$macro$22$1 = evidence$4.v;
+                          var rhsAggregate$macro$22$1 = evidence$4.r;
                           var rhsMsg$macro$23$1 = evidence$4.F;
                           if ((!evidence$4.d)) {
                             var res$macro$29$1 = evidence$4;
@@ -1188,7 +1188,7 @@ $p.aJW = (function(evidence$4) {
                             if (rhsMadeProgress$macro$25$1) {
                               evidence$4.P();
                             }
-                            var res$macro$29$1 = evidence$4.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                            var res$macro$29$1 = evidence$4.a8(lhsValue$macro$27$1, nextIndex$macro$28$1);
                           }
                           if (evidence$4.C) {
                             evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$4.S));
@@ -1200,36 +1200,36 @@ $p.aJW = (function(evidence$4) {
                       }
                     }
                     if (instrument$4) {
-                      evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
+                      evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
                     if (x1$8.C) {
-                      var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
+                      var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                       var forceAggregate$1 = (startIndex$5 < x1$8.S);
-                      x1$8.K(newshortMsg$1, x1$8.v, forceAggregate$1);
+                      x1$8.K(newshortMsg$1, x1$8.r, forceAggregate$1);
                       if ((!x1$8.d)) {
-                        x1$8.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5), x1$8.Y);
+                        x1$8.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5), x1$8.a0);
                       }
                     }
                     var lhsMsg = evidence$4.F;
-                    var lhsAggregate = evidence$4.v;
+                    var lhsAggregate = evidence$4.r;
                     if (evidence$4.d) {
-                      evidence$4.p = (!(!(evidence$4.p | oldCut)));
+                      evidence$4.o = (!(!(evidence$4.o | oldCut)));
                       var x1$3$4 = evidence$4;
-                    } else if (evidence$4.p) {
+                    } else if (evidence$4.o) {
                       var x1$3$4 = evidence$4;
                     } else {
                       var verboseFailures$1 = evidence$4.C;
                       evidence$4.c = startPos$1;
                       if (verboseFailures$1) {
-                        evidence$4.K(lhsMsg, evidence$4.v, false);
+                        evidence$4.K(lhsMsg, evidence$4.r, false);
                       }
-                      evidence$4.p = false;
+                      evidence$4.o = false;
                       var startIndex$6 = evidence$4.c;
                       var instrument$5 = (evidence$4.M !== null);
                       if (instrument$5) {
-                        evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6);
+                        evidence$4.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
                       var preLhsIndex$macro$17$3 = evidence$4.c;
                       var input$macro$26$3 = evidence$4.T;
                       $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -1240,26 +1240,26 @@ $p.aJW = (function(evidence$4) {
                       if ((input$5.V(index$11) && (input$5.as.charCodeAt(index$11) === 40))) {
                         evidence$4.aJ(((1 + index$11) | 0));
                       } else {
-                        evidence$4.aH();
+                        evidence$4.aE();
                       }
                       if (evidence$4.C) {
-                        evidence$4.av(index$11, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
+                        evidence$4.at(index$11, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$4.d)) {
                       } else {
                         var postLhsIndex$macro$3$4 = evidence$4.c;
-                        var lhsAggregate$macro$6$4 = evidence$4.v;
+                        var lhsAggregate$macro$6$4 = evidence$4.r;
                         var lhsMsg$macro$9$4 = evidence$4.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                           evidence$4.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
-                          if (((!evidence$4.d) && evidence$4.p)) {
+                          if (((!evidence$4.d) && evidence$4.o)) {
                           } else {
                             var preRhsIndex$macro$4$4 = evidence$4.c;
                             f();
-                            var rhsAggregate$macro$7$3 = evidence$4.v;
+                            var rhsAggregate$macro$7$3 = evidence$4.r;
                             var rhsMsg$macro$8$3 = evidence$4.F;
                             if ((!evidence$4.d)) {
                               var res$macro$14$3 = evidence$4;
@@ -1270,7 +1270,7 @@ $p.aJW = (function(evidence$4) {
                               if (rhsMadeProgress$macro$10$3) {
                                 evidence$4.P();
                               }
-                              var res$macro$14$3 = evidence$4.ab(evidence$4.D, nextIndex$macro$13$3);
+                              var res$macro$14$3 = evidence$4.a8(evidence$4.D, nextIndex$macro$13$3);
                             }
                             if (evidence$4.C) {
                               evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$3), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$4 === evidence$4.S));
@@ -1282,15 +1282,15 @@ $p.aJW = (function(evidence$4) {
                         var x1$8$1 = evidence$4;
                       } else {
                         var postLhsIndex$macro$18$2 = evidence$4.c;
-                        var lhsAggregate$macro$21$2 = evidence$4.v;
+                        var lhsAggregate$macro$21$2 = evidence$4.r;
                         var lhsMsg$macro$24$2 = evidence$4.F;
                         if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17$3)) {
                           evidence$4.P();
                         }
                         var lhsValue$macro$27$2 = evidence$4.D;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
-                          if (((!evidence$4.d) && evidence$4.p)) {
+                          if (((!evidence$4.d) && evidence$4.o)) {
                             var x1$8$1 = evidence$4;
                           } else {
                             var preRhsIndex$macro$19$2 = evidence$4.c;
@@ -1299,12 +1299,12 @@ $p.aJW = (function(evidence$4) {
                             if ((input$2$2.V(index$2$2) && (input$2$2.as.charCodeAt(index$2$2) === 41))) {
                               evidence$4.aJ(((1 + index$2$2) | 0));
                             } else {
-                              evidence$4.aH();
+                              evidence$4.aE();
                             }
                             if (evidence$4.C) {
-                              evidence$4.av(index$2$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
+                              evidence$4.at(index$2$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
-                            var rhsAggregate$macro$22$2 = evidence$4.v;
+                            var rhsAggregate$macro$22$2 = evidence$4.r;
                             var rhsMsg$macro$23$2 = evidence$4.F;
                             if ((!evidence$4.d)) {
                               var res$macro$29$2 = evidence$4;
@@ -1315,7 +1315,7 @@ $p.aJW = (function(evidence$4) {
                               if (rhsMadeProgress$macro$25$2) {
                                 evidence$4.P();
                               }
-                              var res$macro$29$2 = evidence$4.ab(lhsValue$macro$27$2, nextIndex$macro$28$2);
+                              var res$macro$29$2 = evidence$4.a8(lhsValue$macro$27$2, nextIndex$macro$28$2);
                             }
                             if (evidence$4.C) {
                               evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$4.S));
@@ -1327,42 +1327,42 @@ $p.aJW = (function(evidence$4) {
                         }
                       }
                       if (instrument$5) {
-                        evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
+                        evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
                       if (x1$8$1.C) {
-                        var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
+                        var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                         var forceAggregate$2 = (startIndex$6 < x1$8$1.S);
-                        x1$8$1.K(newshortMsg$2, x1$8$1.v, forceAggregate$2);
+                        x1$8$1.K(newshortMsg$2, x1$8$1.r, forceAggregate$2);
                         if ((!x1$8$1.d)) {
-                          x1$8$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6), x1$8$1.Y);
+                          x1$8$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6), x1$8$1.a0);
                         }
                       }
                       var rhsMsg = evidence$4.F;
-                      var rhsCut = evidence$4.p;
+                      var rhsCut = evidence$4.o;
                       var endCut$1 = (!(!(rhsCut | oldCut)));
                       if (((!evidence$4.d) && (!rhsCut))) {
-                        evidence$4.d1(startPos$1);
+                        evidence$4.d2(startPos$1);
                       }
-                      evidence$4.p = endCut$1;
+                      evidence$4.o = endCut$1;
                       if (verboseFailures$1) {
                         var $x_7 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$4.v;
+                        var rassoc$3 = evidence$4.r;
                         evidence$4.K($x_7, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$4 = evidence$4;
                     }
                     if (instrument$3) {
-                      evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$4.c, x1$3$4.d);
+                      evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$4.c, x1$3$4.d);
                     }
                     if (x1$3$4.C) {
-                      var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
+                      var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                       var forceAggregate$3 = (startIndex$4 < x1$3$4.S);
-                      x1$3$4.K(newshortMsg$4, x1$3$4.v, forceAggregate$3);
+                      x1$3$4.K(newshortMsg$4, x1$3$4.r, forceAggregate$3);
                       if ((!x1$3$4.d)) {
-                        x1$3$4.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$4), x1$3$4.Y);
+                        x1$3$4.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$4), x1$3$4.a0);
                       }
                     }
-                    var rhsAggregate$macro$54 = evidence$4.v;
+                    var rhsAggregate$macro$54 = evidence$4.r;
                     var rhsMsg$macro$55 = evidence$4.F;
                     if ((!evidence$4.d)) {
                       var res$macro$61 = evidence$4;
@@ -1373,7 +1373,7 @@ $p.aJW = (function(evidence$4) {
                       if (rhsMadeProgress$macro$57) {
                         evidence$4.P();
                       }
-                      var res$macro$61 = evidence$4.ab(evidence$4.D, nextIndex$macro$60);
+                      var res$macro$61 = evidence$4.a8(evidence$4.D, nextIndex$macro$60);
                     }
                     if (evidence$4.C) {
                       evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$56, rhsMsg$macro$55), lhsAggregate$macro$53.W(rhsAggregate$macro$54), (preRhsIndex$macro$51 === evidence$4.S));
@@ -1383,20 +1383,20 @@ $p.aJW = (function(evidence$4) {
               }
               var postSuccess = evidence$4.d;
               if (postSuccess) {
-                var res$5$1 = evidence$4.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$4.D));
-                res$5$1.p = (!(!(res$5$1.p | startCut)));
-              } else if (evidence$4.p) {
+                var res$5$1 = evidence$4.ja(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$4.D));
+                res$5$1.o = (!(!(res$5$1.o | startCut)));
+              } else if (evidence$4.o) {
               } else {
-                var res$6$1 = evidence$4.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-                res$6$1.p = (!(!(res$6$1.p | startCut)));
+                var res$6$1 = evidence$4.a8($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+                res$6$1.o = (!(!(res$6$1.o | startCut)));
               }
               if (evidence$4.C) {
                 var msg = evidence$4.F;
                 if ((!postSuccess)) {
-                  evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(msg.dL) + ".?")))), evidence$4.v, false);
+                  evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(msg.dp) + ".?")))), evidence$4.r, false);
                 }
               }
-              var rhsAggregate$macro$69 = evidence$4.v;
+              var rhsAggregate$macro$69 = evidence$4.r;
               var rhsMsg$macro$70 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$76 = evidence$4;
@@ -1407,7 +1407,7 @@ $p.aJW = (function(evidence$4) {
                 if (rhsMadeProgress$macro$72) {
                   evidence$4.P();
                 }
-                var res$macro$76 = evidence$4.ab(x1$3.aG(lhsValue$macro$74, evidence$4.D), nextIndex$macro$75);
+                var res$macro$76 = evidence$4.a8(x1$3.aG(lhsValue$macro$74, evidence$4.D), nextIndex$macro$75);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$71, rhsMsg$macro$70), lhsAggregate$macro$68.W(rhsAggregate$macro$69), (preRhsIndex$macro$66 === evidence$4.S));
@@ -1419,17 +1419,17 @@ $p.aJW = (function(evidence$4) {
           }
         }
         if (instrument$1) {
-          evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, x1$18.c, x1$18.d);
+          evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, x1$18.c, x1$18.d);
         }
         if (x1$18.C) {
-          var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B)));
+          var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B)));
           var forceAggregate$4 = (startIndex$1 < x1$18.S);
-          x1$18.K(newshortMsg$6, x1$18.v, forceAggregate$4);
+          x1$18.K(newshortMsg$6, x1$18.r, forceAggregate$4);
           if ((!x1$18.d)) {
-            x1$18.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, startIndex$1), x1$18.Y);
+            x1$18.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, startIndex$1), x1$18.a0);
           }
         }
-        var rhsAggregate$macro$7$4 = evidence$4.v;
+        var rhsAggregate$macro$7$4 = evidence$4.r;
         var rhsMsg$macro$8$4 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$14$4 = evidence$4;
@@ -1440,7 +1440,7 @@ $p.aJW = (function(evidence$4) {
           if (rhsMadeProgress$macro$10$4) {
             evidence$4.P();
           }
-          var res$macro$14$4 = evidence$4.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$4.D), nextIndex$macro$13$4);
+          var res$macro$14$4 = evidence$4.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$4.D), nextIndex$macro$13$4);
         }
         if (evidence$4.C) {
           evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$4.S));
@@ -1452,20 +1452,20 @@ $p.aJW = (function(evidence$4) {
     var parse0$9 = evidence$4;
   } else {
     var postLhsIndex$macro$18$3 = evidence$4.c;
-    var lhsAggregate$macro$21$3 = evidence$4.v;
+    var lhsAggregate$macro$21$3 = evidence$4.r;
     var lhsMsg$macro$24$3 = evidence$4.F;
     if ((postLhsIndex$macro$18$3 > preLhsIndex$macro$17)) {
       evidence$4.P();
     }
     var lhsValue$macro$27$3 = evidence$4.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
         var parse0$9 = evidence$4;
       } else {
         var preRhsIndex$macro$19$3 = evidence$4.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$4);
-        var rhsAggregate$macro$22$3 = evidence$4.v;
+        var rhsAggregate$macro$22$3 = evidence$4.r;
         var rhsMsg$macro$23$3 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$29$3 = evidence$4;
@@ -1476,7 +1476,7 @@ $p.aJW = (function(evidence$4) {
           if (rhsMadeProgress$macro$25$3) {
             evidence$4.P();
           }
-          var res$macro$29$3 = evidence$4.ab(x1$2.aG(lhsValue$macro$27$3, (evidence$4.D | 0)), nextIndex$macro$28$3);
+          var res$macro$29$3 = evidence$4.a8(x1$2.aG(lhsValue$macro$27$3, (evidence$4.D | 0)), nextIndex$macro$28$3);
         }
         if (evidence$4.C) {
           evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$4.S));
@@ -1494,23 +1494,23 @@ $p.aJW = (function(evidence$4) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value$1 = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$9.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end$1), value$1);
+    var start = (x0.aS | 0);
+    var value$1 = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$9.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end$1), value$1);
     var x1$2$1 = parse0$9;
   }
   if (instrument) {
-    evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$4.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg$7 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$7 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$5 = (startIndex < x1$2$1.S);
-    x1$2$1.K(newshortMsg$7, x1$2$1.v, forceAggregate$5);
+    x1$2$1.K(newshortMsg$7, x1$2$1.r, forceAggregate$5);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -1533,7 +1533,7 @@ $p.aJW = (function(evidence$4) {
         var meta = x0$2.E();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_8 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dImport.$c_Lio_septimalmind_baboon_parser_model_RawImport(meta, p2.E(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_scala$002e$002dOption$0024.$m_s_Option$().i1(p2.z()).fh().cE($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(s$2$2))))));
+          var $x_8 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dImport.$c_Lio_septimalmind_baboon_parser_model_RawImport(meta, p2.E(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a2($j_scala$002e$002dOption$0024.$m_s_Option$().i3(p2.z()).fk().cH($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(s$2$2))))));
           break matchEnd4;
         }
       }
@@ -1543,14 +1543,14 @@ $p.aJW = (function(evidence$4) {
     return parse0$10;
   }
 });
-$p.aJZ = (function(evidence$5) {
-  var this$1 = this.Dc;
+$p.aKE = (function(evidence$5) {
+  var this$1 = this.Dp;
   var startIndex = evidence$5.c;
   var instrument = (evidence$5.M !== null);
   if (instrument) {
-    evidence$5.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
+    evidence$5.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$5.c;
   var input$macro$26 = evidence$5.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -1560,26 +1560,26 @@ $p.aJZ = (function(evidence$5) {
   if ((!evidence$5.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$5.c;
-    var lhsAggregate$macro$6 = evidence$5.v;
+    var lhsAggregate$macro$6 = evidence$5.r;
     var lhsMsg$macro$9 = evidence$5.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$5.P();
     }
     var lhsValue$macro$12 = evidence$5.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
-      if (((!evidence$5.d) && evidence$5.p)) {
+      if (((!evidence$5.d) && evidence$5.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$5.c;
         var startIndex$1 = evidence$5.c;
         var instrument$1 = (evidence$5.M !== null);
         if (instrument$1) {
-          evidence$5.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, startIndex$1);
+          evidence$5.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, startIndex$1);
         }
         var startIndex$2 = evidence$5.c;
         var instrument$2 = (evidence$5.M !== null);
         if (instrument$2) {
-          evidence$5.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$5.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$5.c;
@@ -1589,23 +1589,23 @@ $p.aJZ = (function(evidence$5) {
           var x1$4$1 = evidence$5;
         } else {
           var postLhsIndex$macro$3$1 = evidence$5.c;
-          var lhsAggregate$macro$6$1 = evidence$5.v;
+          var lhsAggregate$macro$6$1 = evidence$5.r;
           var lhsMsg$macro$9$1 = evidence$5.F;
-          evidence$5.p = true;
+          evidence$5.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$5.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
-            if (((!evidence$5.d) && evidence$5.p)) {
+            if (((!evidence$5.d) && evidence$5.o)) {
               var x1$4$1 = evidence$5;
             } else {
               var preRhsIndex$macro$4$1 = evidence$5.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().I9(evidence$5);
-              var rhsAggregate$macro$7 = evidence$5.v;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Iu(evidence$5);
+              var rhsAggregate$macro$7 = evidence$5.r;
               var rhsMsg$macro$8 = evidence$5.F;
               if ((!evidence$5.d)) {
-                evidence$5.p = true;
+                evidence$5.o = true;
                 var res$macro$14 = evidence$5;
               } else {
                 var postRhsIndex$macro$5 = evidence$5.c;
@@ -1614,7 +1614,7 @@ $p.aJZ = (function(evidence$5) {
                 if (rhsMadeProgress$macro$10) {
                   evidence$5.P();
                 }
-                var res$macro$14 = evidence$5.ab(evidence$5.D, nextIndex$macro$13);
+                var res$macro$14 = evidence$5.a8(evidence$5.D, nextIndex$macro$13);
               }
               if (evidence$5.C) {
                 evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$5.S));
@@ -1626,28 +1626,28 @@ $p.aJZ = (function(evidence$5) {
           }
         }
         if (instrument$2) {
-          evidence$5.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$5.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
+          x1$4$1.K(newshortMsg, x1$4$1.r, forceAggregate);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
         if (instrument$1) {
-          evidence$5.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, x1$4$1.c, x1$4$1.d);
+          evidence$5.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B)));
+          var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
+          x1$4$1.K(newshortMsg$1, x1$4$1.r, forceAggregate$1);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, startIndex$1), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, startIndex$1), x1$4$1.a0);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$5.v;
+        var rhsAggregate$macro$7$1 = evidence$5.r;
         var rhsMsg$macro$8$1 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$14$1 = evidence$5;
@@ -1658,7 +1658,7 @@ $p.aJZ = (function(evidence$5) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$5.P();
           }
-          var res$macro$14$1 = evidence$5.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$5.D), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$5.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$5.D), nextIndex$macro$13$1);
         }
         if (evidence$5.C) {
           evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$5.S));
@@ -1670,20 +1670,20 @@ $p.aJZ = (function(evidence$5) {
     var parse0$3 = evidence$5;
   } else {
     var postLhsIndex$macro$18 = evidence$5.c;
-    var lhsAggregate$macro$21 = evidence$5.v;
+    var lhsAggregate$macro$21 = evidence$5.r;
     var lhsMsg$macro$24 = evidence$5.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$5.P();
     }
     var lhsValue$macro$27 = evidence$5.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
-      if (((!evidence$5.d) && evidence$5.p)) {
+      if (((!evidence$5.d) && evidence$5.o)) {
         var parse0$3 = evidence$5;
       } else {
         var preRhsIndex$macro$19 = evidence$5.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$5);
-        var rhsAggregate$macro$22 = evidence$5.v;
+        var rhsAggregate$macro$22 = evidence$5.r;
         var rhsMsg$macro$23 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$29 = evidence$5;
@@ -1694,7 +1694,7 @@ $p.aJZ = (function(evidence$5) {
           if (rhsMadeProgress$macro$25) {
             evidence$5.P();
           }
-          var res$macro$29 = evidence$5.ab(x1$2.aG(lhsValue$macro$27, (evidence$5.D | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$5.a8(x1$2.aG(lhsValue$macro$27, (evidence$5.D | 0)), nextIndex$macro$28);
         }
         if (evidence$5.C) {
           evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$5.S));
@@ -1712,23 +1712,23 @@ $p.aJZ = (function(evidence$5) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
-    evidence$5.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$5.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
-    x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
+    x1$2$1.K(newshortMsg$2, x1$2$1.r, forceAggregate$2);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -1752,205 +1752,205 @@ $p.aJZ = (function(evidence$5) {
     return parse0$4;
   }
 });
-$p.aLQ = (function(evidence$6) {
+$p.aMw = (function(evidence$6) {
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.M !== null);
   if (instrument) {
-    evidence$6.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, startIndex);
+    evidence$6.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, startIndex);
   }
   var x1$3 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
   var preLhsIndex$macro$2 = evidence$6.c;
   var input$macro$11 = evidence$6.T;
-  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AW();
+  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().ua();
   var startPos = evidence$6.c;
-  var startCut = evidence$6.p;
-  evidence$6.p = false;
+  var startCut = evidence$6.o;
+  evidence$6.o = false;
   var startPos$2 = evidence$6.c;
-  var oldCapturing = evidence$6.gF;
-  evidence$6.gF = true;
+  var oldCapturing = evidence$6.gJ;
+  evidence$6.gJ = true;
   $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__kw__T__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), "root", evidence$6);
-  evidence$6.gF = oldCapturing;
+  evidence$6.gJ = oldCapturing;
   if ((!evidence$6.d)) {
   } else {
-    evidence$6.k2(evidence$6.T.J2(startPos$2, evidence$6.c));
+    evidence$6.ja(evidence$6.T.Jp(startPos$2, evidence$6.c));
   }
   var postSuccess = evidence$6.d;
   if (postSuccess) {
-    var res = evidence$6.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$6.D));
-    res.p = (!(!(res.p | startCut)));
-  } else if (evidence$6.p) {
+    var res = evidence$6.ja(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$6.D));
+    res.o = (!(!(res.o | startCut)));
+  } else if (evidence$6.o) {
   } else {
-    var res$2 = evidence$6.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-    res$2.p = (!(!(res$2.p | startCut)));
+    var res$2 = evidence$6.a8($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+    res$2.o = (!(!(res$2.o | startCut)));
   }
   if (evidence$6.C) {
     var msg = evidence$6.F;
     if ((!postSuccess)) {
-      evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(msg.dL) + ".?")))), evidence$6.v, false);
+      evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(msg.dp) + ".?")))), evidence$6.r, false);
     }
   }
   if ((!evidence$6.d)) {
     var x1$12 = evidence$6;
   } else {
     var postLhsIndex$macro$3 = evidence$6.c;
-    var lhsAggregate$macro$6 = evidence$6.v;
+    var lhsAggregate$macro$6 = evidence$6.r;
     var lhsMsg$macro$9 = evidence$6.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$6.P();
     }
     var lhsValue$macro$12 = evidence$6.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
-      if (((!evidence$6.d) && evidence$6.p)) {
+      if (((!evidence$6.d) && evidence$6.o)) {
         var x1$12 = evidence$6;
       } else {
         var preRhsIndex$macro$4 = evidence$6.c;
-        var oldCut = evidence$6.p;
-        evidence$6.p = false;
+        var oldCut = evidence$6.o;
+        evidence$6.o = false;
         var startPos$3 = evidence$6.c;
-        var oldCut$2 = evidence$6.p;
-        evidence$6.p = false;
+        var oldCut$2 = evidence$6.o;
+        evidence$6.o = false;
         var startPos$4 = evidence$6.c;
-        var oldCut$3 = evidence$6.p;
-        evidence$6.p = false;
+        var oldCut$3 = evidence$6.o;
+        evidence$6.o = false;
         var startPos$5 = evidence$6.c;
-        var oldCut$4 = evidence$6.p;
-        evidence$6.p = false;
+        var oldCut$4 = evidence$6.o;
+        evidence$6.o = false;
         var startPos$6 = evidence$6.c;
-        var oldCut$5 = evidence$6.p;
-        evidence$6.p = false;
+        var oldCut$5 = evidence$6.o;
+        evidence$6.o = false;
         var startPos$7 = evidence$6.c;
-        this.aGg(evidence$6);
+        this.aGU(evidence$6);
         var lhsMsg = evidence$6.F;
-        var lhsAggregate = evidence$6.v;
+        var lhsAggregate = evidence$6.r;
         if (evidence$6.d) {
-          evidence$6.p = (!(!(evidence$6.p | oldCut$5)));
-        } else if (evidence$6.p) {
+          evidence$6.o = (!(!(evidence$6.o | oldCut$5)));
+        } else if (evidence$6.o) {
         } else {
           var verboseFailures = evidence$6.C;
           evidence$6.c = startPos$7;
           if (verboseFailures) {
-            evidence$6.K(lhsMsg, evidence$6.v, false);
+            evidence$6.K(lhsMsg, evidence$6.r, false);
           }
-          evidence$6.p = false;
-          this.a0L(evidence$6);
+          evidence$6.o = false;
+          this.a1m(evidence$6);
           var rhsMsg = evidence$6.F;
-          var rhsCut = evidence$6.p;
+          var rhsCut = evidence$6.o;
           var endCut = (!(!(rhsCut | oldCut$5)));
           if (((!evidence$6.d) && (!rhsCut))) {
-            evidence$6.d1(startPos$7);
+            evidence$6.d2(startPos$7);
           }
-          evidence$6.p = endCut;
+          evidence$6.o = endCut;
           if (verboseFailures) {
             var $x_1 = lhsMsg.W(rhsMsg);
-            var rassoc$3 = evidence$6.v;
+            var rassoc$3 = evidence$6.r;
             evidence$6.K($x_1, lhsAggregate.W(rassoc$3), false);
           }
         }
         var lhsMsg$2 = evidence$6.F;
-        var lhsAggregate$2 = evidence$6.v;
+        var lhsAggregate$2 = evidence$6.r;
         if (evidence$6.d) {
-          evidence$6.p = (!(!(evidence$6.p | oldCut$4)));
-        } else if (evidence$6.p) {
+          evidence$6.o = (!(!(evidence$6.o | oldCut$4)));
+        } else if (evidence$6.o) {
         } else {
           var verboseFailures$2 = evidence$6.C;
           evidence$6.c = startPos$6;
           if (verboseFailures$2) {
-            evidence$6.K(lhsMsg$2, evidence$6.v, false);
+            evidence$6.K(lhsMsg$2, evidence$6.r, false);
           }
-          evidence$6.p = false;
-          this.afu(evidence$6);
+          evidence$6.o = false;
+          this.ag9(evidence$6);
           var rhsMsg$2 = evidence$6.F;
-          var rhsCut$2 = evidence$6.p;
+          var rhsCut$2 = evidence$6.o;
           var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
           if (((!evidence$6.d) && (!rhsCut$2))) {
-            evidence$6.d1(startPos$6);
+            evidence$6.d2(startPos$6);
           }
-          evidence$6.p = endCut$2;
+          evidence$6.o = endCut$2;
           if (verboseFailures$2) {
             var $x_2 = lhsMsg$2.W(rhsMsg$2);
-            var rassoc$3$2 = evidence$6.v;
+            var rassoc$3$2 = evidence$6.r;
             evidence$6.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
           }
         }
         var lhsMsg$3 = evidence$6.F;
-        var lhsAggregate$3 = evidence$6.v;
+        var lhsAggregate$3 = evidence$6.r;
         if (evidence$6.d) {
-          evidence$6.p = (!(!(evidence$6.p | oldCut$3)));
-        } else if (evidence$6.p) {
+          evidence$6.o = (!(!(evidence$6.o | oldCut$3)));
+        } else if (evidence$6.o) {
         } else {
           var verboseFailures$3 = evidence$6.C;
           evidence$6.c = startPos$5;
           if (verboseFailures$3) {
-            evidence$6.K(lhsMsg$3, evidence$6.v, false);
+            evidence$6.K(lhsMsg$3, evidence$6.r, false);
           }
-          evidence$6.p = false;
-          this.agx(evidence$6);
+          evidence$6.o = false;
+          this.aha(evidence$6);
           var rhsMsg$3 = evidence$6.F;
-          var rhsCut$3 = evidence$6.p;
+          var rhsCut$3 = evidence$6.o;
           var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
           if (((!evidence$6.d) && (!rhsCut$3))) {
-            evidence$6.d1(startPos$5);
+            evidence$6.d2(startPos$5);
           }
-          evidence$6.p = endCut$3;
+          evidence$6.o = endCut$3;
           if (verboseFailures$3) {
             var $x_3 = lhsMsg$3.W(rhsMsg$3);
-            var rassoc$3$3 = evidence$6.v;
+            var rassoc$3$3 = evidence$6.r;
             evidence$6.K($x_3, lhsAggregate$3.W(rassoc$3$3), false);
           }
         }
         var lhsMsg$4 = evidence$6.F;
-        var lhsAggregate$4 = evidence$6.v;
+        var lhsAggregate$4 = evidence$6.r;
         if (evidence$6.d) {
-          evidence$6.p = (!(!(evidence$6.p | oldCut$2)));
-        } else if (evidence$6.p) {
+          evidence$6.o = (!(!(evidence$6.o | oldCut$2)));
+        } else if (evidence$6.o) {
         } else {
           var verboseFailures$4 = evidence$6.C;
           evidence$6.c = startPos$4;
           if (verboseFailures$4) {
-            evidence$6.K(lhsMsg$4, evidence$6.v, false);
+            evidence$6.K(lhsMsg$4, evidence$6.r, false);
           }
-          evidence$6.p = false;
-          this.aGV(evidence$6);
+          evidence$6.o = false;
+          this.aHz(evidence$6);
           var rhsMsg$4 = evidence$6.F;
-          var rhsCut$4 = evidence$6.p;
+          var rhsCut$4 = evidence$6.o;
           var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
           if (((!evidence$6.d) && (!rhsCut$4))) {
-            evidence$6.d1(startPos$4);
+            evidence$6.d2(startPos$4);
           }
-          evidence$6.p = endCut$4;
+          evidence$6.o = endCut$4;
           if (verboseFailures$4) {
             var $x_4 = lhsMsg$4.W(rhsMsg$4);
-            var rassoc$3$4 = evidence$6.v;
+            var rassoc$3$4 = evidence$6.r;
             evidence$6.K($x_4, lhsAggregate$4.W(rassoc$3$4), false);
           }
         }
         var lhsMsg$5 = evidence$6.F;
-        var lhsAggregate$5 = evidence$6.v;
+        var lhsAggregate$5 = evidence$6.r;
         if (evidence$6.d) {
-          evidence$6.p = (!(!(evidence$6.p | oldCut)));
-        } else if ((!evidence$6.p)) {
+          evidence$6.o = (!(!(evidence$6.o | oldCut)));
+        } else if ((!evidence$6.o)) {
           var verboseFailures$5 = evidence$6.C;
           evidence$6.c = startPos$3;
           if (verboseFailures$5) {
-            evidence$6.K(lhsMsg$5, evidence$6.v, false);
+            evidence$6.K(lhsMsg$5, evidence$6.r, false);
           }
-          evidence$6.p = false;
-          this.aiq(evidence$6);
+          evidence$6.o = false;
+          this.aj2(evidence$6);
           var rhsMsg$5 = evidence$6.F;
-          var rhsCut$5 = evidence$6.p;
+          var rhsCut$5 = evidence$6.o;
           var endCut$5 = (!(!(rhsCut$5 | oldCut)));
           if (((!evidence$6.d) && (!rhsCut$5))) {
-            evidence$6.d1(startPos$3);
+            evidence$6.d2(startPos$3);
           }
-          evidence$6.p = endCut$5;
+          evidence$6.o = endCut$5;
           if (verboseFailures$5) {
             var $x_5 = lhsMsg$5.W(rhsMsg$5);
-            var rassoc$3$5 = evidence$6.v;
+            var rassoc$3$5 = evidence$6.r;
             evidence$6.K($x_5, lhsAggregate$5.W(rassoc$3$5), false);
           }
         }
-        var rhsAggregate$macro$7 = evidence$6.v;
+        var rhsAggregate$macro$7 = evidence$6.r;
         var rhsMsg$macro$8 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$14 = evidence$6;
@@ -1961,7 +1961,7 @@ $p.aLQ = (function(evidence$6) {
           if (rhsMadeProgress$macro$10) {
             evidence$6.P();
           }
-          var res$macro$14 = evidence$6.ab(x1$3.aG(lhsValue$macro$12, evidence$6.D), nextIndex$macro$13);
+          var res$macro$14 = evidence$6.a8(x1$3.aG(lhsValue$macro$12, evidence$6.D), nextIndex$macro$13);
         }
         if (evidence$6.C) {
           evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
@@ -1973,14 +1973,14 @@ $p.aLQ = (function(evidence$6) {
     }
   }
   if (instrument) {
-    evidence$6.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, x1$12.c, x1$12.d);
+    evidence$6.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, x1$12.c, x1$12.d);
   }
   if (x1$12.C) {
-    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B)));
+    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B)));
     var forceAggregate = (startIndex < x1$12.S);
-    x1$12.K(newshortMsg$6, x1$12.v, forceAggregate);
+    x1$12.K(newshortMsg$6, x1$12.r, forceAggregate);
     if ((!x1$12.d)) {
-      x1$12.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, startIndex), x1$12.Y);
+      x1$12.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, startIndex), x1$12.a0);
     }
   }
   if ((!x1$12.d)) {
@@ -1990,83 +1990,83 @@ $p.aLQ = (function(evidence$6) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var root = x0.E();
-    x1$12.D = x0.z().C0((!root.m()));
+    x1$12.D = x0.z().Cd((!root.l()));
   }
   var startIndex$2 = evidence$6.c;
   var instrument$2 = (evidence$6.M !== null);
   if (instrument$2) {
-    evidence$6.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, startIndex$2);
+    evidence$6.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, startIndex$2);
   }
-  var oldCut$6 = evidence$6.p;
-  evidence$6.p = false;
+  var oldCut$6 = evidence$6.o;
+  evidence$6.o = false;
   var startPos$8 = evidence$6.c;
   var lhsMsg$6 = evidence$6.F;
-  var lhsAggregate$6 = evidence$6.v;
+  var lhsAggregate$6 = evidence$6.r;
   if (evidence$6.d) {
-    evidence$6.p = (!(!(evidence$6.p | oldCut$6)));
+    evidence$6.o = (!(!(evidence$6.o | oldCut$6)));
     var x1$16 = evidence$6;
-  } else if (evidence$6.p) {
+  } else if (evidence$6.o) {
     var x1$16 = evidence$6;
   } else {
     var verboseFailures$6 = evidence$6.C;
     evidence$6.c = startPos$8;
     if (verboseFailures$6) {
-      evidence$6.K(lhsMsg$6, evidence$6.v, false);
+      evidence$6.K(lhsMsg$6, evidence$6.r, false);
     }
-    evidence$6.p = false;
-    this.aMd(evidence$6);
+    evidence$6.o = false;
+    this.aMT(evidence$6);
     var rhsMsg$6 = evidence$6.F;
-    var rhsCut$6 = evidence$6.p;
+    var rhsCut$6 = evidence$6.o;
     var endCut$6 = (!(!(rhsCut$6 | oldCut$6)));
     if (((!evidence$6.d) && (!rhsCut$6))) {
-      evidence$6.d1(startPos$8);
+      evidence$6.d2(startPos$8);
     }
-    evidence$6.p = endCut$6;
+    evidence$6.o = endCut$6;
     if (verboseFailures$6) {
       var $x_6 = lhsMsg$6.W(rhsMsg$6);
-      var rassoc$3$6 = evidence$6.v;
+      var rassoc$3$6 = evidence$6.r;
       evidence$6.K($x_6, lhsAggregate$6.W(rassoc$3$6), false);
     }
     var x1$16 = evidence$6;
   }
   if (instrument$2) {
-    evidence$6.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, x1$16.c, x1$16.d);
+    evidence$6.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, x1$16.c, x1$16.d);
   }
   if (x1$16.C) {
-    var newshortMsg$8 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B)));
+    var newshortMsg$8 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B)));
     var forceAggregate$1 = (startIndex$2 < x1$16.S);
-    x1$16.K(newshortMsg$8, x1$16.v, forceAggregate$1);
+    x1$16.K(newshortMsg$8, x1$16.r, forceAggregate$1);
     if ((!x1$16.d)) {
-      x1$16.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, startIndex$2), x1$16.Y);
+      x1$16.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, startIndex$2), x1$16.a0);
     }
   }
   return x1$16;
 });
-$p.afZ = (function(evidence$7) {
+$p.agC = (function(evidence$7) {
   var x1$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
   var preLhsIndex$macro$2 = evidence$7.c;
   var input$macro$11 = evidence$7.T;
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nm();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$5 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
+  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
   var startIndex = evidence$7.c;
   var count = 0;
   var precut = false;
-  var outerCut = evidence$7.p;
+  var outerCut = evidence$7.o;
   var sepMsg = null;
   var lastAgg = null;
   while (true) {
-    evidence$7.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aJZ(evidence$7);
+    evidence$7.o = (!(!(precut | ((count < 0) && outerCut))));
+    this.aKE(evidence$7);
     var parsedMsg = evidence$7.F;
-    var parsedAgg = evidence$7.v;
-    var postCut = evidence$7.p;
+    var parsedAgg = evidence$7.r;
+    var postCut = evidence$7.o;
     var verboseFailures = evidence$7.C;
     if ((!evidence$7.d)) {
       var res = (postCut ? evidence$7 : $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$5, startIndex, startIndex, count, (!(!(outerCut | postCut))), 0, evidence$7, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       break;
     } else {
@@ -2076,13 +2076,13 @@ $p.afZ = (function(evidence$7) {
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$5, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$7, repeater, acc);
         if (verboseFailures) {
-          evidence$7.av(startIndex, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(parsedMsg.dL) + ".rep")))(parsedMsg))));
+          evidence$7.at(startIndex, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(parsedMsg.dp) + ".rep")))(parsedMsg))));
         }
         break;
       } else {
-        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
-          evidence$7.p = false;
-          var sepCut = evidence$7.p;
+        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab(whitespace, evidence$7), (!((!evidence$7.d) && evidence$7.o))))) {
+          evidence$7.o = false;
+          var sepCut = evidence$7.o;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
           startIndex = beforeSepIndex;
           count = nextCount;
@@ -2100,34 +2100,34 @@ $p.afZ = (function(evidence$7) {
     var parse0$1 = evidence$7;
   } else {
     var postLhsIndex$macro$3 = evidence$7.c;
-    var lhsAggregate$macro$6 = evidence$7.v;
+    var lhsAggregate$macro$6 = evidence$7.r;
     var lhsMsg$macro$9 = evidence$7.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$7.P();
     }
     var lhsValue$macro$12 = evidence$7.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+      if (((!evidence$7.d) && evidence$7.o)) {
         var parse0$1 = evidence$7;
       } else {
         var preRhsIndex$macro$4 = evidence$7.c;
-        var repeater$1 = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
+        var repeater$1 = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nm();
         var whitespace$1 = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
         var this$11 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-        var acc$1 = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
+        var acc$1 = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
         var startIndex$1 = evidence$7.c;
         var count$1 = 0;
         var precut$1 = false;
-        var outerCut$1 = evidence$7.p;
+        var outerCut$1 = evidence$7.o;
         var sepMsg$1 = null;
         var lastAgg$1 = null;
         while (true) {
-          evidence$7.p = (!(!(precut$1 | ((count$1 < 0) && outerCut$1))));
-          this.aLQ(evidence$7);
+          evidence$7.o = (!(!(precut$1 | ((count$1 < 0) && outerCut$1))));
+          this.aMw(evidence$7);
           var parsedMsg$1 = evidence$7.F;
-          var parsedAgg$1 = evidence$7.v;
-          var postCut$1 = evidence$7.p;
+          var parsedAgg$1 = evidence$7.r;
+          var postCut$1 = evidence$7.o;
           var verboseFailures$1 = evidence$7.C;
           if ((!evidence$7.d)) {
             if (postCut$1) {
@@ -2135,7 +2135,7 @@ $p.afZ = (function(evidence$7) {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$11, startIndex$1, startIndex$1, count$1, (!(!(outerCut$1 | postCut$1))), 0, evidence$7, repeater$1, acc$1);
             }
             if (verboseFailures$1) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
               break;
             } else {
               break;
@@ -2147,14 +2147,14 @@ $p.afZ = (function(evidence$7) {
             if ((nextCount$1 === 2147483647)) {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$11, beforeSepIndex$1, beforeSepIndex$1, nextCount$1, (!(!(outerCut$1 | postCut$1))), 0, evidence$7, repeater$1, acc$1);
               if (verboseFailures$1) {
-                evidence$7.av(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg$1) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(parsedMsg$1.dL) + ".rep")))(parsedMsg$1))));
+                evidence$7.at(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg$1) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(parsedMsg$1.dp) + ".rep")))(parsedMsg$1))));
                 break;
               } else {
                 break;
               }
-            } else if (((whitespace$1 === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace$1, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
-              evidence$7.p = false;
-              var sepCut$1 = evidence$7.p;
+            } else if (((whitespace$1 === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab(whitespace$1, evidence$7), (!((!evidence$7.d) && evidence$7.o))))) {
+              evidence$7.o = false;
+              var sepCut$1 = evidence$7.o;
               var endCut$1 = (!(!((!(!(outerCut$1 | postCut$1))) | sepCut$1)));
               startIndex$1 = beforeSepIndex$1;
               count$1 = nextCount$1;
@@ -2167,7 +2167,7 @@ $p.afZ = (function(evidence$7) {
             }
           }
         }
-        var rhsAggregate$macro$7 = evidence$7.v;
+        var rhsAggregate$macro$7 = evidence$7.r;
         var rhsMsg$macro$8 = evidence$7.F;
         if ((!evidence$7.d)) {
           var res$macro$14 = evidence$7;
@@ -2178,7 +2178,7 @@ $p.afZ = (function(evidence$7) {
           if (rhsMadeProgress$macro$10) {
             evidence$7.P();
           }
-          var res$macro$14 = evidence$7.ab(x1$2.aG(lhsValue$macro$12, evidence$7.D), nextIndex$macro$13);
+          var res$macro$14 = evidence$7.a8(x1$2.aG(lhsValue$macro$12, evidence$7.D), nextIndex$macro$13);
         }
         if (evidence$7.C) {
           evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
@@ -2200,29 +2200,29 @@ $p.afZ = (function(evidence$7) {
     return parse0$1;
   }
 });
-$p.aGU = (function(evidence$8) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+$p.aHy = (function(evidence$8) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
   var preLhsIndex$macro$2 = evidence$8.c;
   var input$macro$11 = evidence$8.T;
-  this.afZ(evidence$8);
+  this.agC(evidence$8);
   if ((!evidence$8.d)) {
     return evidence$8;
   } else {
     var postLhsIndex$macro$3 = evidence$8.c;
-    var lhsAggregate$macro$6 = evidence$8.v;
+    var lhsAggregate$macro$6 = evidence$8.r;
     var lhsMsg$macro$9 = evidence$8.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$8.P();
     }
     var lhsValue$macro$12 = evidence$8.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
-      if (((!evidence$8.d) && evidence$8.p)) {
+      if (((!evidence$8.d) && evidence$8.o)) {
         return evidence$8;
       } else {
         var preRhsIndex$macro$4 = evidence$8.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__End__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$8);
-        var rhsAggregate$macro$7 = evidence$8.v;
+        var rhsAggregate$macro$7 = evidence$8.r;
         var rhsMsg$macro$8 = evidence$8.F;
         if ((!evidence$8.d)) {
           var res$macro$14 = evidence$8;
@@ -2233,7 +2233,7 @@ $p.aGU = (function(evidence$8) {
           if (rhsMadeProgress$macro$10) {
             evidence$8.P();
           }
-          var res$macro$14 = evidence$8.ab(lhsValue$macro$12, nextIndex$macro$13);
+          var res$macro$14 = evidence$8.a8(lhsValue$macro$12, nextIndex$macro$13);
         }
         if (evidence$8.C) {
           evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
@@ -2245,19 +2245,19 @@ $p.aGU = (function(evidence$8) {
     }
   }
 });
-$p.aMe = (function(evidence$9) {
+$p.aMU = (function(evidence$9) {
   var startIndex = evidence$9.c;
   var instrument = (evidence$9.M !== null);
   if (instrument) {
-    evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex);
+    evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex);
   }
-  var this$1 = this.Dc;
+  var this$1 = this.Dp;
   var startIndex$1 = evidence$9.c;
   var instrument$1 = (evidence$9.M !== null);
   if (instrument$1) {
-    evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$9.c;
   var input$macro$26 = evidence$9.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -2267,21 +2267,21 @@ $p.aMe = (function(evidence$9) {
   if ((!evidence$9.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$9.c;
-    var lhsAggregate$macro$6 = evidence$9.v;
+    var lhsAggregate$macro$6 = evidence$9.r;
     var lhsMsg$macro$9 = evidence$9.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$9.P();
     }
     var lhsValue$macro$12 = evidence$9.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
-      if (((!evidence$9.d) && evidence$9.p)) {
+      if (((!evidence$9.d) && evidence$9.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$9.c;
         var startIndex$2 = evidence$9.c;
         var instrument$2 = (evidence$9.M !== null);
         if (instrument$2) {
-          evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$9.c;
@@ -2291,15 +2291,15 @@ $p.aMe = (function(evidence$9) {
           var x1$4$1 = evidence$9;
         } else {
           var postLhsIndex$macro$3$1 = evidence$9.c;
-          var lhsAggregate$macro$6$1 = evidence$9.v;
+          var lhsAggregate$macro$6$1 = evidence$9.r;
           var lhsMsg$macro$9$1 = evidence$9.F;
-          evidence$9.p = true;
+          evidence$9.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$9.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
           if (evidence$9.d) {
-            if (((!evidence$9.d) && evidence$9.p)) {
+            if (((!evidence$9.d) && evidence$9.o)) {
               var x1$4$1 = evidence$9;
             } else {
               var preRhsIndex$macro$4$1 = evidence$9.c;
@@ -2309,31 +2309,31 @@ $p.aMe = (function(evidence$9) {
               $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$9);
               if (evidence$9.d) {
                 var postLhsIndex$macro$3$2 = evidence$9.c;
-                var lhsAggregate$macro$6$2 = evidence$9.v;
+                var lhsAggregate$macro$6$2 = evidence$9.r;
                 var lhsMsg$macro$9$2 = evidence$9.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
                   evidence$9.P();
                 }
                 var lhsValue$macro$12$2 = evidence$9.D;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                 if (evidence$9.d) {
-                  if ((!((!evidence$9.d) && evidence$9.p))) {
+                  if ((!((!evidence$9.d) && evidence$9.o))) {
                     var preRhsIndex$macro$4$2 = evidence$9.c;
-                    var f = (() => this.afZ(evidence$9));
+                    var f = (() => this.agC(evidence$9));
                     var startIndex$3 = evidence$9.c;
                     var instrument$3 = (evidence$9.M !== null);
                     if (instrument$3) {
-                      evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
+                      evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                     }
-                    var oldCut = evidence$9.p;
-                    evidence$9.p = false;
+                    var oldCut = evidence$9.o;
+                    evidence$9.o = false;
                     var startPos = evidence$9.c;
                     var startIndex$4 = evidence$9.c;
                     var instrument$4 = (evidence$9.M !== null);
                     if (instrument$4) {
-                      evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
+                      evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
                     var preLhsIndex$macro$17$1 = evidence$9.c;
                     var input$macro$26$1 = evidence$9.T;
                     $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -2344,26 +2344,26 @@ $p.aMe = (function(evidence$9) {
                     if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
                       evidence$9.aJ(((1 + index) | 0));
                     } else {
-                      evidence$9.aH();
+                      evidence$9.aE();
                     }
                     if (evidence$9.C) {
-                      evidence$9.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                      evidence$9.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$9.d)) {
                     } else {
                       var postLhsIndex$macro$3$3 = evidence$9.c;
-                      var lhsAggregate$macro$6$3 = evidence$9.v;
+                      var lhsAggregate$macro$6$3 = evidence$9.r;
                       var lhsMsg$macro$9$3 = evidence$9.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$9.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
-                        if (((!evidence$9.d) && evidence$9.p)) {
+                        if (((!evidence$9.d) && evidence$9.o)) {
                         } else {
                           var preRhsIndex$macro$4$3 = evidence$9.c;
                           f();
-                          var rhsAggregate$macro$7 = evidence$9.v;
+                          var rhsAggregate$macro$7 = evidence$9.r;
                           var rhsMsg$macro$8 = evidence$9.F;
                           if ((!evidence$9.d)) {
                             var res$macro$14 = evidence$9;
@@ -2374,7 +2374,7 @@ $p.aMe = (function(evidence$9) {
                             if (rhsMadeProgress$macro$10) {
                               evidence$9.P();
                             }
-                            var res$macro$14 = evidence$9.ab(evidence$9.D, nextIndex$macro$13);
+                            var res$macro$14 = evidence$9.a8(evidence$9.D, nextIndex$macro$13);
                           }
                           if (evidence$9.C) {
                             evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$3 === evidence$9.S));
@@ -2386,15 +2386,15 @@ $p.aMe = (function(evidence$9) {
                       var x1$8 = evidence$9;
                     } else {
                       var postLhsIndex$macro$18 = evidence$9.c;
-                      var lhsAggregate$macro$21 = evidence$9.v;
+                      var lhsAggregate$macro$21 = evidence$9.r;
                       var lhsMsg$macro$24 = evidence$9.F;
                       if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
                         evidence$9.P();
                       }
                       var lhsValue$macro$27 = evidence$9.D;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
-                        if (((!evidence$9.d) && evidence$9.p)) {
+                        if (((!evidence$9.d) && evidence$9.o)) {
                           var x1$8 = evidence$9;
                         } else {
                           var preRhsIndex$macro$19 = evidence$9.c;
@@ -2403,12 +2403,12 @@ $p.aMe = (function(evidence$9) {
                           if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
                             evidence$9.aJ(((1 + index$2) | 0));
                           } else {
-                            evidence$9.aH();
+                            evidence$9.aE();
                           }
                           if (evidence$9.C) {
-                            evidence$9.av(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
+                            evidence$9.at(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
-                          var rhsAggregate$macro$22 = evidence$9.v;
+                          var rhsAggregate$macro$22 = evidence$9.r;
                           var rhsMsg$macro$23 = evidence$9.F;
                           if ((!evidence$9.d)) {
                             var res$macro$29 = evidence$9;
@@ -2419,7 +2419,7 @@ $p.aMe = (function(evidence$9) {
                             if (rhsMadeProgress$macro$25) {
                               evidence$9.P();
                             }
-                            var res$macro$29 = evidence$9.ab(lhsValue$macro$27, nextIndex$macro$28);
+                            var res$macro$29 = evidence$9.a8(lhsValue$macro$27, nextIndex$macro$28);
                           }
                           if (evidence$9.C) {
                             evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$9.S));
@@ -2431,36 +2431,36 @@ $p.aMe = (function(evidence$9) {
                       }
                     }
                     if (instrument$4) {
-                      evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
+                      evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
                     if (x1$8.C) {
-                      var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
+                      var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                       var forceAggregate = (startIndex$4 < x1$8.S);
-                      x1$8.K(newshortMsg, x1$8.v, forceAggregate);
+                      x1$8.K(newshortMsg, x1$8.r, forceAggregate);
                       if ((!x1$8.d)) {
-                        x1$8.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.Y);
+                        x1$8.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.a0);
                       }
                     }
                     var lhsMsg = evidence$9.F;
-                    var lhsAggregate = evidence$9.v;
+                    var lhsAggregate = evidence$9.r;
                     if (evidence$9.d) {
-                      evidence$9.p = (!(!(evidence$9.p | oldCut)));
+                      evidence$9.o = (!(!(evidence$9.o | oldCut)));
                       var x1$3$3 = evidence$9;
-                    } else if (evidence$9.p) {
+                    } else if (evidence$9.o) {
                       var x1$3$3 = evidence$9;
                     } else {
                       var verboseFailures = evidence$9.C;
                       evidence$9.c = startPos;
                       if (verboseFailures) {
-                        evidence$9.K(lhsMsg, evidence$9.v, false);
+                        evidence$9.K(lhsMsg, evidence$9.r, false);
                       }
-                      evidence$9.p = false;
+                      evidence$9.o = false;
                       var startIndex$5 = evidence$9.c;
                       var instrument$5 = (evidence$9.M !== null);
                       if (instrument$5) {
-                        evidence$9.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
+                        evidence$9.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
                       var preLhsIndex$macro$17$2 = evidence$9.c;
                       var input$macro$26$2 = evidence$9.T;
                       $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -2471,26 +2471,26 @@ $p.aMe = (function(evidence$9) {
                       if ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
                         evidence$9.aJ(((1 + index$1) | 0));
                       } else {
-                        evidence$9.aH();
+                        evidence$9.aE();
                       }
                       if (evidence$9.C) {
-                        evidence$9.av(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
+                        evidence$9.at(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$9.d)) {
                       } else {
                         var postLhsIndex$macro$3$4 = evidence$9.c;
-                        var lhsAggregate$macro$6$4 = evidence$9.v;
+                        var lhsAggregate$macro$6$4 = evidence$9.r;
                         var lhsMsg$macro$9$4 = evidence$9.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                           evidence$9.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
-                          if (((!evidence$9.d) && evidence$9.p)) {
+                          if (((!evidence$9.d) && evidence$9.o)) {
                           } else {
                             var preRhsIndex$macro$4$4 = evidence$9.c;
                             f();
-                            var rhsAggregate$macro$7$1 = evidence$9.v;
+                            var rhsAggregate$macro$7$1 = evidence$9.r;
                             var rhsMsg$macro$8$1 = evidence$9.F;
                             if ((!evidence$9.d)) {
                               var res$macro$14$1 = evidence$9;
@@ -2501,7 +2501,7 @@ $p.aMe = (function(evidence$9) {
                               if (rhsMadeProgress$macro$10$1) {
                                 evidence$9.P();
                               }
-                              var res$macro$14$1 = evidence$9.ab(evidence$9.D, nextIndex$macro$13$1);
+                              var res$macro$14$1 = evidence$9.a8(evidence$9.D, nextIndex$macro$13$1);
                             }
                             if (evidence$9.C) {
                               evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$1), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$4 === evidence$9.S));
@@ -2513,15 +2513,15 @@ $p.aMe = (function(evidence$9) {
                         var x1$8$1 = evidence$9;
                       } else {
                         var postLhsIndex$macro$18$1 = evidence$9.c;
-                        var lhsAggregate$macro$21$1 = evidence$9.v;
+                        var lhsAggregate$macro$21$1 = evidence$9.r;
                         var lhsMsg$macro$24$1 = evidence$9.F;
                         if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
                           evidence$9.P();
                         }
                         var lhsValue$macro$27$1 = evidence$9.D;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
-                          if (((!evidence$9.d) && evidence$9.p)) {
+                          if (((!evidence$9.d) && evidence$9.o)) {
                             var x1$8$1 = evidence$9;
                           } else {
                             var preRhsIndex$macro$19$1 = evidence$9.c;
@@ -2530,12 +2530,12 @@ $p.aMe = (function(evidence$9) {
                             if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
                               evidence$9.aJ(((1 + index$2$1) | 0));
                             } else {
-                              evidence$9.aH();
+                              evidence$9.aE();
                             }
                             if (evidence$9.C) {
-                              evidence$9.av(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
+                              evidence$9.at(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
-                            var rhsAggregate$macro$22$1 = evidence$9.v;
+                            var rhsAggregate$macro$22$1 = evidence$9.r;
                             var rhsMsg$macro$23$1 = evidence$9.F;
                             if ((!evidence$9.d)) {
                               var res$macro$29$1 = evidence$9;
@@ -2546,7 +2546,7 @@ $p.aMe = (function(evidence$9) {
                               if (rhsMadeProgress$macro$25$1) {
                                 evidence$9.P();
                               }
-                              var res$macro$29$1 = evidence$9.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                              var res$macro$29$1 = evidence$9.a8(lhsValue$macro$27$1, nextIndex$macro$28$1);
                             }
                             if (evidence$9.C) {
                               evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$9.S));
@@ -2558,42 +2558,42 @@ $p.aMe = (function(evidence$9) {
                         }
                       }
                       if (instrument$5) {
-                        evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
+                        evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
                       if (x1$8$1.C) {
-                        var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
+                        var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                         var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
-                        x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
+                        x1$8$1.K(newshortMsg$1, x1$8$1.r, forceAggregate$1);
                         if ((!x1$8$1.d)) {
-                          x1$8$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.Y);
+                          x1$8$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.a0);
                         }
                       }
                       var rhsMsg = evidence$9.F;
-                      var rhsCut = evidence$9.p;
+                      var rhsCut = evidence$9.o;
                       var endCut = (!(!(rhsCut | oldCut)));
                       if (((!evidence$9.d) && (!rhsCut))) {
-                        evidence$9.d1(startPos);
+                        evidence$9.d2(startPos);
                       }
-                      evidence$9.p = endCut;
+                      evidence$9.o = endCut;
                       if (verboseFailures) {
                         var $x_1 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$9.v;
+                        var rassoc$3 = evidence$9.r;
                         evidence$9.K($x_1, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$3 = evidence$9;
                     }
                     if (instrument$3) {
-                      evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
+                      evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                     }
                     if (x1$3$3.C) {
-                      var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
+                      var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                       var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
-                      x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
+                      x1$3$3.K(newshortMsg$3, x1$3$3.r, forceAggregate$2);
                       if ((!x1$3$3.d)) {
-                        x1$3$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.Y);
+                        x1$3$3.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.a0);
                       }
                     }
-                    var rhsAggregate$macro$7$2 = evidence$9.v;
+                    var rhsAggregate$macro$7$2 = evidence$9.r;
                     var rhsMsg$macro$8$2 = evidence$9.F;
                     if ((!evidence$9.d)) {
                     } else {
@@ -2603,7 +2603,7 @@ $p.aMe = (function(evidence$9) {
                       if (rhsMadeProgress$macro$10$2) {
                         evidence$9.P();
                       }
-                      evidence$9.ab(x1$2$1.aG(lhsValue$macro$12$2, evidence$9.D), nextIndex$macro$13$2);
+                      evidence$9.a8(x1$2$1.aG(lhsValue$macro$12$2, evidence$9.D), nextIndex$macro$13$2);
                     }
                     if (evidence$9.C) {
                       evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$9.S));
@@ -2611,10 +2611,10 @@ $p.aMe = (function(evidence$9) {
                   }
                 }
               }
-              var rhsAggregate$macro$7$3 = evidence$9.v;
+              var rhsAggregate$macro$7$3 = evidence$9.r;
               var rhsMsg$macro$8$3 = evidence$9.F;
               if ((!evidence$9.d)) {
-                evidence$9.p = true;
+                evidence$9.o = true;
                 var res$macro$14$3 = evidence$9;
               } else {
                 var postRhsIndex$macro$5$3 = evidence$9.c;
@@ -2623,7 +2623,7 @@ $p.aMe = (function(evidence$9) {
                 if (rhsMadeProgress$macro$10$3) {
                   evidence$9.P();
                 }
-                var res$macro$14$3 = evidence$9.ab(evidence$9.D, nextIndex$macro$13$3);
+                var res$macro$14$3 = evidence$9.a8(evidence$9.D, nextIndex$macro$13$3);
               }
               if (evidence$9.C) {
                 evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$3), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$1 === evidence$9.S));
@@ -2635,17 +2635,17 @@ $p.aMe = (function(evidence$9) {
           }
         }
         if (instrument$2) {
-          evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.r, forceAggregate$3);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
-        var rhsAggregate$macro$7$4 = evidence$9.v;
+        var rhsAggregate$macro$7$4 = evidence$9.r;
         var rhsMsg$macro$8$4 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$14$4 = evidence$9;
@@ -2656,7 +2656,7 @@ $p.aMe = (function(evidence$9) {
           if (rhsMadeProgress$macro$10$4) {
             evidence$9.P();
           }
-          var res$macro$14$4 = evidence$9.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$9.D), nextIndex$macro$13$4);
+          var res$macro$14$4 = evidence$9.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$9.D), nextIndex$macro$13$4);
         }
         if (evidence$9.C) {
           evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$9.S));
@@ -2668,20 +2668,20 @@ $p.aMe = (function(evidence$9) {
     var parse0$6 = evidence$9;
   } else {
     var postLhsIndex$macro$18$2 = evidence$9.c;
-    var lhsAggregate$macro$21$2 = evidence$9.v;
+    var lhsAggregate$macro$21$2 = evidence$9.r;
     var lhsMsg$macro$24$2 = evidence$9.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
       evidence$9.P();
     }
     var lhsValue$macro$27$2 = evidence$9.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
-      if (((!evidence$9.d) && evidence$9.p)) {
+      if (((!evidence$9.d) && evidence$9.o)) {
         var parse0$6 = evidence$9;
       } else {
         var preRhsIndex$macro$19$2 = evidence$9.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$9);
-        var rhsAggregate$macro$22$2 = evidence$9.v;
+        var rhsAggregate$macro$22$2 = evidence$9.r;
         var rhsMsg$macro$23$2 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$29$2 = evidence$9;
@@ -2692,7 +2692,7 @@ $p.aMe = (function(evidence$9) {
           if (rhsMadeProgress$macro$25$2) {
             evidence$9.P();
           }
-          var res$macro$29$2 = evidence$9.ab(x1$2.aG(lhsValue$macro$27$2, (evidence$9.D | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$9.a8(x1$2.aG(lhsValue$macro$27$2, (evidence$9.D | 0)), nextIndex$macro$28$2);
         }
         if (evidence$9.C) {
           evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$9.S));
@@ -2710,23 +2710,23 @@ $p.aMe = (function(evidence$9) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$6.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$6.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$2 = parse0$6;
   }
   if (instrument$1) {
-    evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
+    evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
   if (x1$2$2.C) {
-    var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$4 = (startIndex$1 < x1$2$2.S);
-    x1$2$2.K(newshortMsg$5, x1$2$2.v, forceAggregate$4);
+    x1$2$2.K(newshortMsg$5, x1$2$2.r, forceAggregate$4);
     if ((!x1$2$2.d)) {
-      x1$2$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$2.Y);
+      x1$2$2.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$2.a0);
     }
   }
   if ((!x1$2$2.d)) {
@@ -2759,14 +2759,14 @@ $p.aMe = (function(evidence$9) {
     var x1$2$3 = parse0$7;
   }
   if (instrument) {
-    evidence$9.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, x1$2$3.c, x1$2$3.d);
+    evidence$9.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, x1$2$3.c, x1$2$3.d);
   }
   if (x1$2$3.C) {
-    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B)));
+    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B)));
     var forceAggregate$5 = (startIndex < x1$2$3.S);
-    x1$2$3.K(newshortMsg$6, x1$2$3.v, forceAggregate$5);
+    x1$2$3.K(newshortMsg$6, x1$2$3.r, forceAggregate$5);
     if ((!x1$2$3.d)) {
-      x1$2$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex), x1$2$3.Y);
+      x1$2$3.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex), x1$2$3.a0);
     }
   }
   if ((!x1$2$3.d)) {
@@ -2776,13 +2776,13 @@ $p.aMe = (function(evidence$9) {
     if ((x0$3 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
     }
-    var meta = x0$3.aX;
-    x1$2$3.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.bj), x0$3.br.p7, meta);
+    var meta = x0$3.aS;
+    x1$2$3.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.b5), x0$3.bd.pf, meta);
     return x1$2$3;
   }
 });
-$p.aGg = (function(evidence$10) {
-  var parse0 = this.akb.axw(evidence$10);
+$p.aGU = (function(evidence$10) {
+  var parse0 = this.akN.ay9(evidence$10);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2790,8 +2790,8 @@ $p.aGg = (function(evidence$10) {
     return parse0;
   }
 });
-$p.a0L = (function(evidence$11) {
-  var parse0 = this.aka.agb(evidence$11);
+$p.a1m = (function(evidence$11) {
+  var parse0 = this.akM.agO(evidence$11);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2799,8 +2799,8 @@ $p.a0L = (function(evidence$11) {
     return parse0;
   }
 });
-$p.afu = (function(evidence$12) {
-  var parse0 = this.ak8.aw2(evidence$12);
+$p.ag9 = (function(evidence$12) {
+  var parse0 = this.akK.awG(evidence$12);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2808,8 +2808,8 @@ $p.afu = (function(evidence$12) {
     return parse0;
   }
 });
-$p.agx = (function(evidence$13) {
-  var parse0 = this.akc.aIH(evidence$13);
+$p.aha = (function(evidence$13) {
+  var parse0 = this.akO.aJm(evidence$13);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2817,8 +2817,8 @@ $p.agx = (function(evidence$13) {
     return parse0;
   }
 });
-$p.aGV = (function(evidence$14) {
-  var parse0 = this.ak9.awX(evidence$14);
+$p.aHz = (function(evidence$14) {
+  var parse0 = this.akL.axB(evidence$14);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2826,8 +2826,8 @@ $p.aGV = (function(evidence$14) {
     return parse0;
   }
 });
-$p.aiq = (function(evidence$15) {
-  var parse0 = this.akd.aiq(evidence$15);
+$p.aj2 = (function(evidence$15) {
+  var parse0 = this.akP.aj2(evidence$15);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2835,8 +2835,8 @@ $p.aiq = (function(evidence$15) {
     return parse0;
   }
 });
-$p.aMd = (function(evidence$16) {
-  var parse0 = this.aMe(evidence$16);
+$p.aMT = (function(evidence$16) {
+  var parse0 = this.aMU(evidence$16);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2845,7 +2845,7 @@ $p.aMd = (function(evidence$16) {
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefModel = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefModel, "io.septimalmind.baboon.parser.defns.DefModel", ({
-  vE: 1
+  vM: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefModel as $d_Lio_septimalmind_baboon_parser_defns_DefModel };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Model.js.map