@7mind.io/baboon 0.0.164 → 0.0.166

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.CX = null;
-  this.ajm = null;
-  this.ajl = null;
-  this.ajj = null;
-  this.ajn = null;
-  this.ajk = null;
-  this.ajo = null;
-  this.CX = meta;
-  this.ajm = defEnum;
-  this.ajl = defDto;
-  this.ajj = defAdt;
-  this.ajn = defForeign;
-  this.ajk = defContract;
-  this.ajo = defService;
+  this.CY = null;
+  this.ajy = null;
+  this.ajx = null;
+  this.ajv = null;
+  this.ajz = null;
+  this.ajw = null;
+  this.ajA = null;
+  this.CY = meta;
+  this.ajy = defEnum;
+  this.ajx = defDto;
+  this.ajv = defAdt;
+  this.ajz = defForeign;
+  this.ajw = defContract;
+  this.ajA = 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.aKG = (function(evidence$1) {
+$p.aKV = (function(evidence$1) {
   var startIndex = evidence$1.c;
   var instrument = (evidence$1.L !== null);
   if (instrument) {
     evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, startIndex);
   }
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
   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$().aik;
+  var x1$5 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().aiw;
   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$().g4;
+  var x1$7 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,19 +88,19 @@ $p.aKG = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.v;
-    var lhsMsg$macro$9 = evidence$1.G;
+    var lhsAggregate$macro$6 = evidence$1.s;
+    var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        this.aIu(evidence$1);
-        var rhsAggregate$macro$7 = evidence$1.v;
-        var rhsMsg$macro$8 = evidence$1.G;
+        this.aII(evidence$1);
+        var rhsAggregate$macro$7 = evidence$1.s;
+        var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
         } else {
@@ -108,12 +108,12 @@ $p.aKG = (function(evidence$1) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$14 = evidence$1.ab(evidence$1.E, nextIndex$macro$13);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
+        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,20 +121,20 @@ $p.aKG = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.v;
-    var lhsMsg$macro$24 = evidence$1.G;
+    var lhsAggregate$macro$21 = evidence$1.s;
+    var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$27 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
-        this.aPw(evidence$1);
-        var rhsAggregate$macro$22 = evidence$1.v;
-        var rhsMsg$macro$23 = evidence$1.G;
+        this.aPL(evidence$1);
+        var rhsAggregate$macro$22 = evidence$1.s;
+        var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
         } else {
@@ -142,12 +142,12 @@ $p.aKG = (function(evidence$1) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$29 = evidence$1.ab(x1$9.aF(lhsValue$macro$27, evidence$1.E), nextIndex$macro$28);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
+        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,22 +155,22 @@ $p.aKG = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$33 = evidence$1.c;
-    var lhsAggregate$macro$36 = evidence$1.v;
-    var lhsMsg$macro$39 = evidence$1.G;
+    var lhsAggregate$macro$36 = evidence$1.s;
+    var lhsMsg$macro$39 = evidence$1.F;
     if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$42 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$34 = evidence$1.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
         var startPos = evidence$1.c;
         var startCut = evidence$1.p;
         evidence$1.p = false;
-        this.aIz(evidence$1);
+        this.aIN(evidence$1);
         var postSuccess = evidence$1.d;
         if (postSuccess) {
           var res = evidence$1.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$1.E));
@@ -180,14 +180,14 @@ $p.aKG = (function(evidence$1) {
           var res$2 = evidence$1.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
           res$2.p = (!(!(res$2.p | startCut)));
         }
-        if (evidence$1.D) {
-          var msg = evidence$1.G;
+        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$().fD(msg.dC) + ".?")))), evidence$1.v, false);
+            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$().g1(msg.dL) + ".?")))), evidence$1.s, false);
           }
         }
-        var rhsAggregate$macro$37 = evidence$1.v;
-        var rhsMsg$macro$38 = evidence$1.G;
+        var rhsAggregate$macro$37 = evidence$1.s;
+        var rhsMsg$macro$38 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$44 = evidence$1;
         } else {
@@ -195,12 +195,12 @@ $p.aKG = (function(evidence$1) {
           var rhsMadeProgress$macro$40 = (postRhsIndex$macro$35 > preRhsIndex$macro$34);
           var nextIndex$macro$43 = (((!rhsMadeProgress$macro$40) && input$macro$41.U(postRhsIndex$macro$35)) ? postLhsIndex$macro$33 : postRhsIndex$macro$35);
           if (rhsMadeProgress$macro$40) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$44 = evidence$1.ab(x1$7.aF(lhsValue$macro$42, evidence$1.E), nextIndex$macro$43);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$1.S));
+        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,20 +208,20 @@ $p.aKG = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$48 = evidence$1.c;
-    var lhsAggregate$macro$51 = evidence$1.v;
-    var lhsMsg$macro$54 = evidence$1.G;
+    var lhsAggregate$macro$51 = evidence$1.s;
+    var lhsMsg$macro$54 = evidence$1.F;
     if ((postLhsIndex$macro$48 > preLhsIndex$macro$47)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$57 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$49 = evidence$1.c;
-        this.afb(evidence$1);
-        var rhsAggregate$macro$52 = evidence$1.v;
-        var rhsMsg$macro$53 = evidence$1.G;
+        this.afm(evidence$1);
+        var rhsAggregate$macro$52 = evidence$1.s;
+        var rhsMsg$macro$53 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$59 = evidence$1;
         } else {
@@ -229,12 +229,12 @@ $p.aKG = (function(evidence$1) {
           var rhsMadeProgress$macro$55 = (postRhsIndex$macro$50 > preRhsIndex$macro$49);
           var nextIndex$macro$58 = (((!rhsMadeProgress$macro$55) && input$macro$56.U(postRhsIndex$macro$50)) ? postLhsIndex$macro$48 : postRhsIndex$macro$50);
           if (rhsMadeProgress$macro$55) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$59 = evidence$1.ab(x1$5.aF(lhsValue$macro$57, evidence$1.E), nextIndex$macro$58);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$54, rhsMsg$macro$53), lhsAggregate$macro$51.W(rhsAggregate$macro$52), (preRhsIndex$macro$49 === evidence$1.S));
+        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,21 +243,21 @@ $p.aKG = (function(evidence$1) {
     var x1$14 = evidence$1;
   } else {
     var postLhsIndex$macro$63 = evidence$1.c;
-    var lhsAggregate$macro$66 = evidence$1.v;
-    var lhsMsg$macro$69 = evidence$1.G;
+    var lhsAggregate$macro$66 = evidence$1.s;
+    var lhsMsg$macro$69 = evidence$1.F;
     if ((postLhsIndex$macro$63 > preLhsIndex$macro$62)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$72 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
         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 rhsMsg$macro$68 = evidence$1.G;
+        var rhsAggregate$macro$67 = evidence$1.s;
+        var rhsMsg$macro$68 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$74 = evidence$1;
         } else {
@@ -265,12 +265,12 @@ $p.aKG = (function(evidence$1) {
           var rhsMadeProgress$macro$70 = (postRhsIndex$macro$65 > preRhsIndex$macro$64);
           var nextIndex$macro$73 = (((!rhsMadeProgress$macro$70) && input$macro$71.U(postRhsIndex$macro$65)) ? postLhsIndex$macro$63 : postRhsIndex$macro$65);
           if (rhsMadeProgress$macro$70) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$74 = evidence$1.ab(lhsValue$macro$72, nextIndex$macro$73);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$69, rhsMsg$macro$68), lhsAggregate$macro$66.W(rhsAggregate$macro$67), (preRhsIndex$macro$64 === evidence$1.S));
+        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));
         }
         var x1$14 = res$macro$74;
       }
@@ -281,10 +281,10 @@ $p.aKG = (function(evidence$1) {
   if (instrument) {
     evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, x1$14.c, x1$14.d);
   }
-  if (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 forceAggregate = (startIndex < x1$14.S);
-    x1$14.K(newshortMsg$1, x1$14.v, forceAggregate);
+    x1$14.K(newshortMsg$1, x1$14.s, 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);
     }
@@ -296,18 +296,18 @@ $p.aKG = (function(evidence$1) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    x1$14.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wl, x0.wm, x0.A5, x0.tz);
+    x1$14.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wl, x0.wm, x0.A6, x0.ty);
     return x1$14;
   }
 });
-$p.aIu = (function(evidence$2) {
-  var this$1 = this.CX;
+$p.aII = (function(evidence$2) {
+  var this$1 = this.CY;
   var startIndex = evidence$2.c;
   var instrument = (evidence$2.L !== null);
   if (instrument) {
     evidence$2.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,13 +317,13 @@ $p.aIu = (function(evidence$2) {
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$2.c;
-    var lhsAggregate$macro$6 = evidence$2.v;
-    var lhsMsg$macro$9 = evidence$2.G;
+    var lhsAggregate$macro$6 = evidence$2.s;
+    var lhsMsg$macro$9 = evidence$2.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$2.Q();
+      evidence$2.P();
     }
     var lhsValue$macro$12 = evidence$2.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
       if (((!evidence$2.d) && evidence$2.p)) {
       } else {
@@ -346,21 +346,21 @@ $p.aIu = (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 lhsMsg$macro$9$1 = evidence$2.G;
+          var lhsAggregate$macro$6$1 = evidence$2.s;
+          var lhsMsg$macro$9$1 = evidence$2.F;
           evidence$2.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$2.Q();
+            evidence$2.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
           if (evidence$2.d) {
             if (((!evidence$2.d) && evidence$2.p)) {
               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 rhsMsg$macro$8 = evidence$2.G;
+              var rhsAggregate$macro$7 = evidence$2.s;
+              var rhsMsg$macro$8 = evidence$2.F;
               if ((!evidence$2.d)) {
                 evidence$2.p = true;
                 var res$macro$14 = evidence$2;
@@ -369,12 +369,12 @@ $p.aIu = (function(evidence$2) {
                 var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$1.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
-                  evidence$2.Q();
+                  evidence$2.P();
                 }
                 var res$macro$14 = evidence$2.ab(evidence$2.E, nextIndex$macro$13);
               }
-              if (evidence$2.D) {
-                evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$2.S));
+              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));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -385,10 +385,10 @@ $p.aIu = (function(evidence$2) {
         if (instrument$2) {
           evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
@@ -396,16 +396,16 @@ $p.aIu = (function(evidence$2) {
         if (instrument$1) {
           evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$2.v;
-        var rhsMsg$macro$8$1 = evidence$2.G;
+        var rhsAggregate$macro$7$1 = evidence$2.s;
+        var rhsMsg$macro$8$1 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$14$1 = evidence$2;
         } else {
@@ -413,12 +413,12 @@ $p.aIu = (function(evidence$2) {
           var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4);
           var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$1);
           if (rhsMadeProgress$macro$10$1) {
-            evidence$2.Q();
+            evidence$2.P();
           }
           var res$macro$14$1 = evidence$2.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$2.E), nextIndex$macro$13$1);
         }
-        if (evidence$2.D) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$2.S));
+        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,21 +427,21 @@ $p.aIu = (function(evidence$2) {
     var parse0$3 = evidence$2;
   } else {
     var postLhsIndex$macro$18 = evidence$2.c;
-    var lhsAggregate$macro$21 = evidence$2.v;
-    var lhsMsg$macro$24 = evidence$2.G;
+    var lhsAggregate$macro$21 = evidence$2.s;
+    var lhsMsg$macro$24 = evidence$2.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$2.Q();
+      evidence$2.P();
     }
     var lhsValue$macro$27 = evidence$2.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
       if (((!evidence$2.d) && evidence$2.p)) {
         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 rhsMsg$macro$23 = evidence$2.G;
+        var rhsAggregate$macro$22 = evidence$2.s;
+        var rhsMsg$macro$23 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$29 = evidence$2;
         } else {
@@ -449,12 +449,12 @@ $p.aIu = (function(evidence$2) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$2.Q();
+            evidence$2.P();
           }
           var res$macro$29 = evidence$2.ab(x1$2.aF(lhsValue$macro$27, (evidence$2.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$2.D) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$2.S));
+        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));
         }
         var parse0$3 = res$macro$29;
       }
@@ -470,20 +470,20 @@ $p.aIu = (function(evidence$2) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$3.E = $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.ft, begin, end), value);
+    var value = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$3.E = $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.fu, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (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 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.s, 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);
     }
@@ -495,7 +495,7 @@ $p.aIu = (function(evidence$2) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -505,18 +505,18 @@ $p.aIu = (function(evidence$2) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dHeader.$c_Lio_septimalmind_baboon_parser_model_RawHeader(x0$2.C(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dHeader.$c_Lio_septimalmind_baboon_parser_model_RawHeader(x0$2.D(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aPw = (function(evidence$3) {
-  var this$1 = this.CX;
+$p.aPL = (function(evidence$3) {
+  var this$1 = this.CY;
   var startIndex = evidence$3.c;
   var instrument = (evidence$3.L !== null);
   if (instrument) {
     evidence$3.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,13 +526,13 @@ $p.aPw = (function(evidence$3) {
   if ((!evidence$3.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.v;
-    var lhsMsg$macro$9 = evidence$3.G;
+    var lhsAggregate$macro$6 = evidence$3.s;
+    var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$12 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
       if (((!evidence$3.d) && evidence$3.p)) {
       } else {
@@ -555,21 +555,21 @@ $p.aPw = (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 lhsMsg$macro$9$1 = evidence$3.G;
+          var lhsAggregate$macro$6$1 = evidence$3.s;
+          var lhsMsg$macro$9$1 = evidence$3.F;
           evidence$3.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$3.Q();
+            evidence$3.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
           if (evidence$3.d) {
             if (((!evidence$3.d) && evidence$3.p)) {
               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$().HH(evidence$3);
-              var rhsAggregate$macro$7 = evidence$3.v;
-              var rhsMsg$macro$8 = evidence$3.G;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$3);
+              var rhsAggregate$macro$7 = evidence$3.s;
+              var rhsMsg$macro$8 = evidence$3.F;
               if ((!evidence$3.d)) {
                 evidence$3.p = true;
                 var res$macro$14 = evidence$3;
@@ -578,12 +578,12 @@ $p.aPw = (function(evidence$3) {
                 var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$1.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
-                  evidence$3.Q();
+                  evidence$3.P();
                 }
                 var res$macro$14 = evidence$3.ab(evidence$3.E, nextIndex$macro$13);
               }
-              if (evidence$3.D) {
-                evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$3.S));
+              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));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -594,10 +594,10 @@ $p.aPw = (function(evidence$3) {
         if (instrument$2) {
           evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
@@ -605,16 +605,16 @@ $p.aPw = (function(evidence$3) {
         if (instrument$1) {
           evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$3.v;
-        var rhsMsg$macro$8$1 = evidence$3.G;
+        var rhsAggregate$macro$7$1 = evidence$3.s;
+        var rhsMsg$macro$8$1 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14$1 = evidence$3;
         } else {
@@ -622,12 +622,12 @@ $p.aPw = (function(evidence$3) {
           var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4);
           var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$1);
           if (rhsMadeProgress$macro$10$1) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$14$1 = evidence$3.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$3.E), nextIndex$macro$13$1);
         }
-        if (evidence$3.D) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$3.S));
+        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,21 +636,21 @@ $p.aPw = (function(evidence$3) {
     var parse0$3 = evidence$3;
   } else {
     var postLhsIndex$macro$18 = evidence$3.c;
-    var lhsAggregate$macro$21 = evidence$3.v;
-    var lhsMsg$macro$24 = evidence$3.G;
+    var lhsAggregate$macro$21 = evidence$3.s;
+    var lhsMsg$macro$24 = evidence$3.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$27 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
       if (((!evidence$3.d) && evidence$3.p)) {
         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 rhsMsg$macro$23 = evidence$3.G;
+        var rhsAggregate$macro$22 = evidence$3.s;
+        var rhsMsg$macro$23 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$29 = evidence$3;
         } else {
@@ -658,12 +658,12 @@ $p.aPw = (function(evidence$3) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$29 = evidence$3.ab(x1$2.aF(lhsValue$macro$27, (evidence$3.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$3.D) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$3.S));
+        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));
         }
         var parse0$3 = res$macro$29;
       }
@@ -679,20 +679,20 @@ $p.aPw = (function(evidence$3) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$3.E = $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.ft, begin, end), value);
+    var value = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$3.E = $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.fu, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (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 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.s, 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);
     }
@@ -704,7 +704,7 @@ $p.aPw = (function(evidence$3) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -714,18 +714,18 @@ $p.aPw = (function(evidence$3) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dVersion.$c_Lio_septimalmind_baboon_parser_model_RawVersion(x0$2.C(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dVersion.$c_Lio_septimalmind_baboon_parser_model_RawVersion(x0$2.D(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aIz = (function(evidence$4) {
-  var this$1 = this.CX;
+$p.aIN = (function(evidence$4) {
+  var this$1 = this.CY;
   var startIndex = evidence$4.c;
   var instrument = (evidence$4.L !== null);
   if (instrument) {
     evidence$4.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,13 +735,13 @@ $p.aIz = (function(evidence$4) {
   if ((!evidence$4.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$4.c;
-    var lhsAggregate$macro$6 = evidence$4.v;
-    var lhsMsg$macro$9 = evidence$4.G;
+    var lhsAggregate$macro$6 = evidence$4.s;
+    var lhsMsg$macro$9 = evidence$4.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$4.Q();
+      evidence$4.P();
     }
     var lhsValue$macro$12 = evidence$4.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
       if (((!evidence$4.d) && evidence$4.p)) {
       } else {
@@ -754,13 +754,13 @@ $p.aIz = (function(evidence$4) {
         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$().eN();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
         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$().eN();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
         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$().eN();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
         var preLhsIndex$macro$2$1 = evidence$4.c;
         var input$macro$11$1 = evidence$4.T;
         var startIndex$2 = evidence$4.c;
@@ -776,21 +776,21 @@ $p.aIz = (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 lhsMsg$macro$9$1 = evidence$4.G;
+          var lhsAggregate$macro$6$1 = evidence$4.s;
+          var lhsMsg$macro$9$1 = evidence$4.F;
           evidence$4.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$2)) {
-            evidence$4.Q();
+            evidence$4.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
               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$().HH(evidence$4);
-              var rhsAggregate$macro$7 = evidence$4.v;
-              var rhsMsg$macro$8 = evidence$4.G;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$4);
+              var rhsAggregate$macro$7 = evidence$4.s;
+              var rhsMsg$macro$8 = evidence$4.F;
               if ((!evidence$4.d)) {
                 evidence$4.p = true;
                 var res$macro$14 = evidence$4;
@@ -799,12 +799,12 @@ $p.aIz = (function(evidence$4) {
                 var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$2.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
                 var res$macro$14 = evidence$4.ab(evidence$4.E, nextIndex$macro$13);
               }
-              if (evidence$4.D) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$4.S));
+              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));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -815,10 +815,10 @@ $p.aIz = (function(evidence$4) {
         if (instrument$2) {
           evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
@@ -826,13 +826,13 @@ $p.aIz = (function(evidence$4) {
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$3$2 = evidence$4.c;
-          var lhsAggregate$macro$6$2 = evidence$4.v;
-          var lhsMsg$macro$9$2 = evidence$4.G;
+          var lhsAggregate$macro$6$2 = evidence$4.s;
+          var lhsMsg$macro$9$2 = evidence$4.F;
           if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$1)) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var lhsValue$macro$12$2 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -840,15 +840,15 @@ $p.aIz = (function(evidence$4) {
               var input = evidence$4.T;
               var index = evidence$4.c;
               if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                evidence$4.aK(((1 + index) | 0));
+                evidence$4.aI(((1 + index) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aG();
               }
-              if (evidence$4.D) {
+              if (evidence$4.C) {
                 evidence$4.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
               }
-              var rhsAggregate$macro$7$1 = evidence$4.v;
-              var rhsMsg$macro$8$1 = evidence$4.G;
+              var rhsAggregate$macro$7$1 = evidence$4.s;
+              var rhsMsg$macro$8$1 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$14$1 = evidence$4;
               } else {
@@ -856,12 +856,12 @@ $p.aIz = (function(evidence$4) {
                 var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$2);
                 var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$1.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$1);
                 if (rhsMadeProgress$macro$10$1) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
                 var res$macro$14$1 = evidence$4.ab(lhsValue$macro$12$2, nextIndex$macro$13$1);
               }
-              if (evidence$4.D) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$1), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$2 === evidence$4.S));
+              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,13 +869,13 @@ $p.aIz = (function(evidence$4) {
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$18 = evidence$4.c;
-          var lhsAggregate$macro$21 = evidence$4.v;
-          var lhsMsg$macro$24 = evidence$4.G;
+          var lhsAggregate$macro$21 = evidence$4.s;
+          var lhsMsg$macro$24 = evidence$4.F;
           if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var lhsValue$macro$27 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -883,15 +883,15 @@ $p.aIz = (function(evidence$4) {
               var input$2 = evidence$4.T;
               var index$2 = evidence$4.c;
               if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 42))) {
-                evidence$4.aK(((1 + index$2) | 0));
+                evidence$4.aI(((1 + index$2) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aG();
               }
-              if (evidence$4.D) {
+              if (evidence$4.C) {
                 evidence$4.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"*\""))));
               }
-              var rhsAggregate$macro$22 = evidence$4.v;
-              var rhsMsg$macro$23 = evidence$4.G;
+              var rhsAggregate$macro$22 = evidence$4.s;
+              var rhsMsg$macro$23 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$29 = evidence$4;
               } else {
@@ -899,12 +899,12 @@ $p.aIz = (function(evidence$4) {
                 var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
                 var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                 if (rhsMadeProgress$macro$25) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
                 var res$macro$29 = evidence$4.ab(lhsValue$macro$27, nextIndex$macro$28);
               }
-              if (evidence$4.D) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$4.S));
+              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,13 +912,13 @@ $p.aIz = (function(evidence$4) {
         if ((!evidence$4.d)) {
         } else {
           var postLhsIndex$macro$33 = evidence$4.c;
-          var lhsAggregate$macro$36 = evidence$4.v;
-          var lhsMsg$macro$39 = evidence$4.G;
+          var lhsAggregate$macro$36 = evidence$4.s;
+          var lhsMsg$macro$39 = evidence$4.F;
           if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var lhsValue$macro$42 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -926,15 +926,15 @@ $p.aIz = (function(evidence$4) {
               var input$3 = evidence$4.T;
               var index$3 = evidence$4.c;
               if ((input$3.U(index$3) && (input$3.as.charCodeAt(index$3) === 125))) {
-                evidence$4.aK(((1 + index$3) | 0));
+                evidence$4.aI(((1 + index$3) | 0));
               } else {
-                evidence$4.aH();
+                evidence$4.aG();
               }
-              if (evidence$4.D) {
+              if (evidence$4.C) {
                 evidence$4.aw(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
               }
-              var rhsAggregate$macro$37 = evidence$4.v;
-              var rhsMsg$macro$38 = evidence$4.G;
+              var rhsAggregate$macro$37 = evidence$4.s;
+              var rhsMsg$macro$38 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$44 = evidence$4;
               } else {
@@ -942,12 +942,12 @@ $p.aIz = (function(evidence$4) {
                 var rhsMadeProgress$macro$40 = (postRhsIndex$macro$35 > preRhsIndex$macro$34);
                 var nextIndex$macro$43 = (((!rhsMadeProgress$macro$40) && input$macro$41.U(postRhsIndex$macro$35)) ? postLhsIndex$macro$33 : postRhsIndex$macro$35);
                 if (rhsMadeProgress$macro$40) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
                 var res$macro$44 = evidence$4.ab(lhsValue$macro$42, nextIndex$macro$43);
               }
-              if (evidence$4.D) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$4.S));
+              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,19 +956,19 @@ $p.aIz = (function(evidence$4) {
           var x1$18 = evidence$4;
         } else {
           var postLhsIndex$macro$65 = evidence$4.c;
-          var lhsAggregate$macro$68 = evidence$4.v;
-          var lhsMsg$macro$71 = evidence$4.G;
+          var lhsAggregate$macro$68 = evidence$4.s;
+          var lhsMsg$macro$71 = evidence$4.F;
           if ((postLhsIndex$macro$65 > preLhsIndex$macro$64)) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var lhsValue$macro$74 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
               var x1$18 = evidence$4;
             } else {
               var preRhsIndex$macro$66 = evidence$4.c;
-              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
+              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
               var startPos = evidence$4.c;
               var startCut = evidence$4.p;
               evidence$4.p = false;
@@ -1019,28 +1019,28 @@ $p.aIz = (function(evidence$4) {
                 var $x_1 = false;
               }
               if ($x_1) {
-                evidence$4.aK(end);
+                evidence$4.aI(end);
               } else {
-                evidence$4.aH();
+                evidence$4.aG();
               }
-              if (evidence$4.D) {
+              if (evidence$4.C) {
                 evidence$4.aw(index$4, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(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 lhsMsg$macro$56 = evidence$4.G;
+                var lhsAggregate$macro$53 = evidence$4.s;
+                var lhsMsg$macro$56 = evidence$4.F;
                 if ((postLhsIndex$macro$50 > preLhsIndex$macro$49)) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                 if (evidence$4.d) {
                   if (((!evidence$4.d) && evidence$4.p)) {
                   } else {
                     var preRhsIndex$macro$51 = evidence$4.c;
                     var f = (() => {
-                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
                       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();
@@ -1053,27 +1053,27 @@ $p.aIz = (function(evidence$4) {
                       while (true) {
                         evidence$4.p = (!(!(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.G;
-                        var parsedAgg = evidence$4.v;
+                        var parsedMsg = evidence$4.F;
+                        var parsedAgg = evidence$4.s;
                         var postCut = evidence$4.p;
-                        var verboseFailures = evidence$4.D;
+                        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$().iu(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
                           }
                           return res$1;
                         } else {
                           var beforeSepIndex = evidence$4.c;
-                          acc.al(evidence$4.E);
+                          acc.am(evidence$4.E);
                           var nextCount = ((1 + count) | 0);
                           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.aw(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$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
+                              evidence$4.aw(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$().g1(parsedMsg.dL) + ".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$().ad(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$().ac(whitespace, evidence$4), (!((!evidence$4.d) && evidence$4.p)))))) {
                             return evidence$4;
                           } else {
                             evidence$4.p = false;
@@ -1102,7 +1102,7 @@ $p.aIz = (function(evidence$4) {
                     if (instrument$4) {
                       evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                     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$();
@@ -1111,29 +1111,29 @@ $p.aIz = (function(evidence$4) {
                     var input$1 = evidence$4.T;
                     var index$10 = evidence$4.c;
                     if ((input$1.U(index$10) && (input$1.as.charCodeAt(index$10) === 123))) {
-                      evidence$4.aK(((1 + index$10) | 0));
+                      evidence$4.aI(((1 + index$10) | 0));
                     } else {
-                      evidence$4.aH();
+                      evidence$4.aG();
                     }
-                    if (evidence$4.D) {
+                    if (evidence$4.C) {
                       evidence$4.aw(index$10, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(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 lhsMsg$macro$9$3 = evidence$4.G;
+                      var lhsAggregate$macro$6$3 = evidence$4.s;
+                      var lhsMsg$macro$9$3 = evidence$4.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$4.Q();
+                        evidence$4.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
                         if (((!evidence$4.d) && evidence$4.p)) {
                         } else {
                           var preRhsIndex$macro$4$3 = evidence$4.c;
                           f();
-                          var rhsAggregate$macro$7$2 = evidence$4.v;
-                          var rhsMsg$macro$8$2 = evidence$4.G;
+                          var rhsAggregate$macro$7$2 = evidence$4.s;
+                          var rhsMsg$macro$8$2 = evidence$4.F;
                           if ((!evidence$4.d)) {
                             var res$macro$14$2 = evidence$4;
                           } else {
@@ -1141,12 +1141,12 @@ $p.aIz = (function(evidence$4) {
                             var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
                             if (rhsMadeProgress$macro$10$2) {
-                              evidence$4.Q();
+                              evidence$4.P();
                             }
                             var res$macro$14$2 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$2);
                           }
-                          if (evidence$4.D) {
-                            evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$4.S));
+                          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,13 +1155,13 @@ $p.aIz = (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 lhsMsg$macro$24$1 = evidence$4.G;
+                      var lhsAggregate$macro$21$1 = evidence$4.s;
+                      var lhsMsg$macro$24$1 = evidence$4.F;
                       if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                        evidence$4.Q();
+                        evidence$4.P();
                       }
                       var lhsValue$macro$27$1 = evidence$4.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
                         if (((!evidence$4.d) && evidence$4.p)) {
                           var x1$8 = evidence$4;
@@ -1170,15 +1170,15 @@ $p.aIz = (function(evidence$4) {
                           var input$2$1 = evidence$4.T;
                           var index$2$1 = evidence$4.c;
                           if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 125))) {
-                            evidence$4.aK(((1 + index$2$1) | 0));
+                            evidence$4.aI(((1 + index$2$1) | 0));
                           } else {
-                            evidence$4.aH();
+                            evidence$4.aG();
                           }
-                          if (evidence$4.D) {
+                          if (evidence$4.C) {
                             evidence$4.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
-                          var rhsAggregate$macro$22$1 = evidence$4.v;
-                          var rhsMsg$macro$23$1 = evidence$4.G;
+                          var rhsAggregate$macro$22$1 = evidence$4.s;
+                          var rhsMsg$macro$23$1 = evidence$4.F;
                           if ((!evidence$4.d)) {
                             var res$macro$29$1 = evidence$4;
                           } else {
@@ -1186,12 +1186,12 @@ $p.aIz = (function(evidence$4) {
                             var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
                             var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.U(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                             if (rhsMadeProgress$macro$25$1) {
-                              evidence$4.Q();
+                              evidence$4.P();
                             }
                             var res$macro$29$1 = evidence$4.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                           }
-                          if (evidence$4.D) {
-                            evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$4.S));
+                          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));
                           }
                           var x1$8 = res$macro$29$1;
                         }
@@ -1202,26 +1202,26 @@ $p.aIz = (function(evidence$4) {
                     if (instrument$4) {
                       evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (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 forceAggregate$1 = (startIndex$5 < x1$8.S);
-                      x1$8.K(newshortMsg$1, x1$8.v, forceAggregate$1);
+                      x1$8.K(newshortMsg$1, x1$8.s, 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);
                       }
                     }
-                    var lhsMsg = evidence$4.G;
-                    var lhsAggregate = evidence$4.v;
+                    var lhsMsg = evidence$4.F;
+                    var lhsAggregate = evidence$4.s;
                     if (evidence$4.d) {
                       evidence$4.p = (!(!(evidence$4.p | oldCut)));
                       var x1$3$4 = evidence$4;
                     } else if (evidence$4.p) {
                       var x1$3$4 = evidence$4;
                     } else {
-                      var verboseFailures$1 = evidence$4.D;
+                      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.s, false);
                       }
                       evidence$4.p = false;
                       var startIndex$6 = evidence$4.c;
@@ -1229,7 +1229,7 @@ $p.aIz = (function(evidence$4) {
                       if (instrument$5) {
                         evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                       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$();
@@ -1238,29 +1238,29 @@ $p.aIz = (function(evidence$4) {
                       var input$5 = evidence$4.T;
                       var index$11 = evidence$4.c;
                       if ((input$5.U(index$11) && (input$5.as.charCodeAt(index$11) === 40))) {
-                        evidence$4.aK(((1 + index$11) | 0));
+                        evidence$4.aI(((1 + index$11) | 0));
                       } else {
-                        evidence$4.aH();
+                        evidence$4.aG();
                       }
-                      if (evidence$4.D) {
+                      if (evidence$4.C) {
                         evidence$4.aw(index$11, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(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 lhsMsg$macro$9$4 = evidence$4.G;
+                        var lhsAggregate$macro$6$4 = evidence$4.s;
+                        var lhsMsg$macro$9$4 = evidence$4.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                          evidence$4.Q();
+                          evidence$4.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
                           if (((!evidence$4.d) && evidence$4.p)) {
                           } else {
                             var preRhsIndex$macro$4$4 = evidence$4.c;
                             f();
-                            var rhsAggregate$macro$7$3 = evidence$4.v;
-                            var rhsMsg$macro$8$3 = evidence$4.G;
+                            var rhsAggregate$macro$7$3 = evidence$4.s;
+                            var rhsMsg$macro$8$3 = evidence$4.F;
                             if ((!evidence$4.d)) {
                               var res$macro$14$3 = evidence$4;
                             } else {
@@ -1268,12 +1268,12 @@ $p.aIz = (function(evidence$4) {
                               var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$4);
                               var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$4.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$3);
                               if (rhsMadeProgress$macro$10$3) {
-                                evidence$4.Q();
+                                evidence$4.P();
                               }
                               var res$macro$14$3 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$3);
                             }
-                            if (evidence$4.D) {
-                              evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8$3), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$4 === evidence$4.S));
+                            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,13 +1282,13 @@ $p.aIz = (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 lhsMsg$macro$24$2 = evidence$4.G;
+                        var lhsAggregate$macro$21$2 = evidence$4.s;
+                        var lhsMsg$macro$24$2 = evidence$4.F;
                         if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17$3)) {
-                          evidence$4.Q();
+                          evidence$4.P();
                         }
                         var lhsValue$macro$27$2 = evidence$4.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
                           if (((!evidence$4.d) && evidence$4.p)) {
                             var x1$8$1 = evidence$4;
@@ -1297,15 +1297,15 @@ $p.aIz = (function(evidence$4) {
                             var input$2$2 = evidence$4.T;
                             var index$2$2 = evidence$4.c;
                             if ((input$2$2.U(index$2$2) && (input$2$2.as.charCodeAt(index$2$2) === 41))) {
-                              evidence$4.aK(((1 + index$2$2) | 0));
+                              evidence$4.aI(((1 + index$2$2) | 0));
                             } else {
-                              evidence$4.aH();
+                              evidence$4.aG();
                             }
-                            if (evidence$4.D) {
+                            if (evidence$4.C) {
                               evidence$4.aw(index$2$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
-                            var rhsAggregate$macro$22$2 = evidence$4.v;
-                            var rhsMsg$macro$23$2 = evidence$4.G;
+                            var rhsAggregate$macro$22$2 = evidence$4.s;
+                            var rhsMsg$macro$23$2 = evidence$4.F;
                             if ((!evidence$4.d)) {
                               var res$macro$29$2 = evidence$4;
                             } else {
@@ -1313,12 +1313,12 @@ $p.aIz = (function(evidence$4) {
                               var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
                               var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26$3.U(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
                               if (rhsMadeProgress$macro$25$2) {
-                                evidence$4.Q();
+                                evidence$4.P();
                               }
                               var res$macro$29$2 = evidence$4.ab(lhsValue$macro$27$2, nextIndex$macro$28$2);
                             }
-                            if (evidence$4.D) {
-                              evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$4.S));
+                            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));
                             }
                             var x1$8$1 = res$macro$29$2;
                           }
@@ -1329,24 +1329,24 @@ $p.aIz = (function(evidence$4) {
                       if (instrument$5) {
                         evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (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 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.s, 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);
                         }
                       }
-                      var rhsMsg = evidence$4.G;
+                      var rhsMsg = evidence$4.F;
                       var rhsCut = evidence$4.p;
                       var endCut$1 = (!(!(rhsCut | oldCut)));
                       if (((!evidence$4.d) && (!rhsCut))) {
-                        evidence$4.d3(startPos$1);
+                        evidence$4.cZ(startPos$1);
                       }
                       evidence$4.p = endCut$1;
                       if (verboseFailures$1) {
                         var $x_7 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$4.v;
+                        var rassoc$3 = evidence$4.s;
                         evidence$4.K($x_7, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$4 = evidence$4;
@@ -1354,16 +1354,16 @@ $p.aIz = (function(evidence$4) {
                     if (instrument$3) {
                       evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$4.c, x1$3$4.d);
                     }
-                    if (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 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.s, 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);
                       }
                     }
-                    var rhsAggregate$macro$54 = evidence$4.v;
-                    var rhsMsg$macro$55 = evidence$4.G;
+                    var rhsAggregate$macro$54 = evidence$4.s;
+                    var rhsMsg$macro$55 = evidence$4.F;
                     if ((!evidence$4.d)) {
                       var res$macro$61 = evidence$4;
                     } else {
@@ -1371,12 +1371,12 @@ $p.aIz = (function(evidence$4) {
                       var rhsMadeProgress$macro$57 = (postRhsIndex$macro$52 > preRhsIndex$macro$51);
                       var nextIndex$macro$60 = (((!rhsMadeProgress$macro$57) && input$macro$58.U(postRhsIndex$macro$52)) ? postLhsIndex$macro$50 : postRhsIndex$macro$52);
                       if (rhsMadeProgress$macro$57) {
-                        evidence$4.Q();
+                        evidence$4.P();
                       }
                       var res$macro$61 = evidence$4.ab(evidence$4.E, nextIndex$macro$60);
                     }
-                    if (evidence$4.D) {
-                      evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$56, rhsMsg$macro$55), lhsAggregate$macro$53.W(rhsAggregate$macro$54), (preRhsIndex$macro$51 === evidence$4.S));
+                    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));
                     }
                   }
                 }
@@ -1390,14 +1390,14 @@ $p.aIz = (function(evidence$4) {
                 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)));
               }
-              if (evidence$4.D) {
-                var msg = evidence$4.G;
+              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$().fD(msg.dC) + ".?")))), evidence$4.v, false);
+                  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$().g1(msg.dL) + ".?")))), evidence$4.s, false);
                 }
               }
-              var rhsAggregate$macro$69 = evidence$4.v;
-              var rhsMsg$macro$70 = evidence$4.G;
+              var rhsAggregate$macro$69 = evidence$4.s;
+              var rhsMsg$macro$70 = evidence$4.F;
               if ((!evidence$4.d)) {
                 var res$macro$76 = evidence$4;
               } else {
@@ -1405,12 +1405,12 @@ $p.aIz = (function(evidence$4) {
                 var rhsMadeProgress$macro$72 = (postRhsIndex$macro$67 > preRhsIndex$macro$66);
                 var nextIndex$macro$75 = (((!rhsMadeProgress$macro$72) && input$macro$73.U(postRhsIndex$macro$67)) ? postLhsIndex$macro$65 : postRhsIndex$macro$67);
                 if (rhsMadeProgress$macro$72) {
-                  evidence$4.Q();
+                  evidence$4.P();
                 }
                 var res$macro$76 = evidence$4.ab(x1$3.aF(lhsValue$macro$74, evidence$4.E), nextIndex$macro$75);
               }
-              if (evidence$4.D) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$71, rhsMsg$macro$70), lhsAggregate$macro$68.W(rhsAggregate$macro$69), (preRhsIndex$macro$66 === evidence$4.S));
+              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));
               }
               var x1$18 = res$macro$76;
             }
@@ -1421,16 +1421,16 @@ $p.aIz = (function(evidence$4) {
         if (instrument$1) {
           evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, x1$18.c, x1$18.d);
         }
-        if (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 forceAggregate$4 = (startIndex$1 < x1$18.S);
-          x1$18.K(newshortMsg$6, x1$18.v, forceAggregate$4);
+          x1$18.K(newshortMsg$6, x1$18.s, 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);
           }
         }
-        var rhsAggregate$macro$7$4 = evidence$4.v;
-        var rhsMsg$macro$8$4 = evidence$4.G;
+        var rhsAggregate$macro$7$4 = evidence$4.s;
+        var rhsMsg$macro$8$4 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$14$4 = evidence$4;
         } else {
@@ -1438,12 +1438,12 @@ $p.aIz = (function(evidence$4) {
           var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4);
           var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$4);
           if (rhsMadeProgress$macro$10$4) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var res$macro$14$4 = evidence$4.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$4.E), nextIndex$macro$13$4);
         }
-        if (evidence$4.D) {
-          evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$4.S));
+        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,21 +1452,21 @@ $p.aIz = (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 lhsMsg$macro$24$3 = evidence$4.G;
+    var lhsAggregate$macro$21$3 = evidence$4.s;
+    var lhsMsg$macro$24$3 = evidence$4.F;
     if ((postLhsIndex$macro$18$3 > preLhsIndex$macro$17)) {
-      evidence$4.Q();
+      evidence$4.P();
     }
     var lhsValue$macro$27$3 = evidence$4.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
       if (((!evidence$4.d) && evidence$4.p)) {
         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 rhsMsg$macro$23$3 = evidence$4.G;
+        var rhsAggregate$macro$22$3 = evidence$4.s;
+        var rhsMsg$macro$23$3 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$29$3 = evidence$4;
         } else {
@@ -1474,12 +1474,12 @@ $p.aIz = (function(evidence$4) {
           var rhsMadeProgress$macro$25$3 = (postRhsIndex$macro$20$3 > preRhsIndex$macro$19$3);
           var nextIndex$macro$28$3 = (((!rhsMadeProgress$macro$25$3) && input$macro$26.U(postRhsIndex$macro$20$3)) ? postLhsIndex$macro$18$3 : postRhsIndex$macro$20$3);
           if (rhsMadeProgress$macro$25$3) {
-            evidence$4.Q();
+            evidence$4.P();
           }
           var res$macro$29$3 = evidence$4.ab(x1$2.aF(lhsValue$macro$27$3, (evidence$4.E | 0)), nextIndex$macro$28$3);
         }
-        if (evidence$4.D) {
-          evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$4.S));
+        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));
         }
         var parse0$9 = res$macro$29$3;
       }
@@ -1495,20 +1495,20 @@ $p.aIz = (function(evidence$4) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value$1 = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$9.E = $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.ft, begin, end$1), value$1);
+    var value$1 = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$9.E = $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.fu, begin, end$1), value$1);
     var x1$2$1 = parse0$9;
   }
   if (instrument) {
     evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (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 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.s, 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);
     }
@@ -1520,7 +1520,7 @@ $p.aIz = (function(evidence$4) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$10 = x1$2$1;
   }
   if ((!parse0$10.d)) {
@@ -1530,10 +1530,10 @@ $p.aIz = (function(evidence$4) {
     matchEnd4: {
       var $x_8;
       if ((x0$2 !== null)) {
-        var meta = x0$2.C();
+        var meta = x0$2.D();
         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.C(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_scala$002e$002dOption$0024.$m_s_Option$().hX(p2.z()).fd().cN($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg).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.D(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_scala$002e$002dOption$0024.$m_s_Option$().hX(p2.z()).fe().cN($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd).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.aIz = (function(evidence$4) {
     return parse0$10;
   }
 });
-$p.aIC = (function(evidence$5) {
-  var this$1 = this.CX;
+$p.aIQ = (function(evidence$5) {
+  var this$1 = this.CY;
   var startIndex = evidence$5.c;
   var instrument = (evidence$5.L !== null);
   if (instrument) {
     evidence$5.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,13 +1560,13 @@ $p.aIC = (function(evidence$5) {
   if ((!evidence$5.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$5.c;
-    var lhsAggregate$macro$6 = evidence$5.v;
-    var lhsMsg$macro$9 = evidence$5.G;
+    var lhsAggregate$macro$6 = evidence$5.s;
+    var lhsMsg$macro$9 = evidence$5.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$12 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
       } else {
@@ -1589,21 +1589,21 @@ $p.aIC = (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 lhsMsg$macro$9$1 = evidence$5.G;
+          var lhsAggregate$macro$6$1 = evidence$5.s;
+          var lhsMsg$macro$9$1 = evidence$5.F;
           evidence$5.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$5.Q();
+            evidence$5.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
             if (((!evidence$5.d) && evidence$5.p)) {
               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$().HH(evidence$5);
-              var rhsAggregate$macro$7 = evidence$5.v;
-              var rhsMsg$macro$8 = evidence$5.G;
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$5);
+              var rhsAggregate$macro$7 = evidence$5.s;
+              var rhsMsg$macro$8 = evidence$5.F;
               if ((!evidence$5.d)) {
                 evidence$5.p = true;
                 var res$macro$14 = evidence$5;
@@ -1612,12 +1612,12 @@ $p.aIC = (function(evidence$5) {
                 var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$1.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
-                  evidence$5.Q();
+                  evidence$5.P();
                 }
                 var res$macro$14 = evidence$5.ab(evidence$5.E, nextIndex$macro$13);
               }
-              if (evidence$5.D) {
-                evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$5.S));
+              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));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -1628,10 +1628,10 @@ $p.aIC = (function(evidence$5) {
         if (instrument$2) {
           evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
@@ -1639,16 +1639,16 @@ $p.aIC = (function(evidence$5) {
         if (instrument$1) {
           evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$5.v;
-        var rhsMsg$macro$8$1 = evidence$5.G;
+        var rhsAggregate$macro$7$1 = evidence$5.s;
+        var rhsMsg$macro$8$1 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$14$1 = evidence$5;
         } else {
@@ -1656,12 +1656,12 @@ $p.aIC = (function(evidence$5) {
           var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4);
           var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$1);
           if (rhsMadeProgress$macro$10$1) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var res$macro$14$1 = evidence$5.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$5.E), nextIndex$macro$13$1);
         }
-        if (evidence$5.D) {
-          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$5.S));
+        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,21 +1670,21 @@ $p.aIC = (function(evidence$5) {
     var parse0$3 = evidence$5;
   } else {
     var postLhsIndex$macro$18 = evidence$5.c;
-    var lhsAggregate$macro$21 = evidence$5.v;
-    var lhsMsg$macro$24 = evidence$5.G;
+    var lhsAggregate$macro$21 = evidence$5.s;
+    var lhsMsg$macro$24 = evidence$5.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$27 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
         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 rhsMsg$macro$23 = evidence$5.G;
+        var rhsAggregate$macro$22 = evidence$5.s;
+        var rhsMsg$macro$23 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$29 = evidence$5;
         } else {
@@ -1692,12 +1692,12 @@ $p.aIC = (function(evidence$5) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var res$macro$29 = evidence$5.ab(x1$2.aF(lhsValue$macro$27, (evidence$5.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$5.D) {
-          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$5.S));
+        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));
         }
         var parse0$3 = res$macro$29;
       }
@@ -1713,20 +1713,20 @@ $p.aIC = (function(evidence$5) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$3.E = $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.ft, begin, end), value);
+    var value = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$3.E = $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.fu, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (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 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.s, 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);
     }
@@ -1738,7 +1738,7 @@ $p.aIC = (function(evidence$5) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$1.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -1748,11 +1748,11 @@ $p.aIC = (function(evidence$5) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dInclude.$c_Lio_septimalmind_baboon_parser_model_RawInclude(x0$2.C(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dInclude.$c_Lio_septimalmind_baboon_parser_model_RawInclude(x0$2.D(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aKr = (function(evidence$6) {
+$p.aKG = (function(evidence$6) {
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.L !== null);
   if (instrument) {
@@ -1761,18 +1761,18 @@ $p.aKr = (function(evidence$6) {
   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$().AM();
+  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
   var startPos = evidence$6.c;
   var startCut = evidence$6.p;
   evidence$6.p = false;
   var startPos$2 = evidence$6.c;
-  var oldCapturing = evidence$6.gC;
-  evidence$6.gC = true;
+  var oldCapturing = evidence$6.gE;
+  evidence$6.gE = 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.gC = oldCapturing;
+  evidence$6.gE = oldCapturing;
   if ((!evidence$6.d)) {
   } else {
-    evidence$6.jY(evidence$6.T.IA(startPos$2, evidence$6.c));
+    evidence$6.jY(evidence$6.T.II(startPos$2, evidence$6.c));
   }
   var postSuccess = evidence$6.d;
   if (postSuccess) {
@@ -1783,23 +1783,23 @@ $p.aKr = (function(evidence$6) {
     var res$2 = evidence$6.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
     res$2.p = (!(!(res$2.p | startCut)));
   }
-  if (evidence$6.D) {
-    var msg = evidence$6.G;
+  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$().fD(msg.dC) + ".?")))), evidence$6.v, false);
+      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$().g1(msg.dL) + ".?")))), evidence$6.s, 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 lhsMsg$macro$9 = evidence$6.G;
+    var lhsAggregate$macro$6 = evidence$6.s;
+    var lhsMsg$macro$9 = evidence$6.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$6.Q();
+      evidence$6.P();
     }
     var lhsValue$macro$12 = evidence$6.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
       if (((!evidence$6.d) && evidence$6.p)) {
         var x1$12 = evidence$6;
@@ -1820,138 +1820,138 @@ $p.aKr = (function(evidence$6) {
         var oldCut$5 = evidence$6.p;
         evidence$6.p = false;
         var startPos$7 = evidence$6.c;
-        this.aET(evidence$6);
-        var lhsMsg = evidence$6.G;
-        var lhsAggregate = evidence$6.v;
+        this.aF7(evidence$6);
+        var lhsMsg = evidence$6.F;
+        var lhsAggregate = evidence$6.s;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$5)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures = evidence$6.D;
+          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.s, false);
           }
           evidence$6.p = false;
-          this.a0g(evidence$6);
-          var rhsMsg = evidence$6.G;
+          this.a0p(evidence$6);
+          var rhsMsg = evidence$6.F;
           var rhsCut = evidence$6.p;
           var endCut = (!(!(rhsCut | oldCut$5)));
           if (((!evidence$6.d) && (!rhsCut))) {
-            evidence$6.d3(startPos$7);
+            evidence$6.cZ(startPos$7);
           }
           evidence$6.p = endCut;
           if (verboseFailures) {
             var $x_1 = lhsMsg.W(rhsMsg);
-            var rassoc$3 = evidence$6.v;
+            var rassoc$3 = evidence$6.s;
             evidence$6.K($x_1, lhsAggregate.W(rassoc$3), false);
           }
         }
-        var lhsMsg$2 = evidence$6.G;
-        var lhsAggregate$2 = evidence$6.v;
+        var lhsMsg$2 = evidence$6.F;
+        var lhsAggregate$2 = evidence$6.s;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$4)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$2 = evidence$6.D;
+          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.s, false);
           }
           evidence$6.p = false;
-          this.aeH(evidence$6);
-          var rhsMsg$2 = evidence$6.G;
+          this.aeR(evidence$6);
+          var rhsMsg$2 = evidence$6.F;
           var rhsCut$2 = evidence$6.p;
           var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
           if (((!evidence$6.d) && (!rhsCut$2))) {
-            evidence$6.d3(startPos$6);
+            evidence$6.cZ(startPos$6);
           }
           evidence$6.p = 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.s;
             evidence$6.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
           }
         }
-        var lhsMsg$3 = evidence$6.G;
-        var lhsAggregate$3 = evidence$6.v;
+        var lhsMsg$3 = evidence$6.F;
+        var lhsAggregate$3 = evidence$6.s;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$3)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$3 = evidence$6.D;
+          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.s, false);
           }
           evidence$6.p = false;
-          this.afJ(evidence$6);
-          var rhsMsg$3 = evidence$6.G;
+          this.afU(evidence$6);
+          var rhsMsg$3 = evidence$6.F;
           var rhsCut$3 = evidence$6.p;
           var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
           if (((!evidence$6.d) && (!rhsCut$3))) {
-            evidence$6.d3(startPos$5);
+            evidence$6.cZ(startPos$5);
           }
           evidence$6.p = 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.s;
             evidence$6.K($x_3, lhsAggregate$3.W(rassoc$3$3), false);
           }
         }
-        var lhsMsg$4 = evidence$6.G;
-        var lhsAggregate$4 = evidence$6.v;
+        var lhsMsg$4 = evidence$6.F;
+        var lhsAggregate$4 = evidence$6.s;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$2)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$4 = evidence$6.D;
+          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.s, false);
           }
           evidence$6.p = false;
-          this.aFy(evidence$6);
-          var rhsMsg$4 = evidence$6.G;
+          this.aFM(evidence$6);
+          var rhsMsg$4 = evidence$6.F;
           var rhsCut$4 = evidence$6.p;
           var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
           if (((!evidence$6.d) && (!rhsCut$4))) {
-            evidence$6.d3(startPos$4);
+            evidence$6.cZ(startPos$4);
           }
           evidence$6.p = 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.s;
             evidence$6.K($x_4, lhsAggregate$4.W(rassoc$3$4), false);
           }
         }
-        var lhsMsg$5 = evidence$6.G;
-        var lhsAggregate$5 = evidence$6.v;
+        var lhsMsg$5 = evidence$6.F;
+        var lhsAggregate$5 = evidence$6.s;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut)));
         } else if ((!evidence$6.p)) {
-          var verboseFailures$5 = evidence$6.D;
+          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.s, false);
           }
           evidence$6.p = false;
-          this.ahB(evidence$6);
-          var rhsMsg$5 = evidence$6.G;
+          this.ahN(evidence$6);
+          var rhsMsg$5 = evidence$6.F;
           var rhsCut$5 = evidence$6.p;
           var endCut$5 = (!(!(rhsCut$5 | oldCut)));
           if (((!evidence$6.d) && (!rhsCut$5))) {
-            evidence$6.d3(startPos$3);
+            evidence$6.cZ(startPos$3);
           }
           evidence$6.p = 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.s;
             evidence$6.K($x_5, lhsAggregate$5.W(rassoc$3$5), false);
           }
         }
-        var rhsAggregate$macro$7 = evidence$6.v;
-        var rhsMsg$macro$8 = evidence$6.G;
+        var rhsAggregate$macro$7 = evidence$6.s;
+        var rhsMsg$macro$8 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$14 = evidence$6;
         } else {
@@ -1959,12 +1959,12 @@ $p.aKr = (function(evidence$6) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$6.Q();
+            evidence$6.P();
           }
           var res$macro$14 = evidence$6.ab(x1$3.aF(lhsValue$macro$12, evidence$6.E), nextIndex$macro$13);
         }
-        if (evidence$6.D) {
-          evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
+        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));
         }
         var x1$12 = res$macro$14;
       }
@@ -1975,10 +1975,10 @@ $p.aKr = (function(evidence$6) {
   if (instrument) {
     evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, x1$12.c, x1$12.d);
   }
-  if (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 forceAggregate = (startIndex < x1$12.S);
-    x1$12.K(newshortMsg$6, x1$12.v, forceAggregate);
+    x1$12.K(newshortMsg$6, x1$12.s, 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);
     }
@@ -1989,8 +1989,8 @@ $p.aKr = (function(evidence$6) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var root = x0.C();
-    x1$12.E = x0.z().BQ((!root.l()));
+    var root = x0.D();
+    x1$12.E = x0.z().BR((!root.l()));
   }
   var startIndex$2 = evidence$6.c;
   var instrument$2 = (evidence$6.L !== null);
@@ -2000,31 +2000,31 @@ $p.aKr = (function(evidence$6) {
   var oldCut$6 = evidence$6.p;
   evidence$6.p = false;
   var startPos$8 = evidence$6.c;
-  var lhsMsg$6 = evidence$6.G;
-  var lhsAggregate$6 = evidence$6.v;
+  var lhsMsg$6 = evidence$6.F;
+  var lhsAggregate$6 = evidence$6.s;
   if (evidence$6.d) {
     evidence$6.p = (!(!(evidence$6.p | oldCut$6)));
     var x1$16 = evidence$6;
   } else if (evidence$6.p) {
     var x1$16 = evidence$6;
   } else {
-    var verboseFailures$6 = evidence$6.D;
+    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.s, false);
     }
     evidence$6.p = false;
-    this.aKO(evidence$6);
-    var rhsMsg$6 = evidence$6.G;
+    this.aL3(evidence$6);
+    var rhsMsg$6 = evidence$6.F;
     var rhsCut$6 = evidence$6.p;
     var endCut$6 = (!(!(rhsCut$6 | oldCut$6)));
     if (((!evidence$6.d) && (!rhsCut$6))) {
-      evidence$6.d3(startPos$8);
+      evidence$6.cZ(startPos$8);
     }
     evidence$6.p = 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.s;
       evidence$6.K($x_6, lhsAggregate$6.W(rassoc$3$6), false);
     }
     var x1$16 = evidence$6;
@@ -2032,21 +2032,21 @@ $p.aKr = (function(evidence$6) {
   if (instrument$2) {
     evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, x1$16.c, x1$16.d);
   }
-  if (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 forceAggregate$1 = (startIndex$2 < x1$16.S);
-    x1$16.K(newshortMsg$8, x1$16.v, forceAggregate$1);
+    x1$16.K(newshortMsg$8, x1$16.s, 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);
     }
   }
   return x1$16;
 });
-$p.afb = (function(evidence$7) {
+$p.afm = (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$().n5();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
   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();
@@ -2058,29 +2058,29 @@ $p.afb = (function(evidence$7) {
   var lastAgg = null;
   while (true) {
     evidence$7.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aIC(evidence$7);
-    var parsedMsg = evidence$7.G;
-    var parsedAgg = evidence$7.v;
+    this.aIQ(evidence$7);
+    var parsedMsg = evidence$7.F;
+    var parsedAgg = evidence$7.s;
     var postCut = evidence$7.p;
-    var verboseFailures = evidence$7.D;
+    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$().iu(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       break;
     } else {
       var beforeSepIndex = evidence$7.c;
-      acc.al(evidence$7.E);
+      acc.am(evidence$7.E);
       var nextCount = ((1 + count) | 0);
       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.aw(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$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
+          evidence$7.aw(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$().g1(parsedMsg.dL) + ".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$().ad(whitespace, evidence$7), (!((!evidence$7.d) && 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$().ac(whitespace, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
           evidence$7.p = false;
           var sepCut = evidence$7.p;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
@@ -2100,19 +2100,19 @@ $p.afb = (function(evidence$7) {
     var parse0$1 = evidence$7;
   } else {
     var postLhsIndex$macro$3 = evidence$7.c;
-    var lhsAggregate$macro$6 = evidence$7.v;
-    var lhsMsg$macro$9 = evidence$7.G;
+    var lhsAggregate$macro$6 = evidence$7.s;
+    var lhsMsg$macro$9 = evidence$7.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$7.Q();
+      evidence$7.P();
     }
     var lhsValue$macro$12 = evidence$7.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
       if (((!evidence$7.d) && evidence$7.p)) {
         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$().n5();
+        var repeater$1 = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
         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();
@@ -2124,35 +2124,35 @@ $p.afb = (function(evidence$7) {
         var lastAgg$1 = null;
         while (true) {
           evidence$7.p = (!(!(precut$1 | ((count$1 < 0) && outerCut$1))));
-          this.aKr(evidence$7);
-          var parsedMsg$1 = evidence$7.G;
-          var parsedAgg$1 = evidence$7.v;
+          this.aKG(evidence$7);
+          var parsedMsg$1 = evidence$7.F;
+          var parsedAgg$1 = evidence$7.s;
           var postCut$1 = evidence$7.p;
-          var verboseFailures$1 = evidence$7.D;
+          var verboseFailures$1 = evidence$7.C;
           if ((!evidence$7.d)) {
             if (postCut$1) {
             } else {
               $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$().iu(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
               break;
             } else {
               break;
             }
           } else {
             var beforeSepIndex$1 = evidence$7.c;
-            acc$1.al(evidence$7.E);
+            acc$1.am(evidence$7.E);
             var nextCount$1 = ((1 + count$1) | 0);
             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.aw(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$().fD(parsedMsg$1.dC) + ".rep")))(parsedMsg$1))));
+                evidence$7.aw(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$().g1(parsedMsg$1.dL) + ".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$().ad(whitespace$1, evidence$7), (!((!evidence$7.d) && 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$().ac(whitespace$1, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
               evidence$7.p = false;
               var sepCut$1 = evidence$7.p;
               var endCut$1 = (!(!((!(!(outerCut$1 | postCut$1))) | sepCut$1)));
@@ -2167,8 +2167,8 @@ $p.afb = (function(evidence$7) {
             }
           }
         }
-        var rhsAggregate$macro$7 = evidence$7.v;
-        var rhsMsg$macro$8 = evidence$7.G;
+        var rhsAggregate$macro$7 = evidence$7.s;
+        var rhsMsg$macro$8 = evidence$7.F;
         if ((!evidence$7.d)) {
           var res$macro$14 = evidence$7;
         } else {
@@ -2176,12 +2176,12 @@ $p.afb = (function(evidence$7) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$7.Q();
+            evidence$7.P();
           }
           var res$macro$14 = evidence$7.ab(x1$2.aF(lhsValue$macro$12, evidence$7.E), nextIndex$macro$13);
         }
-        if (evidence$7.D) {
-          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
+        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));
         }
         var parse0$1 = res$macro$14;
       }
@@ -2196,34 +2196,34 @@ $p.afb = (function(evidence$7) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    parse0$1.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContent.$c_Lio_septimalmind_baboon_parser_model_RawContent(x0.C(), x0.z());
+    parse0$1.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContent.$c_Lio_septimalmind_baboon_parser_model_RawContent(x0.D(), x0.z());
     return parse0$1;
   }
 });
-$p.aFx = (function(evidence$8) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+$p.aFL = (function(evidence$8) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
   var preLhsIndex$macro$2 = evidence$8.c;
   var input$macro$11 = evidence$8.T;
-  this.afb(evidence$8);
+  this.afm(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 lhsMsg$macro$9 = evidence$8.G;
+    var lhsAggregate$macro$6 = evidence$8.s;
+    var lhsMsg$macro$9 = evidence$8.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$8.Q();
+      evidence$8.P();
     }
     var lhsValue$macro$12 = evidence$8.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
       if (((!evidence$8.d) && evidence$8.p)) {
         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 rhsMsg$macro$8 = evidence$8.G;
+        var rhsAggregate$macro$7 = evidence$8.s;
+        var rhsMsg$macro$8 = evidence$8.F;
         if ((!evidence$8.d)) {
           var res$macro$14 = evidence$8;
         } else {
@@ -2231,12 +2231,12 @@ $p.aFx = (function(evidence$8) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$8.Q();
+            evidence$8.P();
           }
           var res$macro$14 = evidence$8.ab(lhsValue$macro$12, nextIndex$macro$13);
         }
-        if (evidence$8.D) {
-          evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
+        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));
         }
         return res$macro$14;
       }
@@ -2245,19 +2245,19 @@ $p.aFx = (function(evidence$8) {
     }
   }
 });
-$p.aKP = (function(evidence$9) {
+$p.aL4 = (function(evidence$9) {
   var startIndex = evidence$9.c;
   var instrument = (evidence$9.L !== null);
   if (instrument) {
     evidence$9.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex);
   }
-  var this$1 = this.CX;
+  var this$1 = this.CY;
   var startIndex$1 = evidence$9.c;
   var instrument$1 = (evidence$9.L !== null);
   if (instrument$1) {
     evidence$9.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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,13 +2267,13 @@ $p.aKP = (function(evidence$9) {
   if ((!evidence$9.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$9.c;
-    var lhsAggregate$macro$6 = evidence$9.v;
-    var lhsMsg$macro$9 = evidence$9.G;
+    var lhsAggregate$macro$6 = evidence$9.s;
+    var lhsMsg$macro$9 = evidence$9.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$9.Q();
+      evidence$9.P();
     }
     var lhsValue$macro$12 = evidence$9.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
       if (((!evidence$9.d) && evidence$9.p)) {
       } else {
@@ -2291,13 +2291,13 @@ $p.aKP = (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 lhsMsg$macro$9$1 = evidence$9.G;
+          var lhsAggregate$macro$6$1 = evidence$9.s;
+          var lhsMsg$macro$9$1 = evidence$9.F;
           evidence$9.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$9.Q();
+            evidence$9.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
           if (evidence$9.d) {
             if (((!evidence$9.d) && evidence$9.p)) {
               var x1$4$1 = evidence$9;
@@ -2309,17 +2309,17 @@ $p.aKP = (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 lhsMsg$macro$9$2 = evidence$9.G;
+                var lhsAggregate$macro$6$2 = evidence$9.s;
+                var lhsMsg$macro$9$2 = evidence$9.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-                  evidence$9.Q();
+                  evidence$9.P();
                 }
                 var lhsValue$macro$12$2 = evidence$9.E;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                 if (evidence$9.d) {
                   if ((!((!evidence$9.d) && evidence$9.p))) {
                     var preRhsIndex$macro$4$2 = evidence$9.c;
-                    var f = (() => this.afb(evidence$9));
+                    var f = (() => this.afm(evidence$9));
                     var startIndex$3 = evidence$9.c;
                     var instrument$3 = (evidence$9.L !== null);
                     if (instrument$3) {
@@ -2333,7 +2333,7 @@ $p.aKP = (function(evidence$9) {
                     if (instrument$4) {
                       evidence$9.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                     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$();
@@ -2342,29 +2342,29 @@ $p.aKP = (function(evidence$9) {
                     var input = evidence$9.T;
                     var index = evidence$9.c;
                     if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                      evidence$9.aK(((1 + index) | 0));
+                      evidence$9.aI(((1 + index) | 0));
                     } else {
-                      evidence$9.aH();
+                      evidence$9.aG();
                     }
-                    if (evidence$9.D) {
+                    if (evidence$9.C) {
                       evidence$9.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(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 lhsMsg$macro$9$3 = evidence$9.G;
+                      var lhsAggregate$macro$6$3 = evidence$9.s;
+                      var lhsMsg$macro$9$3 = evidence$9.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$9.Q();
+                        evidence$9.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
                         if (((!evidence$9.d) && evidence$9.p)) {
                         } else {
                           var preRhsIndex$macro$4$3 = evidence$9.c;
                           f();
-                          var rhsAggregate$macro$7 = evidence$9.v;
-                          var rhsMsg$macro$8 = evidence$9.G;
+                          var rhsAggregate$macro$7 = evidence$9.s;
+                          var rhsMsg$macro$8 = evidence$9.F;
                           if ((!evidence$9.d)) {
                             var res$macro$14 = evidence$9;
                           } else {
@@ -2372,12 +2372,12 @@ $p.aKP = (function(evidence$9) {
                             var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$3.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5);
                             if (rhsMadeProgress$macro$10) {
-                              evidence$9.Q();
+                              evidence$9.P();
                             }
                             var res$macro$14 = evidence$9.ab(evidence$9.E, nextIndex$macro$13);
                           }
-                          if (evidence$9.D) {
-                            evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$3 === evidence$9.S));
+                          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,13 +2386,13 @@ $p.aKP = (function(evidence$9) {
                       var x1$8 = evidence$9;
                     } else {
                       var postLhsIndex$macro$18 = evidence$9.c;
-                      var lhsAggregate$macro$21 = evidence$9.v;
-                      var lhsMsg$macro$24 = evidence$9.G;
+                      var lhsAggregate$macro$21 = evidence$9.s;
+                      var lhsMsg$macro$24 = evidence$9.F;
                       if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-                        evidence$9.Q();
+                        evidence$9.P();
                       }
                       var lhsValue$macro$27 = evidence$9.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
                         if (((!evidence$9.d) && evidence$9.p)) {
                           var x1$8 = evidence$9;
@@ -2401,15 +2401,15 @@ $p.aKP = (function(evidence$9) {
                           var input$2 = evidence$9.T;
                           var index$2 = evidence$9.c;
                           if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                            evidence$9.aK(((1 + index$2) | 0));
+                            evidence$9.aI(((1 + index$2) | 0));
                           } else {
-                            evidence$9.aH();
+                            evidence$9.aG();
                           }
-                          if (evidence$9.D) {
+                          if (evidence$9.C) {
                             evidence$9.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
-                          var rhsAggregate$macro$22 = evidence$9.v;
-                          var rhsMsg$macro$23 = evidence$9.G;
+                          var rhsAggregate$macro$22 = evidence$9.s;
+                          var rhsMsg$macro$23 = evidence$9.F;
                           if ((!evidence$9.d)) {
                             var res$macro$29 = evidence$9;
                           } else {
@@ -2417,12 +2417,12 @@ $p.aKP = (function(evidence$9) {
                             var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
                             var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                             if (rhsMadeProgress$macro$25) {
-                              evidence$9.Q();
+                              evidence$9.P();
                             }
                             var res$macro$29 = evidence$9.ab(lhsValue$macro$27, nextIndex$macro$28);
                           }
-                          if (evidence$9.D) {
-                            evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$9.S));
+                          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));
                           }
                           var x1$8 = res$macro$29;
                         }
@@ -2433,26 +2433,26 @@ $p.aKP = (function(evidence$9) {
                     if (instrument$4) {
                       evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (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 forceAggregate = (startIndex$4 < x1$8.S);
-                      x1$8.K(newshortMsg, x1$8.v, forceAggregate);
+                      x1$8.K(newshortMsg, x1$8.s, 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);
                       }
                     }
-                    var lhsMsg = evidence$9.G;
-                    var lhsAggregate = evidence$9.v;
+                    var lhsMsg = evidence$9.F;
+                    var lhsAggregate = evidence$9.s;
                     if (evidence$9.d) {
                       evidence$9.p = (!(!(evidence$9.p | oldCut)));
                       var x1$3$3 = evidence$9;
                     } else if (evidence$9.p) {
                       var x1$3$3 = evidence$9;
                     } else {
-                      var verboseFailures = evidence$9.D;
+                      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.s, false);
                       }
                       evidence$9.p = false;
                       var startIndex$5 = evidence$9.c;
@@ -2460,7 +2460,7 @@ $p.aKP = (function(evidence$9) {
                       if (instrument$5) {
                         evidence$9.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                       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$();
@@ -2469,29 +2469,29 @@ $p.aKP = (function(evidence$9) {
                       var input$1 = evidence$9.T;
                       var index$1 = evidence$9.c;
                       if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                        evidence$9.aK(((1 + index$1) | 0));
+                        evidence$9.aI(((1 + index$1) | 0));
                       } else {
-                        evidence$9.aH();
+                        evidence$9.aG();
                       }
-                      if (evidence$9.D) {
+                      if (evidence$9.C) {
                         evidence$9.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(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 lhsMsg$macro$9$4 = evidence$9.G;
+                        var lhsAggregate$macro$6$4 = evidence$9.s;
+                        var lhsMsg$macro$9$4 = evidence$9.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                          evidence$9.Q();
+                          evidence$9.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
                           if (((!evidence$9.d) && evidence$9.p)) {
                           } else {
                             var preRhsIndex$macro$4$4 = evidence$9.c;
                             f();
-                            var rhsAggregate$macro$7$1 = evidence$9.v;
-                            var rhsMsg$macro$8$1 = evidence$9.G;
+                            var rhsAggregate$macro$7$1 = evidence$9.s;
+                            var rhsMsg$macro$8$1 = evidence$9.F;
                             if ((!evidence$9.d)) {
                               var res$macro$14$1 = evidence$9;
                             } else {
@@ -2499,12 +2499,12 @@ $p.aKP = (function(evidence$9) {
                               var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$4);
                               var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$4.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$1);
                               if (rhsMadeProgress$macro$10$1) {
-                                evidence$9.Q();
+                                evidence$9.P();
                               }
                               var res$macro$14$1 = evidence$9.ab(evidence$9.E, nextIndex$macro$13$1);
                             }
-                            if (evidence$9.D) {
-                              evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8$1), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$4 === evidence$9.S));
+                            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,13 +2513,13 @@ $p.aKP = (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 lhsMsg$macro$24$1 = evidence$9.G;
+                        var lhsAggregate$macro$21$1 = evidence$9.s;
+                        var lhsMsg$macro$24$1 = evidence$9.F;
                         if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                          evidence$9.Q();
+                          evidence$9.P();
                         }
                         var lhsValue$macro$27$1 = evidence$9.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
                           if (((!evidence$9.d) && evidence$9.p)) {
                             var x1$8$1 = evidence$9;
@@ -2528,15 +2528,15 @@ $p.aKP = (function(evidence$9) {
                             var input$2$1 = evidence$9.T;
                             var index$2$1 = evidence$9.c;
                             if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                              evidence$9.aK(((1 + index$2$1) | 0));
+                              evidence$9.aI(((1 + index$2$1) | 0));
                             } else {
-                              evidence$9.aH();
+                              evidence$9.aG();
                             }
-                            if (evidence$9.D) {
+                            if (evidence$9.C) {
                               evidence$9.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
-                            var rhsAggregate$macro$22$1 = evidence$9.v;
-                            var rhsMsg$macro$23$1 = evidence$9.G;
+                            var rhsAggregate$macro$22$1 = evidence$9.s;
+                            var rhsMsg$macro$23$1 = evidence$9.F;
                             if ((!evidence$9.d)) {
                               var res$macro$29$1 = evidence$9;
                             } else {
@@ -2544,12 +2544,12 @@ $p.aKP = (function(evidence$9) {
                               var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
                               var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.U(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                               if (rhsMadeProgress$macro$25$1) {
-                                evidence$9.Q();
+                                evidence$9.P();
                               }
                               var res$macro$29$1 = evidence$9.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                             }
-                            if (evidence$9.D) {
-                              evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$9.S));
+                            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));
                             }
                             var x1$8$1 = res$macro$29$1;
                           }
@@ -2560,24 +2560,24 @@ $p.aKP = (function(evidence$9) {
                       if (instrument$5) {
                         evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (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 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.s, 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);
                         }
                       }
-                      var rhsMsg = evidence$9.G;
+                      var rhsMsg = evidence$9.F;
                       var rhsCut = evidence$9.p;
                       var endCut = (!(!(rhsCut | oldCut)));
                       if (((!evidence$9.d) && (!rhsCut))) {
-                        evidence$9.d3(startPos);
+                        evidence$9.cZ(startPos);
                       }
                       evidence$9.p = endCut;
                       if (verboseFailures) {
                         var $x_1 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$9.v;
+                        var rassoc$3 = evidence$9.s;
                         evidence$9.K($x_1, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$3 = evidence$9;
@@ -2585,34 +2585,34 @@ $p.aKP = (function(evidence$9) {
                     if (instrument$3) {
                       evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                     }
-                    if (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 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.s, 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);
                       }
                     }
-                    var rhsAggregate$macro$7$2 = evidence$9.v;
-                    var rhsMsg$macro$8$2 = evidence$9.G;
+                    var rhsAggregate$macro$7$2 = evidence$9.s;
+                    var rhsMsg$macro$8$2 = evidence$9.F;
                     if ((!evidence$9.d)) {
                     } else {
                       var postRhsIndex$macro$5$2 = evidence$9.c;
                       var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$2);
                       var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$2.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$2);
                       if (rhsMadeProgress$macro$10$2) {
-                        evidence$9.Q();
+                        evidence$9.P();
                       }
                       evidence$9.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$9.E), nextIndex$macro$13$2);
                     }
-                    if (evidence$9.D) {
-                      evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$9.S));
+                    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));
                     }
                   }
                 }
               }
-              var rhsAggregate$macro$7$3 = evidence$9.v;
-              var rhsMsg$macro$8$3 = evidence$9.G;
+              var rhsAggregate$macro$7$3 = evidence$9.s;
+              var rhsMsg$macro$8$3 = evidence$9.F;
               if ((!evidence$9.d)) {
                 evidence$9.p = true;
                 var res$macro$14$3 = evidence$9;
@@ -2621,12 +2621,12 @@ $p.aKP = (function(evidence$9) {
                 var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$1.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$3);
                 if (rhsMadeProgress$macro$10$3) {
-                  evidence$9.Q();
+                  evidence$9.P();
                 }
                 var res$macro$14$3 = evidence$9.ab(evidence$9.E, nextIndex$macro$13$3);
               }
-              if (evidence$9.D) {
-                evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8$3), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$1 === evidence$9.S));
+              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));
               }
               var x1$4$1 = res$macro$14$3;
             }
@@ -2637,16 +2637,16 @@ $p.aKP = (function(evidence$9) {
         if (instrument$2) {
           evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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 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.s, 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);
           }
         }
-        var rhsAggregate$macro$7$4 = evidence$9.v;
-        var rhsMsg$macro$8$4 = evidence$9.G;
+        var rhsAggregate$macro$7$4 = evidence$9.s;
+        var rhsMsg$macro$8$4 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$14$4 = evidence$9;
         } else {
@@ -2654,12 +2654,12 @@ $p.aKP = (function(evidence$9) {
           var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4);
           var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$4);
           if (rhsMadeProgress$macro$10$4) {
-            evidence$9.Q();
+            evidence$9.P();
           }
           var res$macro$14$4 = evidence$9.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$9.E), nextIndex$macro$13$4);
         }
-        if (evidence$9.D) {
-          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$9.S));
+        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,21 +2668,21 @@ $p.aKP = (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 lhsMsg$macro$24$2 = evidence$9.G;
+    var lhsAggregate$macro$21$2 = evidence$9.s;
+    var lhsMsg$macro$24$2 = evidence$9.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
-      evidence$9.Q();
+      evidence$9.P();
     }
     var lhsValue$macro$27$2 = evidence$9.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
       if (((!evidence$9.d) && evidence$9.p)) {
         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 rhsMsg$macro$23$2 = evidence$9.G;
+        var rhsAggregate$macro$22$2 = evidence$9.s;
+        var rhsMsg$macro$23$2 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$29$2 = evidence$9;
         } else {
@@ -2690,12 +2690,12 @@ $p.aKP = (function(evidence$9) {
           var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
           var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.U(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
           if (rhsMadeProgress$macro$25$2) {
-            evidence$9.Q();
+            evidence$9.P();
           }
           var res$macro$29$2 = evidence$9.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$9.E | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$9.D) {
-          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$9.S));
+        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));
         }
         var parse0$6 = res$macro$29$2;
       }
@@ -2711,20 +2711,20 @@ $p.aKP = (function(evidence$9) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$6.E = $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.ft, begin, end), value);
+    var value = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$6.E = $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.fu, begin, end), value);
     var x1$2$2 = parse0$6;
   }
   if (instrument$1) {
     evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
-  if (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 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.s, 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);
     }
@@ -2736,7 +2736,7 @@ $p.aKP = (function(evidence$9) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$2.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$2.E = $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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$7 = x1$2$2;
   }
   if ((!parse0$7.d)) {
@@ -2746,10 +2746,10 @@ $p.aKP = (function(evidence$9) {
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.C();
+        var m = x0$2.D();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.C(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -2761,10 +2761,10 @@ $p.aKP = (function(evidence$9) {
   if (instrument) {
     evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, x1$2$3.c, x1$2$3.d);
   }
-  if (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 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.s, 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);
     }
@@ -2777,12 +2777,12 @@ $p.aKP = (function(evidence$9) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
     }
     var meta = x0$3.aY;
-    x1$2$3.E = 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.bk), x0$3.br.oY, meta);
+    x1$2$3.E = 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.bm), x0$3.bs.p0, meta);
     return x1$2$3;
   }
 });
-$p.aET = (function(evidence$10) {
-  var parse0 = this.ajm.aw6(evidence$10);
+$p.aF7 = (function(evidence$10) {
+  var parse0 = this.ajy.awj(evidence$10);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2790,8 +2790,8 @@ $p.aET = (function(evidence$10) {
     return parse0;
   }
 });
-$p.a0g = (function(evidence$11) {
-  var parse0 = this.ajl.afn(evidence$11);
+$p.a0p = (function(evidence$11) {
+  var parse0 = this.ajx.afy(evidence$11);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2799,8 +2799,8 @@ $p.a0g = (function(evidence$11) {
     return parse0;
   }
 });
-$p.aeH = (function(evidence$12) {
-  var parse0 = this.ajj.auC(evidence$12);
+$p.aeR = (function(evidence$12) {
+  var parse0 = this.ajv.auP(evidence$12);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2808,8 +2808,8 @@ $p.aeH = (function(evidence$12) {
     return parse0;
   }
 });
-$p.afJ = (function(evidence$13) {
-  var parse0 = this.ajn.aHk(evidence$13);
+$p.afU = (function(evidence$13) {
+  var parse0 = this.ajz.aHy(evidence$13);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2817,8 +2817,8 @@ $p.afJ = (function(evidence$13) {
     return parse0;
   }
 });
-$p.aFy = (function(evidence$14) {
-  var parse0 = this.ajk.avx(evidence$14);
+$p.aFM = (function(evidence$14) {
+  var parse0 = this.ajw.avK(evidence$14);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2826,8 +2826,8 @@ $p.aFy = (function(evidence$14) {
     return parse0;
   }
 });
-$p.ahB = (function(evidence$15) {
-  var parse0 = this.ajo.ahB(evidence$15);
+$p.ahN = (function(evidence$15) {
+  var parse0 = this.ajA.ahN(evidence$15);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2835,8 +2835,8 @@ $p.ahB = (function(evidence$15) {
     return parse0;
   }
 });
-$p.aKO = (function(evidence$16) {
-  var parse0 = this.aKP(evidence$16);
+$p.aL3 = (function(evidence$16) {
+  var parse0 = this.aL4(evidence$16);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2845,7 +2845,7 @@ $p.aKO = (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", ({
-  vx: 1
+  vA: 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