@7mind.io/baboon 0.0.166 → 0.0.168

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

@@ -29,8 +29,8 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefEnum(context, meta) {
-  this.UN = null;
-  this.UN = meta;
+  this.V6 = null;
+  this.V6 = meta;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefEnum as $c_Lio_septimalmind_baboon_parser_defns_DefEnum };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefEnum.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -40,114 +40,114 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefEnum() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefEnum as $h_Lio_septimalmind_baboon_parser_defns_DefEnum };
 $h_Lio_septimalmind_baboon_parser_defns_DefEnum.prototype = $p;
-$p.aFK = (function(evidence$2) {
+$p.aGM = (function(evidence$2) {
   var startPos = evidence$2.c;
-  var oldCapturing = evidence$2.gE;
-  evidence$2.gE = true;
+  var oldCapturing = evidence$2.gF;
+  evidence$2.gF = true;
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$2.c;
   var input$macro$11 = evidence$2.T;
   var startPos$2 = evidence$2.c;
-  var startCut = evidence$2.p;
-  evidence$2.p = false;
+  var startCut = evidence$2.o;
+  evidence$2.o = false;
   var startIndex = evidence$2.c;
-  var instrument = (evidence$2.L !== null);
+  var instrument = (evidence$2.M !== null);
   if (instrument) {
-    evidence$2.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("constInt").B, startIndex);
+    evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("constInt").B, startIndex);
   }
   var input = evidence$2.T;
   var index = evidence$2.c;
-  var res = ((input.U(index) && (input.as.charCodeAt(index) === 45)) ? evidence$2.aI(((1 + index) | 0)) : evidence$2.aG());
+  var res = ((input.V(index) && (input.as.charCodeAt(index) === 45)) ? evidence$2.aJ(((1 + index) | 0)) : evidence$2.aH());
   if (evidence$2.C) {
-    evidence$2.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
+    evidence$2.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
   }
   if (instrument) {
-    evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("constInt").B, res.c, res.d);
+    evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("constInt").B, res.c, res.d);
   }
   if (res.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("constInt").B)));
     var forceAggregate = (startIndex < res.S);
-    res.K(newshortMsg, res.s, forceAggregate);
+    res.K(newshortMsg, res.v, forceAggregate);
     if ((!res.d)) {
       res.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("constInt").B, startIndex), res.Y);
     }
   }
   var postSuccess = evidence$2.d;
   if (postSuccess) {
-    var res$2 = evidence$2.jY((void 0));
-    res$2.p = (!(!(res$2.p | startCut)));
-  } else if (evidence$2.p) {
+    var res$2 = evidence$2.k2((void 0));
+    res$2.o = (!(!(res$2.o | startCut)));
+  } else if (evidence$2.o) {
   } else {
-    var res$3 = evidence$2.ab((void 0), startPos$2);
-    res$3.p = (!(!(res$3.p | startCut)));
+    var res$3 = evidence$2.aa((void 0), startPos$2);
+    res$3.o = (!(!(res$3.o | startCut)));
   }
   if (evidence$2.C) {
     var msg = evidence$2.F;
     if ((!postSuccess)) {
-      evidence$2.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$2.s, false);
+      evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(msg.dL) + ".?")))), evidence$2.v, false);
     }
   }
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$2.c;
-    var lhsAggregate$macro$6 = evidence$2.s;
+    var lhsAggregate$macro$6 = evidence$2.v;
     var lhsMsg$macro$9 = evidence$2.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$2.P();
     }
-    if (((!evidence$2.d) && evidence$2.p)) {
+    if (((!evidence$2.d) && evidence$2.o)) {
     } else {
       var preRhsIndex$macro$4 = evidence$2.c;
-      $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().aCx(evidence$2);
-      var rhsAggregate$macro$7 = evidence$2.s;
+      $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().aDy(evidence$2);
+      var rhsAggregate$macro$7 = evidence$2.v;
       var rhsMsg$macro$8 = evidence$2.F;
       if ((!evidence$2.d)) {
         var res$macro$14 = evidence$2;
       } else {
         var postRhsIndex$macro$5 = evidence$2.c;
         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);
+        var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
         if (rhsMadeProgress$macro$10) {
           evidence$2.P();
         }
-        var res$macro$14 = evidence$2.ab((void 0), nextIndex$macro$13);
+        var res$macro$14 = evidence$2.aa((void 0), nextIndex$macro$13);
       }
       if (evidence$2.C) {
         evidence$2.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$2.S));
       }
     }
   }
-  evidence$2.gE = oldCapturing;
-  var parse0$1 = ((!evidence$2.d) ? evidence$2 : evidence$2.jY(evidence$2.T.II(startPos, evidence$2.c)));
+  evidence$2.gF = oldCapturing;
+  var parse0$1 = ((!evidence$2.d) ? evidence$2 : evidence$2.k2(evidence$2.T.J1(startPos, evidence$2.c)));
   if ((!parse0$1.d)) {
     return parse0$1;
   } else {
-    parse0$1.E = $j_java$002elang$002e$002dObject.$m_jl_Integer$().eV(parse0$1.E, 10);
+    parse0$1.D = $j_java$002elang$002e$002dObject.$m_jl_Integer$().eY(parse0$1.D, 10);
     return parse0$1;
   }
 });
-$p.aGI = (function(evidence$3) {
+$p.aHK = (function(evidence$3) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$3.c;
   var input$macro$11 = evidence$3.T;
   var startIndex = evidence$3.c;
-  var instrument = (evidence$3.L !== null);
+  var instrument = (evidence$3.M !== null);
   if (instrument) {
-    evidence$3.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumVal").B, startIndex);
+    evidence$3.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumVal").B, startIndex);
   }
   var input = evidence$3.T;
   var index = evidence$3.c;
-  var res = ((input.U(index) && (input.as.charCodeAt(index) === 61)) ? evidence$3.aI(((1 + index) | 0)) : evidence$3.aG());
+  var res = ((input.V(index) && (input.as.charCodeAt(index) === 61)) ? evidence$3.aJ(((1 + index) | 0)) : evidence$3.aH());
   if (evidence$3.C) {
-    evidence$3.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"=\""))));
+    evidence$3.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"=\""))));
   }
   if (instrument) {
-    evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumVal").B, res.c, res.d);
+    evidence$3.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumVal").B, res.c, res.d);
   }
   if (res.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("enumVal").B)));
     var forceAggregate = (startIndex < res.S);
-    res.K(newshortMsg, res.s, forceAggregate);
+    res.K(newshortMsg, res.v, forceAggregate);
     if ((!res.d)) {
       res.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("enumVal").B, startIndex), res.Y);
     }
@@ -156,30 +156,30 @@ $p.aGI = (function(evidence$3) {
     var parse0 = evidence$3;
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.s;
+    var lhsAggregate$macro$6 = evidence$3.v;
     var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$3.P();
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
-      if (((!evidence$3.d) && evidence$3.p)) {
+      if (((!evidence$3.d) && evidence$3.o)) {
         var parse0 = evidence$3;
       } else {
         var preRhsIndex$macro$4 = evidence$3.c;
-        this.aFK(evidence$3);
-        var rhsAggregate$macro$7 = evidence$3.s;
+        this.aGM(evidence$3);
+        var rhsAggregate$macro$7 = evidence$3.v;
         var rhsMsg$macro$8 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14 = evidence$3;
         } else {
           var postRhsIndex$macro$5 = evidence$3.c;
           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);
+          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
             evidence$3.P();
           }
-          var res$macro$14 = evidence$3.ab((evidence$3.E | 0), nextIndex$macro$13);
+          var res$macro$14 = evidence$3.aa((evidence$3.D | 0), nextIndex$macro$13);
         }
         if (evidence$3.C) {
           evidence$3.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$3.S));
@@ -193,24 +193,24 @@ $p.aGI = (function(evidence$3) {
   if ((!parse0.d)) {
     return parse0;
   } else {
-    var x0 = (parse0.E | 0);
-    parse0.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum$002dConst$0024$002dRaw$002dInt.$c_Lio_septimalmind_baboon_parser_model_RawEnumConst$RawInt(new $j_java$002elang$002e$002dObject.$c_RTLong(x0, (x0 >> 31)));
+    var x0 = (parse0.D | 0);
+    parse0.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum$002dConst$0024$002dRaw$002dInt.$c_Lio_septimalmind_baboon_parser_model_RawEnumConst$RawInt(new $j_java$002elang$002e$002dObject.$c_RTLong(x0, (x0 >> 31)));
     return parse0;
   }
 });
-$p.aGH = (function(evidence$4) {
+$p.aHJ = (function(evidence$4) {
   var startIndex = evidence$4.c;
-  var instrument = (evidence$4.L !== null);
+  var instrument = (evidence$4.M !== null);
   if (instrument) {
-    evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumMember").B, startIndex);
+    evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumMember").B, startIndex);
   }
-  var this$1 = this.UN;
+  var this$1 = this.V6;
   var startIndex$1 = evidence$4.c;
-  var instrument$1 = (evidence$4.L !== null);
+  var instrument$1 = (evidence$4.M !== null);
   if (instrument$1) {
-    evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$4.M.au(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$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   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$());
@@ -220,15 +220,15 @@ $p.aGH = (function(evidence$4) {
   if ((!evidence$4.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$4.c;
-    var lhsAggregate$macro$6 = evidence$4.s;
+    var lhsAggregate$macro$6 = evidence$4.v;
     var lhsMsg$macro$9 = evidence$4.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$4.P();
     }
-    var lhsValue$macro$12 = evidence$4.E;
+    var lhsValue$macro$12 = evidence$4.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$4.c;
         var x1$2$1 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -237,47 +237,47 @@ $p.aGH = (function(evidence$4) {
         $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);
         if (evidence$4.d) {
           var postLhsIndex$macro$3$1 = evidence$4.c;
-          var lhsAggregate$macro$6$1 = evidence$4.s;
+          var lhsAggregate$macro$6$1 = evidence$4.v;
           var lhsMsg$macro$9$1 = evidence$4.F;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$4.P();
           }
-          var lhsValue$macro$12$1 = evidence$4.E;
+          var lhsValue$macro$12$1 = evidence$4.D;
           $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if ((!((!evidence$4.d) && evidence$4.p))) {
+            if ((!((!evidence$4.d) && evidence$4.o))) {
               var preRhsIndex$macro$4$1 = evidence$4.c;
-              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
+              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AV();
               var startPos = evidence$4.c;
-              var startCut = evidence$4.p;
-              evidence$4.p = false;
-              this.aGI(evidence$4);
+              var startCut = evidence$4.o;
+              evidence$4.o = false;
+              this.aHK(evidence$4);
               var postSuccess = evidence$4.d;
               if (postSuccess) {
-                var res = evidence$4.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$4.E));
-                res.p = (!(!(res.p | startCut)));
-              } else if (evidence$4.p) {
+                var res = evidence$4.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$4.D));
+                res.o = (!(!(res.o | startCut)));
+              } else if (evidence$4.o) {
               } else {
-                var res$2 = evidence$4.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-                res$2.p = (!(!(res$2.p | startCut)));
+                var res$2 = evidence$4.aa($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+                res$2.o = (!(!(res$2.o | startCut)));
               }
               if (evidence$4.C) {
                 var msg = evidence$4.F;
                 if ((!postSuccess)) {
-                  evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(msg.dL) + ".?")))), evidence$4.s, 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$().g3(msg.dL) + ".?")))), evidence$4.v, false);
                 }
               }
-              var rhsAggregate$macro$7 = evidence$4.s;
+              var rhsAggregate$macro$7 = evidence$4.v;
               var rhsMsg$macro$8 = evidence$4.F;
               if ((!evidence$4.d)) {
               } else {
                 var postRhsIndex$macro$5 = evidence$4.c;
                 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);
+                var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$1.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
                   evidence$4.P();
                 }
-                evidence$4.ab(x1$2$1.aF(lhsValue$macro$12$1, evidence$4.E), nextIndex$macro$13);
+                evidence$4.aa(x1$2$1.aG(lhsValue$macro$12$1, evidence$4.D), nextIndex$macro$13);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$4.S));
@@ -285,18 +285,18 @@ $p.aGH = (function(evidence$4) {
             }
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$4.s;
+        var rhsAggregate$macro$7$1 = evidence$4.v;
         var rhsMsg$macro$8$1 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$14$1 = evidence$4;
         } else {
           var postRhsIndex$macro$5$1 = evidence$4.c;
           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);
+          var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$1);
           if (rhsMadeProgress$macro$10$1) {
             evidence$4.P();
           }
-          var res$macro$14$1 = evidence$4.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$4.E), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$4.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$4.D), nextIndex$macro$13$1);
         }
         if (evidence$4.C) {
           evidence$4.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$4.S));
@@ -308,31 +308,31 @@ $p.aGH = (function(evidence$4) {
     var parse0$4 = evidence$4;
   } else {
     var postLhsIndex$macro$18 = evidence$4.c;
-    var lhsAggregate$macro$21 = evidence$4.s;
+    var lhsAggregate$macro$21 = evidence$4.v;
     var lhsMsg$macro$24 = evidence$4.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$4.P();
     }
-    var lhsValue$macro$27 = evidence$4.E;
+    var lhsValue$macro$27 = evidence$4.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
         var parse0$4 = evidence$4;
       } else {
         var preRhsIndex$macro$19 = 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 = evidence$4.s;
+        var rhsAggregate$macro$22 = evidence$4.v;
         var rhsMsg$macro$23 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$29 = evidence$4;
         } else {
           var postRhsIndex$macro$20 = evidence$4.c;
           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);
+          var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
             evidence$4.P();
           }
-          var res$macro$29 = evidence$4.ab(x1$2.aF(lhsValue$macro$27, (evidence$4.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$4.aa(x1$2.aG(lhsValue$macro$27, (evidence$4.D | 0)), nextIndex$macro$28);
         }
         if (evidence$4.C) {
           evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$4.S));
@@ -346,25 +346,25 @@ $p.aGH = (function(evidence$4) {
   if ((!parse0$4.d)) {
     var x1$2$2 = parse0$4;
   } else {
-    var x0 = parse0$4.E;
+    var x0 = parse0$4.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aY | 0);
-    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 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
-    parse0$4.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$1);
+    var start = (x0.aX | 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$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$4.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value$1);
     var x1$2$2 = parse0$4;
   }
   if (instrument$1) {
-    evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
+    evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
   if (x1$2$2.C) {
     var newshortMsg$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("withMeta").B)));
     var forceAggregate = (startIndex$1 < x1$2$2.S);
-    x1$2$2.K(newshortMsg$1, x1$2$2.s, forceAggregate);
+    x1$2$2.K(newshortMsg$1, x1$2$2.v, forceAggregate);
     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);
     }
@@ -372,20 +372,20 @@ $p.aGH = (function(evidence$4) {
   if ((!x1$2$2.d)) {
     var x1$2$3 = x1$2$2;
   } else {
-    var x0$1 = x1$2$2.E;
+    var x0$1 = x1$2$2.D;
     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.D()), x0$1.z());
+    x1$2$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.E()), x0$1.z());
     var x1$2$3 = x1$2$2;
   }
   if (instrument) {
-    evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumMember").B, x1$2$3.c, x1$2$3.d);
+    evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumMember").B, x1$2$3.c, x1$2$3.d);
   }
   if (x1$2$3.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("enumMember").B)));
     var forceAggregate$1 = (startIndex < x1$2$3.S);
-    x1$2$3.K(newshortMsg$2, x1$2$3.s, forceAggregate$1);
+    x1$2$3.K(newshortMsg$2, x1$2$3.v, forceAggregate$1);
     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("enumMember").B, startIndex), x1$2$3.Y);
     }
@@ -393,69 +393,69 @@ $p.aGH = (function(evidence$4) {
   if ((!x1$2$3.d)) {
     return x1$2$3;
   } else {
-    var x0$2 = x1$2$3.E;
+    var x0$2 = x1$2$3.D;
     matchEnd4: {
       var $x_1;
       if ((x0$2 !== null)) {
-        var meta = x0$2.D();
+        var meta = x0$2.E();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum$002dMember.$c_Lio_septimalmind_baboon_parser_model_RawEnumMember(p2.D(), p2.z(), meta);
+          var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum$002dMember.$c_Lio_septimalmind_baboon_parser_model_RawEnumMember(p2.E(), p2.z(), meta);
           break matchEnd4;
         }
       }
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    x1$2$3.E = $x_1;
+    x1$2$3.D = $x_1;
     return x1$2$3;
   }
 });
-$p.aGj = (function(evidence$5) {
+$p.aHl = (function(evidence$5) {
   var startIndex = evidence$5.c;
-  var instrument = (evidence$5.L !== null);
+  var instrument = (evidence$5.M !== null);
   if (instrument) {
-    evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("defEnum").B, startIndex);
+    evidence$5.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("defEnum").B, startIndex);
   }
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$4 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
   var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
   var startIndex$1 = evidence$5.c;
   var count = 0;
   var precut = false;
-  var outerCut = evidence$5.p;
+  var outerCut = evidence$5.o;
   var sepMsg = null;
   var lastAgg = null;
   var x1$2;
   while (true) {
-    evidence$5.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aGH(evidence$5);
+    evidence$5.o = (!(!(precut | ((count < 0) && outerCut))));
+    this.aHJ(evidence$5);
     var parsedMsg = evidence$5.F;
-    var parsedAgg = evidence$5.s;
-    var postCut = evidence$5.p;
+    var parsedAgg = evidence$5.v;
+    var postCut = evidence$5.o;
     var verboseFailures = evidence$5.C;
     if ((!evidence$5.d)) {
       var res = (postCut ? evidence$5 : $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$4, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, evidence$5, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$5, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$1, 0, evidence$5, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       var x1$2 = res;
       break;
     } else {
       var beforeSepIndex = evidence$5.c;
-      acc.am(evidence$5.E);
+      acc.am(evidence$5.D);
       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$4, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$5, repeater, acc);
         if (verboseFailures) {
-          evidence$5.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) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(parsedMsg.dL) + ".rep")))(parsedMsg))));
+          evidence$5.av(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(parsedMsg.dL) + ".rep")))(parsedMsg))));
         }
         var x1$2 = res$2;
         break;
       } else {
-        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$5), (!((!evidence$5.d) && evidence$5.p))))) {
-          evidence$5.p = false;
-          var sepCut = evidence$5.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$5), (!((!evidence$5.d) && evidence$5.o))))) {
+          evidence$5.o = false;
+          var sepCut = evidence$5.o;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
           startIndex$1 = beforeSepIndex;
           count = nextCount;
@@ -471,25 +471,25 @@ $p.aGj = (function(evidence$5) {
     }
   }
   if (instrument) {
-    evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("defEnum").B, x1$2.c, x1$2.d);
+    evidence$5.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("defEnum").B, x1$2.c, x1$2.d);
   }
   if (x1$2.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("defEnum").B)));
     var forceAggregate = (startIndex < x1$2.S);
-    x1$2.K(newshortMsg, x1$2.s, forceAggregate);
+    x1$2.K(newshortMsg, x1$2.v, forceAggregate);
     if ((!x1$2.d)) {
       x1$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("defEnum").B, startIndex), x1$2.Y);
     }
   }
   return x1$2;
 });
-$p.aNF = (function(evidence$6) {
+$p.aOI = (function(evidence$6) {
   var startIndex = evidence$6.c;
-  var instrument = (evidence$6.L !== null);
+  var instrument = (evidence$6.M !== null);
   if (instrument) {
-    evidence$6.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("sepEnum").B, startIndex);
+    evidence$6.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("sepEnum").B, startIndex);
   }
-  var elem = evidence$6.p;
+  var elem = evidence$6.o;
   var elem$1 = false;
   elem$1 = elem;
   var startIndex$macro$15 = evidence$6.c;
@@ -497,34 +497,34 @@ $p.aNF = (function(evidence$6) {
   var lastAgg$macro$21 = null;
   var x1$4;
   while (true) {
-    evidence$6.p = (elem$1 && (count$macro$16 < 1));
-    var oldCut = evidence$6.p;
-    evidence$6.p = false;
+    evidence$6.o = (elem$1 && (count$macro$16 < 1));
+    var oldCut = evidence$6.o;
+    evidence$6.o = false;
     var startPos = evidence$6.c;
-    var elem$2 = evidence$6.p;
+    var elem$2 = evidence$6.o;
     var elem$3 = false;
     elem$3 = elem$2;
     var startIndex$macro$4 = evidence$6.c;
     var count$macro$5 = 0;
     var lastAgg$macro$10 = null;
     while (true) {
-      evidence$6.p = (elem$3 && (count$macro$5 < 1));
+      evidence$6.o = (elem$3 && (count$macro$5 < 1));
       $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dDef$002dSep.$f_Lio_septimalmind_baboon_parser_defns_base_DefSep__ws__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002esep$0024.$m_Lio_septimalmind_baboon_parser_defns_base_sep$(), evidence$6);
       var parsedMsg$macro$9 = evidence$6.F;
-      var parsedAgg$macro$11 = evidence$6.s;
-      elem$3 = (!(!(elem$3 | evidence$6.p)));
+      var parsedAgg$macro$11 = evidence$6.v;
+      elem$3 = (!(!(elem$3 | evidence$6.o)));
       if ((!evidence$6.d)) {
-        var res = (evidence$6.p ? evidence$6 : ((count$macro$5 < 1) ? evidence$6.B8(startIndex$macro$4, elem$3) : evidence$6.Ig((void 0), startIndex$macro$4, elem$3)));
+        var res = (evidence$6.o ? evidence$6 : ((count$macro$5 < 1) ? evidence$6.Bg(startIndex$macro$4, elem$3) : evidence$6.Iz((void 0), startIndex$macro$4, elem$3)));
         if (evidence$6.C) {
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$macro$4, 1, evidence$6, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().jD, parsedMsg$macro$9, lastAgg$macro$10, true);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$macro$4, 1, evidence$6, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().jH, parsedMsg$macro$9, lastAgg$macro$10, true);
         }
         break;
       } else {
         var beforeSepIndex$macro$6 = evidence$6.c;
-        evidence$6.p = false;
+        evidence$6.o = false;
         $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) && evidence$6.p))) {
-          evidence$6.p = false;
+        if ((!((!evidence$6.d) && evidence$6.o))) {
+          evidence$6.o = false;
           var temp$count$macro$5 = ((1 + count$macro$5) | 0);
           startIndex$macro$4 = beforeSepIndex$macro$6;
           count$macro$5 = temp$count$macro$5;
@@ -535,46 +535,46 @@ $p.aNF = (function(evidence$6) {
       }
     }
     var lhsMsg = evidence$6.F;
-    var lhsAggregate = evidence$6.s;
+    var lhsAggregate = evidence$6.v;
     if (evidence$6.d) {
-      evidence$6.p = (!(!(evidence$6.p | oldCut)));
-    } else if ((!evidence$6.p)) {
+      evidence$6.o = (!(!(evidence$6.o | oldCut)));
+    } else if ((!evidence$6.o)) {
       var verboseFailures = evidence$6.C;
       evidence$6.c = startPos;
       if (verboseFailures) {
-        evidence$6.K(lhsMsg, evidence$6.s, false);
+        evidence$6.K(lhsMsg, evidence$6.v, false);
       }
-      evidence$6.p = false;
+      evidence$6.o = false;
       $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dDef$002dSep.$f_Lio_septimalmind_baboon_parser_defns_base_DefSep__NLC__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002esep$0024.$m_Lio_septimalmind_baboon_parser_defns_base_sep$(), evidence$6);
       var rhsMsg = evidence$6.F;
-      var rhsCut = evidence$6.p;
+      var rhsCut = evidence$6.o;
       var endCut = (!(!(rhsCut | oldCut)));
       if (((!evidence$6.d) && (!rhsCut))) {
-        evidence$6.cZ(startPos);
+        evidence$6.d1(startPos);
       }
-      evidence$6.p = endCut;
+      evidence$6.o = endCut;
       if (verboseFailures) {
         var $x_1 = lhsMsg.W(rhsMsg);
-        var rassoc$3 = evidence$6.s;
+        var rassoc$3 = evidence$6.v;
         evidence$6.K($x_1, lhsAggregate.W(rassoc$3), false);
       }
     }
     var parsedMsg$macro$20 = evidence$6.F;
-    var parsedAgg$macro$22 = evidence$6.s;
-    elem$1 = (!(!(elem$1 | evidence$6.p)));
+    var parsedAgg$macro$22 = evidence$6.v;
+    elem$1 = (!(!(elem$1 | evidence$6.o)));
     if ((!evidence$6.d)) {
-      var res$1 = (evidence$6.p ? evidence$6 : ((count$macro$16 < 1) ? evidence$6.B8(startIndex$macro$15, elem$1) : evidence$6.Ig((void 0), startIndex$macro$15, elem$1)));
+      var res$1 = (evidence$6.o ? evidence$6 : ((count$macro$16 < 1) ? evidence$6.Bg(startIndex$macro$15, elem$1) : evidence$6.Iz((void 0), startIndex$macro$15, elem$1)));
       if (evidence$6.C) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$macro$15, 1, evidence$6, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().jD, parsedMsg$macro$20, lastAgg$macro$21, true);
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$macro$15, 1, evidence$6, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().jH, parsedMsg$macro$20, lastAgg$macro$21, true);
       }
       var x1$4 = res$1;
       break;
     } else {
       var beforeSepIndex$macro$17 = evidence$6.c;
-      evidence$6.p = false;
+      evidence$6.o = false;
       $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) && evidence$6.p))) {
-        evidence$6.p = false;
+      if ((!((!evidence$6.d) && evidence$6.o))) {
+        evidence$6.o = false;
         var temp$count$macro$16 = ((1 + count$macro$16) | 0);
         startIndex$macro$15 = beforeSepIndex$macro$17;
         count$macro$16 = temp$count$macro$16;
@@ -586,31 +586,31 @@ $p.aNF = (function(evidence$6) {
     }
   }
   if (instrument) {
-    evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("sepEnum").B, x1$4.c, x1$4.d);
+    evidence$6.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("sepEnum").B, x1$4.c, x1$4.d);
   }
   if (x1$4.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("sepEnum").B)));
     var forceAggregate = (startIndex < x1$4.S);
-    x1$4.K(newshortMsg$1, x1$4.s, forceAggregate);
+    x1$4.K(newshortMsg$1, x1$4.v, forceAggregate);
     if ((!x1$4.d)) {
       x1$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("sepEnum").B, startIndex), x1$4.Y);
     }
   }
   return x1$4;
 });
-$p.awj = (function(evidence$7) {
+$p.axp = (function(evidence$7) {
   var startIndex = evidence$7.c;
-  var instrument = (evidence$7.L !== null);
+  var instrument = (evidence$7.M !== null);
   if (instrument) {
-    evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumEnclosed").B, startIndex);
+    evidence$7.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumEnclosed").B, startIndex);
   }
-  var this$1 = this.UN;
+  var this$1 = this.V6;
   var startIndex$1 = evidence$7.c;
-  var instrument$1 = (evidence$7.L !== null);
+  var instrument$1 = (evidence$7.M !== null);
   if (instrument$1) {
-    evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$7.M.au(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$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   var preLhsIndex$macro$17 = evidence$7.c;
   var input$macro$26 = evidence$7.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$());
@@ -620,21 +620,21 @@ $p.awj = (function(evidence$7) {
   if ((!evidence$7.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$7.c;
-    var lhsAggregate$macro$6 = evidence$7.s;
+    var lhsAggregate$macro$6 = evidence$7.v;
     var lhsMsg$macro$9 = evidence$7.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$7.P();
     }
-    var lhsValue$macro$12 = evidence$7.E;
+    var lhsValue$macro$12 = evidence$7.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+      if (((!evidence$7.d) && evidence$7.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$7.c;
         var startIndex$2 = evidence$7.c;
-        var instrument$2 = (evidence$7.L !== null);
+        var instrument$2 = (evidence$7.M !== null);
         if (instrument$2) {
-          evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$7.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$7.c;
@@ -644,15 +644,15 @@ $p.awj = (function(evidence$7) {
           var x1$4$1 = evidence$7;
         } else {
           var postLhsIndex$macro$3$1 = evidence$7.c;
-          var lhsAggregate$macro$6$1 = evidence$7.s;
+          var lhsAggregate$macro$6$1 = evidence$7.v;
           var lhsMsg$macro$9$1 = evidence$7.F;
-          evidence$7.p = true;
+          evidence$7.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$7.P();
           }
           $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)) {
+            if (((!evidence$7.d) && evidence$7.o)) {
               var x1$4$1 = evidence$7;
             } else {
               var preRhsIndex$macro$4$1 = evidence$7.c;
@@ -662,47 +662,47 @@ $p.awj = (function(evidence$7) {
               $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$7);
               if (evidence$7.d) {
                 var postLhsIndex$macro$3$2 = evidence$7.c;
-                var lhsAggregate$macro$6$2 = evidence$7.s;
+                var lhsAggregate$macro$6$2 = evidence$7.v;
                 var lhsMsg$macro$9$2 = evidence$7.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
                   evidence$7.P();
                 }
-                var lhsValue$macro$12$2 = evidence$7.E;
+                var lhsValue$macro$12$2 = evidence$7.D;
                 $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
                 if (evidence$7.d) {
-                  if ((!((!evidence$7.d) && evidence$7.p))) {
+                  if ((!((!evidence$7.d) && evidence$7.o))) {
                     var preRhsIndex$macro$4$2 = evidence$7.c;
                     var x1$2$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$3 = evidence$7.c;
                     var input$macro$11$3 = evidence$7.T;
-                    this.UN.a0m(evidence$7);
+                    this.V6.a0G(evidence$7);
                     if (evidence$7.d) {
                       var postLhsIndex$macro$3$3 = evidence$7.c;
-                      var lhsAggregate$macro$6$3 = evidence$7.s;
+                      var lhsAggregate$macro$6$3 = evidence$7.v;
                       var lhsMsg$macro$9$3 = evidence$7.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$7.P();
                       }
-                      var lhsValue$macro$12$3 = evidence$7.E;
+                      var lhsValue$macro$12$3 = evidence$7.D;
                       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
                       if (evidence$7.d) {
-                        if ((!((!evidence$7.d) && evidence$7.p))) {
+                        if ((!((!evidence$7.d) && evidence$7.o))) {
                           var preRhsIndex$macro$4$3 = evidence$7.c;
-                          var f = (() => this.aGj(this.aNF(evidence$7)));
+                          var f = (() => this.aHl(this.aOI(evidence$7)));
                           var startIndex$3 = evidence$7.c;
-                          var instrument$3 = (evidence$7.L !== null);
+                          var instrument$3 = (evidence$7.M !== null);
                           if (instrument$3) {
-                            evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
+                            evidence$7.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                           }
-                          var oldCut = evidence$7.p;
-                          evidence$7.p = false;
+                          var oldCut = evidence$7.o;
+                          evidence$7.o = false;
                           var startPos = evidence$7.c;
                           var startIndex$4 = evidence$7.c;
-                          var instrument$4 = (evidence$7.L !== null);
+                          var instrument$4 = (evidence$7.M !== null);
                           if (instrument$4) {
-                            evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
+                            evidence$7.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                           }
-                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
                           var preLhsIndex$macro$17$1 = evidence$7.c;
                           var input$macro$26$1 = evidence$7.T;
                           $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -710,40 +710,40 @@ $p.awj = (function(evidence$7) {
                           var input$macro$11$4 = evidence$7.T;
                           var input = evidence$7.T;
                           var index = evidence$7.c;
-                          if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                            evidence$7.aI(((1 + index) | 0));
+                          if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
+                            evidence$7.aJ(((1 + index) | 0));
                           } else {
-                            evidence$7.aG();
+                            evidence$7.aH();
                           }
                           if (evidence$7.C) {
-                            evidence$7.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                            evidence$7.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                           }
                           if ((!evidence$7.d)) {
                           } else {
                             var postLhsIndex$macro$3$4 = evidence$7.c;
-                            var lhsAggregate$macro$6$4 = evidence$7.s;
+                            var lhsAggregate$macro$6$4 = evidence$7.v;
                             var lhsMsg$macro$9$4 = evidence$7.F;
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                               evidence$7.P();
                             }
                             $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)) {
+                              if (((!evidence$7.d) && evidence$7.o)) {
                               } else {
                                 var preRhsIndex$macro$4$4 = evidence$7.c;
                                 f();
-                                var rhsAggregate$macro$7 = evidence$7.s;
+                                var rhsAggregate$macro$7 = evidence$7.v;
                                 var rhsMsg$macro$8 = evidence$7.F;
                                 if ((!evidence$7.d)) {
                                   var res$macro$14 = evidence$7;
                                 } else {
                                   var postRhsIndex$macro$5 = evidence$7.c;
                                   var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$4);
-                                  var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
+                                  var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
                                   if (rhsMadeProgress$macro$10) {
                                     evidence$7.P();
                                   }
-                                  var res$macro$14 = evidence$7.ab(evidence$7.E, nextIndex$macro$13);
+                                  var res$macro$14 = evidence$7.aa(evidence$7.D, nextIndex$macro$13);
                                 }
                                 if (evidence$7.C) {
                                   evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$7.S));
@@ -755,40 +755,40 @@ $p.awj = (function(evidence$7) {
                             var x1$8 = evidence$7;
                           } else {
                             var postLhsIndex$macro$18 = evidence$7.c;
-                            var lhsAggregate$macro$21 = evidence$7.s;
+                            var lhsAggregate$macro$21 = evidence$7.v;
                             var lhsMsg$macro$24 = evidence$7.F;
                             if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
                               evidence$7.P();
                             }
-                            var lhsValue$macro$27 = evidence$7.E;
+                            var lhsValue$macro$27 = evidence$7.D;
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
                             if (evidence$7.d) {
-                              if (((!evidence$7.d) && evidence$7.p)) {
+                              if (((!evidence$7.d) && evidence$7.o)) {
                                 var x1$8 = evidence$7;
                               } else {
                                 var preRhsIndex$macro$19 = evidence$7.c;
                                 var input$2 = evidence$7.T;
                                 var index$2 = evidence$7.c;
-                                if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                                  evidence$7.aI(((1 + index$2) | 0));
+                                if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
+                                  evidence$7.aJ(((1 + index$2) | 0));
                                 } else {
-                                  evidence$7.aG();
+                                  evidence$7.aH();
                                 }
                                 if (evidence$7.C) {
-                                  evidence$7.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
+                                  evidence$7.av(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$7.s;
+                                var rhsAggregate$macro$22 = evidence$7.v;
                                 var rhsMsg$macro$23 = evidence$7.F;
                                 if ((!evidence$7.d)) {
                                   var res$macro$29 = evidence$7;
                                 } else {
                                   var postRhsIndex$macro$20 = evidence$7.c;
                                   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);
+                                  var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                                   if (rhsMadeProgress$macro$25) {
                                     evidence$7.P();
                                   }
-                                  var res$macro$29 = evidence$7.ab(lhsValue$macro$27, nextIndex$macro$28);
+                                  var res$macro$29 = evidence$7.aa(lhsValue$macro$27, nextIndex$macro$28);
                                 }
                                 if (evidence$7.C) {
                                   evidence$7.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$7.S));
@@ -800,36 +800,36 @@ $p.awj = (function(evidence$7) {
                             }
                           }
                           if (instrument$4) {
-                            evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
+                            evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                           }
                           if (x1$8.C) {
                             var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                             var forceAggregate = (startIndex$4 < x1$8.S);
-                            x1$8.K(newshortMsg, x1$8.s, forceAggregate);
+                            x1$8.K(newshortMsg, x1$8.v, 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$7.F;
-                          var lhsAggregate = evidence$7.s;
+                          var lhsAggregate = evidence$7.v;
                           if (evidence$7.d) {
-                            evidence$7.p = (!(!(evidence$7.p | oldCut)));
+                            evidence$7.o = (!(!(evidence$7.o | oldCut)));
                             var x1$3$3 = evidence$7;
-                          } else if (evidence$7.p) {
+                          } else if (evidence$7.o) {
                             var x1$3$3 = evidence$7;
                           } else {
                             var verboseFailures = evidence$7.C;
                             evidence$7.c = startPos;
                             if (verboseFailures) {
-                              evidence$7.K(lhsMsg, evidence$7.s, false);
+                              evidence$7.K(lhsMsg, evidence$7.v, false);
                             }
-                            evidence$7.p = false;
+                            evidence$7.o = false;
                             var startIndex$5 = evidence$7.c;
-                            var instrument$5 = (evidence$7.L !== null);
+                            var instrument$5 = (evidence$7.M !== null);
                             if (instrument$5) {
-                              evidence$7.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
+                              evidence$7.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                             }
-                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
                             var preLhsIndex$macro$17$2 = evidence$7.c;
                             var input$macro$26$2 = evidence$7.T;
                             $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -837,40 +837,40 @@ $p.awj = (function(evidence$7) {
                             var input$macro$11$5 = evidence$7.T;
                             var input$1 = evidence$7.T;
                             var index$1 = evidence$7.c;
-                            if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                              evidence$7.aI(((1 + index$1) | 0));
+                            if ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
+                              evidence$7.aJ(((1 + index$1) | 0));
                             } else {
-                              evidence$7.aG();
+                              evidence$7.aH();
                             }
                             if (evidence$7.C) {
-                              evidence$7.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
+                              evidence$7.av(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$7.d)) {
                             } else {
                               var postLhsIndex$macro$3$5 = evidence$7.c;
-                              var lhsAggregate$macro$6$5 = evidence$7.s;
+                              var lhsAggregate$macro$6$5 = evidence$7.v;
                               var lhsMsg$macro$9$5 = evidence$7.F;
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
                                 evidence$7.P();
                               }
                               $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)) {
+                                if (((!evidence$7.d) && evidence$7.o)) {
                                 } else {
                                   var preRhsIndex$macro$4$5 = evidence$7.c;
                                   f();
-                                  var rhsAggregate$macro$7$1 = evidence$7.s;
+                                  var rhsAggregate$macro$7$1 = evidence$7.v;
                                   var rhsMsg$macro$8$1 = evidence$7.F;
                                   if ((!evidence$7.d)) {
                                     var res$macro$14$1 = evidence$7;
                                   } else {
                                     var postRhsIndex$macro$5$1 = evidence$7.c;
                                     var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$5);
-                                    var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
+                                    var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
                                     if (rhsMadeProgress$macro$10$1) {
                                       evidence$7.P();
                                     }
-                                    var res$macro$14$1 = evidence$7.ab(evidence$7.E, nextIndex$macro$13$1);
+                                    var res$macro$14$1 = evidence$7.aa(evidence$7.D, nextIndex$macro$13$1);
                                   }
                                   if (evidence$7.C) {
                                     evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$7.S));
@@ -882,40 +882,40 @@ $p.awj = (function(evidence$7) {
                               var x1$8$1 = evidence$7;
                             } else {
                               var postLhsIndex$macro$18$1 = evidence$7.c;
-                              var lhsAggregate$macro$21$1 = evidence$7.s;
+                              var lhsAggregate$macro$21$1 = evidence$7.v;
                               var lhsMsg$macro$24$1 = evidence$7.F;
                               if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
                                 evidence$7.P();
                               }
-                              var lhsValue$macro$27$1 = evidence$7.E;
+                              var lhsValue$macro$27$1 = evidence$7.D;
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
                               if (evidence$7.d) {
-                                if (((!evidence$7.d) && evidence$7.p)) {
+                                if (((!evidence$7.d) && evidence$7.o)) {
                                   var x1$8$1 = evidence$7;
                                 } else {
                                   var preRhsIndex$macro$19$1 = evidence$7.c;
                                   var input$2$1 = evidence$7.T;
                                   var index$2$1 = evidence$7.c;
-                                  if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                                    evidence$7.aI(((1 + index$2$1) | 0));
+                                  if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
+                                    evidence$7.aJ(((1 + index$2$1) | 0));
                                   } else {
-                                    evidence$7.aG();
+                                    evidence$7.aH();
                                   }
                                   if (evidence$7.C) {
-                                    evidence$7.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((() => "\")\""))));
+                                    evidence$7.av(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                                   }
-                                  var rhsAggregate$macro$22$1 = evidence$7.s;
+                                  var rhsAggregate$macro$22$1 = evidence$7.v;
                                   var rhsMsg$macro$23$1 = evidence$7.F;
                                   if ((!evidence$7.d)) {
                                     var res$macro$29$1 = evidence$7;
                                   } else {
                                     var postRhsIndex$macro$20$1 = evidence$7.c;
                                     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);
+                                    var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.V(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                                     if (rhsMadeProgress$macro$25$1) {
                                       evidence$7.P();
                                     }
-                                    var res$macro$29$1 = evidence$7.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                                    var res$macro$29$1 = evidence$7.aa(lhsValue$macro$27$1, nextIndex$macro$28$1);
                                   }
                                   if (evidence$7.C) {
                                     evidence$7.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$7.S));
@@ -927,52 +927,52 @@ $p.awj = (function(evidence$7) {
                               }
                             }
                             if (instrument$5) {
-                              evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
+                              evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                             }
                             if (x1$8$1.C) {
                               var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                               var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
-                              x1$8$1.K(newshortMsg$1, x1$8$1.s, forceAggregate$1);
+                              x1$8$1.K(newshortMsg$1, x1$8$1.v, 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$7.F;
-                            var rhsCut = evidence$7.p;
+                            var rhsCut = evidence$7.o;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$7.d) && (!rhsCut))) {
-                              evidence$7.cZ(startPos);
+                              evidence$7.d1(startPos);
                             }
-                            evidence$7.p = endCut;
+                            evidence$7.o = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
-                              var rassoc$3 = evidence$7.s;
+                              var rassoc$3 = evidence$7.v;
                               evidence$7.K($x_1, lhsAggregate.W(rassoc$3), false);
                             }
                             var x1$3$3 = evidence$7;
                           }
                           if (instrument$3) {
-                            evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
+                            evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                           }
                           if (x1$3$3.C) {
                             var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                             var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
-                            x1$3$3.K(newshortMsg$3, x1$3$3.s, forceAggregate$2);
+                            x1$3$3.K(newshortMsg$3, x1$3$3.v, 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$7.s;
+                          var rhsAggregate$macro$7$2 = evidence$7.v;
                           var rhsMsg$macro$8$2 = evidence$7.F;
                           if ((!evidence$7.d)) {
                           } else {
                             var postRhsIndex$macro$5$2 = evidence$7.c;
                             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);
+                            var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.V(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
                             if (rhsMadeProgress$macro$10$2) {
                               evidence$7.P();
                             }
-                            evidence$7.ab(x1$2$2.aF(lhsValue$macro$12$3, evidence$7.E), nextIndex$macro$13$2);
+                            evidence$7.aa(x1$2$2.aG(lhsValue$macro$12$3, evidence$7.D), nextIndex$macro$13$2);
                           }
                           if (evidence$7.C) {
                             evidence$7.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$7.S));
@@ -980,17 +980,17 @@ $p.awj = (function(evidence$7) {
                         }
                       }
                     }
-                    var rhsAggregate$macro$7$3 = evidence$7.s;
+                    var rhsAggregate$macro$7$3 = evidence$7.v;
                     var rhsMsg$macro$8$3 = evidence$7.F;
                     if ((!evidence$7.d)) {
                     } else {
                       var postRhsIndex$macro$5$3 = evidence$7.c;
                       var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$2);
-                      var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
+                      var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.V(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
                       if (rhsMadeProgress$macro$10$3) {
                         evidence$7.P();
                       }
-                      evidence$7.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$7.E), nextIndex$macro$13$3);
+                      evidence$7.aa(x1$2$1.aG(lhsValue$macro$12$2, evidence$7.D), nextIndex$macro$13$3);
                     }
                     if (evidence$7.C) {
                       evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$7.S));
@@ -998,19 +998,19 @@ $p.awj = (function(evidence$7) {
                   }
                 }
               }
-              var rhsAggregate$macro$7$4 = evidence$7.s;
+              var rhsAggregate$macro$7$4 = evidence$7.v;
               var rhsMsg$macro$8$4 = evidence$7.F;
               if ((!evidence$7.d)) {
-                evidence$7.p = true;
+                evidence$7.o = true;
                 var res$macro$14$4 = evidence$7;
               } else {
                 var postRhsIndex$macro$5$4 = evidence$7.c;
                 var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$1);
-                var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
+                var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.V(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
                 if (rhsMadeProgress$macro$10$4) {
                   evidence$7.P();
                 }
-                var res$macro$14$4 = evidence$7.ab(evidence$7.E, nextIndex$macro$13$4);
+                var res$macro$14$4 = evidence$7.aa(evidence$7.D, nextIndex$macro$13$4);
               }
               if (evidence$7.C) {
                 evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$7.S));
@@ -1022,28 +1022,28 @@ $p.awj = (function(evidence$7) {
           }
         }
         if (instrument$2) {
-          evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
           var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$4, x1$4$1.s, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.v, 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$5 = evidence$7.s;
+        var rhsAggregate$macro$7$5 = evidence$7.v;
         var rhsMsg$macro$8$5 = evidence$7.F;
         if ((!evidence$7.d)) {
           var res$macro$14$5 = evidence$7;
         } else {
           var postRhsIndex$macro$5$5 = evidence$7.c;
           var rhsMadeProgress$macro$10$5 = (postRhsIndex$macro$5$5 > preRhsIndex$macro$4);
-          var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.U(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
+          var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.V(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
           if (rhsMadeProgress$macro$10$5) {
             evidence$7.P();
           }
-          var res$macro$14$5 = evidence$7.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$7.E), nextIndex$macro$13$5);
+          var res$macro$14$5 = evidence$7.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$7.D), nextIndex$macro$13$5);
         }
         if (evidence$7.C) {
           evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$7.S));
@@ -1055,31 +1055,31 @@ $p.awj = (function(evidence$7) {
     var parse0$7 = evidence$7;
   } else {
     var postLhsIndex$macro$18$2 = evidence$7.c;
-    var lhsAggregate$macro$21$2 = evidence$7.s;
+    var lhsAggregate$macro$21$2 = evidence$7.v;
     var lhsMsg$macro$24$2 = evidence$7.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
       evidence$7.P();
     }
-    var lhsValue$macro$27$2 = evidence$7.E;
+    var lhsValue$macro$27$2 = evidence$7.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+      if (((!evidence$7.d) && evidence$7.o)) {
         var parse0$7 = evidence$7;
       } else {
         var preRhsIndex$macro$19$2 = evidence$7.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$7);
-        var rhsAggregate$macro$22$2 = evidence$7.s;
+        var rhsAggregate$macro$22$2 = evidence$7.v;
         var rhsMsg$macro$23$2 = evidence$7.F;
         if ((!evidence$7.d)) {
           var res$macro$29$2 = evidence$7;
         } else {
           var postRhsIndex$macro$20$2 = evidence$7.c;
           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);
+          var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.V(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
           if (rhsMadeProgress$macro$25$2) {
             evidence$7.P();
           }
-          var res$macro$29$2 = evidence$7.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$7.E | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$7.aa(x1$2.aG(lhsValue$macro$27$2, (evidence$7.D | 0)), nextIndex$macro$28$2);
         }
         if (evidence$7.C) {
           evidence$7.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$7.S));
@@ -1093,25 +1093,25 @@ $p.awj = (function(evidence$7) {
   if ((!parse0$7.d)) {
     var x1$2$3 = parse0$7;
   } else {
-    var x0 = parse0$7.E;
+    var x0 = parse0$7.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aY | 0);
-    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$7.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 start = (x0.aX | 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$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
-    evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+    evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
   }
   if (x1$2$3.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$3.S);
-    x1$2$3.K(newshortMsg$5, x1$2$3.s, forceAggregate$4);
+    x1$2$3.K(newshortMsg$5, x1$2$3.v, forceAggregate$4);
     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("withMeta").B, startIndex$1), x1$2$3.Y);
     }
@@ -1119,39 +1119,39 @@ $p.awj = (function(evidence$7) {
   if ((!x1$2$3.d)) {
     var parse0$8 = x1$2$3;
   } else {
-    var x0$1 = x1$2$3.E;
+    var x0$1 = x1$2$3.D;
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.E()), x0$1.z());
     var parse0$8 = x1$2$3;
   }
   if ((!parse0$8.d)) {
     var x1$2$4 = parse0$8;
   } else {
-    var x0$2 = parse0$8.E;
+    var x0$2 = parse0$8.D;
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.D();
+        var m = x0$2.E();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.E(), p2.z());
           break matchEnd4$1;
         }
       }
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$8.E = $x_2;
+    parse0$8.D = $x_2;
     var x1$2$4 = parse0$8;
   }
   if (instrument) {
-    evidence$7.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumEnclosed").B, x1$2$4.c, x1$2$4.d);
+    evidence$7.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enumEnclosed").B, x1$2$4.c, x1$2$4.d);
   }
   if (x1$2$4.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("enumEnclosed").B)));
     var forceAggregate$5 = (startIndex < x1$2$4.S);
-    x1$2$4.K(newshortMsg$6, x1$2$4.s, forceAggregate$5);
+    x1$2$4.K(newshortMsg$6, x1$2$4.v, forceAggregate$5);
     if ((!x1$2$4.d)) {
       x1$2$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("enumEnclosed").B, startIndex), x1$2$4.Y);
     }
@@ -1159,27 +1159,27 @@ $p.awj = (function(evidence$7) {
   if ((!x1$2$4.d)) {
     return x1$2$4;
   } else {
-    var x0$3 = x1$2$4.E;
+    var x0$3 = x1$2$4.D;
     matchEnd4$2: {
       var $x_3;
       if ((x0$3 !== null)) {
-        var meta = x0$3.aY;
-        var name = x0$3.bm;
-        var p2$1 = x0$3.bs;
+        var meta = x0$3.aX;
+        var name = x0$3.bk;
+        var p2$1 = x0$3.br;
         if ((p2$1 !== null)) {
-          var derived = p2$1.D();
+          var derived = p2$1.E();
           var $x_3 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum.$c_Lio_septimalmind_baboon_parser_model_RawEnum(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), p2$1.z(), derived, meta);
           break matchEnd4$2;
         }
       }
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
     }
-    x1$2$4.E = $x_3;
+    x1$2$4.D = $x_3;
     return x1$2$4;
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefEnum = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefEnum, "io.septimalmind.baboon.parser.defns.DefEnum", ({
-  vw: 1
+  vA: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefEnum as $d_Lio_septimalmind_baboon_parser_defns_DefEnum };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Enum.js.map