@7mind.io/baboon 0.0.166 → 0.0.167

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

@@ -38,8 +38,8 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefDto(context, meta) {
-  this.si = null;
-  this.si = meta;
+  this.sq = null;
+  this.sq = meta;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefDto as $c_Lio_septimalmind_baboon_parser_defns_DefDto };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -49,8 +49,8 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefDto() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefDto as $h_Lio_septimalmind_baboon_parser_defns_DefDto };
 $h_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = $p;
-$p.aP4 = (function(evidence$1) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+$p.aQe = (function(evidence$1) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -58,18 +58,18 @@ $p.aP4 = (function(evidence$1) {
   var input$macro$11 = evidence$1.T;
   var input = evidence$1.T;
   var index = evidence$1.c;
-  if ((input.U(index) && (input.as.charCodeAt(index) === 91))) {
-    evidence$1.aI(((1 + index) | 0));
+  if ((input.V(index) && (input.as.charCodeAt(index) === 91))) {
+    evidence$1.aJ(((1 + index) | 0));
   } else {
-    evidence$1.aG();
+    evidence$1.aH();
   }
   if (evidence$1.C) {
-    evidence$1.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"[\""))));
+    evidence$1.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$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.s;
+    var lhsAggregate$macro$6 = evidence$1.v;
     var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.P();
@@ -79,7 +79,7 @@ $p.aP4 = (function(evidence$1) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        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$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$();
         var this$8 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
         var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
@@ -91,9 +91,9 @@ $p.aP4 = (function(evidence$1) {
         var lastAgg = null;
         while (true) {
           evidence$1.p = (!(!(precut | ((count < 1) && outerCut))));
-          this.aib(evidence$1);
+          this.aiO(evidence$1);
           var parsedMsg = evidence$1.F;
-          var parsedAgg = evidence$1.s;
+          var parsedAgg = evidence$1.v;
           var postCut = evidence$1.p;
           var verboseFailures = evidence$1.C;
           if ((!evidence$1.d)) {
@@ -102,22 +102,22 @@ $p.aP4 = (function(evidence$1) {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$4__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$8, startIndex, startIndex, count, (!(!(outerCut | postCut))), 1, evidence$1, repeater, acc);
             }
             if (verboseFailures) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
               break;
             } else {
               break;
             }
           } else {
             var beforeSepIndex = evidence$1.c;
-            acc.am(evidence$1.E);
+            acc.am(evidence$1.D);
             var nextCount = ((1 + count) | 0);
             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$1), (!((!evidence$1.d) && evidence$1.p))))) {
               evidence$1.p = false;
               var input$1 = evidence$1.T;
               var index$1 = evidence$1.c;
-              var res$2 = ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 44)) ? evidence$1.aI(((1 + index$1) | 0)) : evidence$1.aG());
+              var res$2 = ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 44)) ? evidence$1.aJ(((1 + index$1) | 0)) : evidence$1.aH());
               if (evidence$1.C) {
-                evidence$1.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$1.av(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\",\""))));
               }
               var sepCut = evidence$1.p;
               var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
@@ -142,12 +142,12 @@ $p.aP4 = (function(evidence$1) {
                 }
               } else {
                 if (sepCut) {
-                  evidence$1.B8(beforeSepIndex, endCut);
+                  evidence$1.Bh(beforeSepIndex, endCut);
                 } else {
                   $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$4__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$8, beforeSepIndex, beforeSepIndex, nextCount, endCut, 1, evidence$1, repeater, acc);
                 }
                 if (verboseFailures) {
-                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
+                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
                   break;
                 } else {
                   break;
@@ -158,18 +158,18 @@ $p.aP4 = (function(evidence$1) {
             }
           }
         }
-        var rhsAggregate$macro$7 = evidence$1.s;
+        var rhsAggregate$macro$7 = evidence$1.v;
         var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
         } else {
           var postRhsIndex$macro$5 = evidence$1.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$1.P();
           }
-          var res$macro$14 = evidence$1.ab(evidence$1.E, nextIndex$macro$13);
+          var res$macro$14 = evidence$1.ab(evidence$1.D, nextIndex$macro$13);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
@@ -181,12 +181,12 @@ $p.aP4 = (function(evidence$1) {
     var parse0$1 = evidence$1;
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.s;
+    var lhsAggregate$macro$21 = evidence$1.v;
     var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$1.P();
     }
-    var lhsValue$macro$27 = evidence$1.E;
+    var lhsValue$macro$27 = evidence$1.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
@@ -195,22 +195,22 @@ $p.aP4 = (function(evidence$1) {
         var preRhsIndex$macro$19 = evidence$1.c;
         var input$2 = evidence$1.T;
         var index$2 = evidence$1.c;
-        if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
-          evidence$1.aI(((1 + index$2) | 0));
+        if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
+          evidence$1.aJ(((1 + index$2) | 0));
         } else {
-          evidence$1.aG();
+          evidence$1.aH();
         }
         if (evidence$1.C) {
-          evidence$1.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$1.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$1.s;
+        var rhsAggregate$macro$22 = evidence$1.v;
         var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
         } else {
           var postRhsIndex$macro$20 = evidence$1.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$1.P();
           }
@@ -228,55 +228,55 @@ $p.aP4 = (function(evidence$1) {
   if ((!parse0$1.d)) {
     return parse0$1;
   } else {
-    var x0 = parse0$1.E;
+    var x0 = parse0$1.D;
     var list = x0.aC();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().e2((!list.l()));
-    parse0$1.E = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list);
+    $j_java$002elang$002e$002dObject.$m_s_Predef$().e3((!list.m()));
+    parse0$1.D = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list);
     return parse0$1;
   }
 });
-$p.Tz = (function(evidence$2) {
+$p.TV = (function(evidence$2) {
   var parse0 = $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);
   if ((!parse0.d)) {
     return parse0;
   } else {
-    var x0 = parse0.E;
-    var list = x0.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((p$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(p$2$2)))).aC();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().e2((!list.l()));
-    parse0.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dScoped$002dRef.$c_Lio_septimalmind_baboon_parser_model_ScopedRef(list);
+    var x0 = parse0.D;
+    var list = x0.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((p$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(p$2$2)))).aC();
+    $j_java$002elang$002e$002dObject.$m_s_Predef$().e3((!list.m()));
+    parse0.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dScoped$002dRef.$c_Lio_septimalmind_baboon_parser_model_ScopedRef(list);
     return parse0;
   }
 });
-$p.aib = (function(evidence$3) {
+$p.aiO = (function(evidence$3) {
   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$3.c;
   var input$macro$11 = evidence$3.T;
-  this.Tz(evidence$3);
+  this.TV(evidence$3);
   if ((!evidence$3.d)) {
     var parse0$2 = 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();
     }
-    var lhsValue$macro$12 = evidence$3.E;
+    var lhsValue$macro$12 = evidence$3.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
       if (((!evidence$3.d) && evidence$3.p)) {
         var parse0$2 = evidence$3;
       } else {
         var preRhsIndex$macro$4 = evidence$3.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AW();
         var startPos = evidence$3.c;
         var startCut = evidence$3.p;
         evidence$3.p = false;
-        this.aP4(evidence$3);
+        this.aQe(evidence$3);
         var postSuccess = evidence$3.d;
         if (postSuccess) {
-          var ev$1 = evidence$3.E;
-          var res = evidence$3.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(((ev$1 === null) ? null : ev$1.ay))));
+          var ev$1 = evidence$3.D;
+          var res = evidence$3.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(((ev$1 === null) ? null : ev$1.ay))));
           res.p = (!(!(res.p | startCut)));
         } else if (evidence$3.p) {
         } else {
@@ -286,21 +286,21 @@ $p.aib = (function(evidence$3) {
         if (evidence$3.C) {
           var msg = evidence$3.F;
           if ((!postSuccess)) {
-            evidence$3.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$3.s, false);
+            evidence$3.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$3.v, false);
           }
         }
-        var rhsAggregate$macro$7 = evidence$3.s;
+        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(x1$2.aF(lhsValue$macro$12, evidence$3.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$3.ab(x1$2.aG(lhsValue$macro$12, evidence$3.D), nextIndex$macro$13);
         }
         if (evidence$3.C) {
           evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$3.S));
@@ -314,14 +314,14 @@ $p.aib = (function(evidence$3) {
   if ((!parse0$2.d)) {
     return parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var ref = x0.D();
+    var ref = x0.E();
     var params = x0.z();
-    var name = ref.qJ.bj().gF;
-    var prefix = ref.qJ.fC();
+    var name = ref.qR.bl().gG;
+    var prefix = ref.qR.fF();
     if ((params instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
       var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Constructor(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), params.af.ay, prefix);
     } else {
@@ -330,27 +330,27 @@ $p.aib = (function(evidence$3) {
       }
       var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Simple(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), prefix);
     }
-    parse0$2.E = $x_1;
+    parse0$2.D = $x_1;
     return parse0$2;
   }
 });
-$p.aHe = (function(evidence$4) {
+$p.aIn = (function(evidence$4) {
   var parse0 = $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 ((!parse0.d)) {
     return parse0;
   } else {
-    parse0.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField$002dName.$c_Lio_septimalmind_baboon_parser_model_RawFieldName(parse0.E);
+    parse0.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField$002dName.$c_Lio_septimalmind_baboon_parser_model_RawFieldName(parse0.D);
     return parse0;
   }
 });
-$p.aFN = (function(evidence$5) {
+$p.aGW = (function(evidence$5) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$4 = evidence$5.c;
   var input$macro$13 = evidence$5.T;
   var index = evidence$5.c;
   var end = ((2 + index) | 0);
   var input = evidence$5.T;
-  if (input.U((((-1) + end) | 0))) {
+  if (input.V((((-1) + end) | 0))) {
     if ((input.as.charCodeAt(index) === 105)) {
       var index$1 = ((1 + index) | 0);
       var $x_1 = (input.as.charCodeAt(index$1) === 115);
@@ -361,18 +361,18 @@ $p.aFN = (function(evidence$5) {
     var $x_1 = false;
   }
   if ($x_1) {
-    evidence$5.aI(end);
+    evidence$5.aJ(end);
   } else {
-    evidence$5.aG();
+    evidence$5.aH();
   }
   if (evidence$5.C) {
-    evidence$5.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"is\""))));
+    evidence$5.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"is\""))));
   }
   if ((!evidence$5.d)) {
     var parse0 = evidence$5;
   } else {
     var postLhsIndex$macro$5 = evidence$5.c;
-    var lhsAggregate$macro$8 = evidence$5.s;
+    var lhsAggregate$macro$8 = evidence$5.v;
     var lhsMsg$macro$11 = evidence$5.F;
     if ((postLhsIndex$macro$5 > preLhsIndex$macro$4)) {
       evidence$5.P();
@@ -383,19 +383,19 @@ $p.aFN = (function(evidence$5) {
         var parse0 = evidence$5;
       } else {
         var preRhsIndex$macro$6 = evidence$5.c;
-        this.Tz(evidence$5);
-        var rhsAggregate$macro$9 = evidence$5.s;
+        this.TV(evidence$5);
+        var rhsAggregate$macro$9 = evidence$5.v;
         var rhsMsg$macro$10 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$16 = evidence$5;
         } else {
           var postRhsIndex$macro$7 = evidence$5.c;
           var rhsMadeProgress$macro$12 = (postRhsIndex$macro$7 > preRhsIndex$macro$6);
-          var nextIndex$macro$15 = (((!rhsMadeProgress$macro$12) && input$macro$13.U(postRhsIndex$macro$7)) ? postLhsIndex$macro$5 : postRhsIndex$macro$7);
+          var nextIndex$macro$15 = (((!rhsMadeProgress$macro$12) && input$macro$13.V(postRhsIndex$macro$7)) ? postLhsIndex$macro$5 : postRhsIndex$macro$7);
           if (rhsMadeProgress$macro$12) {
             evidence$5.P();
           }
-          var res$macro$16 = evidence$5.ab(evidence$5.E, nextIndex$macro$15);
+          var res$macro$16 = evidence$5.ab(evidence$5.D, nextIndex$macro$15);
         }
         if (evidence$5.C) {
           evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$11, rhsMsg$macro$10), lhsAggregate$macro$8.W(rhsAggregate$macro$9), (preRhsIndex$macro$6 === evidence$5.S));
@@ -409,18 +409,18 @@ $p.aFN = (function(evidence$5) {
   if ((!parse0.d)) {
     return parse0;
   } else {
-    parse0.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawContractRef(parse0.E);
+    parse0.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawContractRef(parse0.D);
     return parse0;
   }
 });
-$p.awu = (function(evidence$6) {
-  var this$1 = this.si;
+$p.axH = (function(evidence$6) {
+  var this$1 = this.sq;
   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("withMeta").B, startIndex);
+    evidence$6.M.au(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$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   var preLhsIndex$macro$17 = evidence$6.c;
   var input$macro$26 = evidence$6.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$());
@@ -430,30 +430,30 @@ $p.awu = (function(evidence$6) {
   if ((!evidence$6.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$6.c;
-    var lhsAggregate$macro$6 = evidence$6.s;
+    var lhsAggregate$macro$6 = evidence$6.v;
     var lhsMsg$macro$9 = evidence$6.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$6.P();
     }
-    var lhsValue$macro$12 = evidence$6.E;
+    var lhsValue$macro$12 = evidence$6.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
       if (((!evidence$6.d) && evidence$6.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$6.c;
-        this.aFN(evidence$6);
-        var rhsAggregate$macro$7 = evidence$6.s;
+        this.aGW(evidence$6);
+        var rhsAggregate$macro$7 = evidence$6.v;
         var rhsMsg$macro$8 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$14 = evidence$6;
         } else {
           var postRhsIndex$macro$5 = evidence$6.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$6.P();
           }
-          var res$macro$14 = evidence$6.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$6.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$6.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$6.D), nextIndex$macro$13);
         }
         if (evidence$6.C) {
           evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
@@ -465,12 +465,12 @@ $p.awu = (function(evidence$6) {
     var parse0$2 = evidence$6;
   } else {
     var postLhsIndex$macro$18 = evidence$6.c;
-    var lhsAggregate$macro$21 = evidence$6.s;
+    var lhsAggregate$macro$21 = evidence$6.v;
     var lhsMsg$macro$24 = evidence$6.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$6.P();
     }
-    var lhsValue$macro$27 = evidence$6.E;
+    var lhsValue$macro$27 = evidence$6.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
       if (((!evidence$6.d) && evidence$6.p)) {
@@ -478,18 +478,18 @@ $p.awu = (function(evidence$6) {
       } else {
         var preRhsIndex$macro$19 = evidence$6.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$6);
-        var rhsAggregate$macro$22 = evidence$6.s;
+        var rhsAggregate$macro$22 = evidence$6.v;
         var rhsMsg$macro$23 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$29 = evidence$6;
         } else {
           var postRhsIndex$macro$20 = evidence$6.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$6.P();
           }
-          var res$macro$29 = evidence$6.ab(x1$2.aF(lhsValue$macro$27, (evidence$6.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$6.ab(x1$2.aG(lhsValue$macro$27, (evidence$6.D | 0)), nextIndex$macro$28);
         }
         if (evidence$6.C) {
           evidence$6.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$6.S));
@@ -503,25 +503,25 @@ $p.awu = (function(evidence$6) {
   if ((!parse0$2.d)) {
     var x1$2$1 = parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.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$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$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.bj;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$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$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument) {
-    evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$6.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
     var newshortMsg = $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 < x1$2$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.s, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
     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);
     }
@@ -529,42 +529,42 @@ $p.awu = (function(evidence$6) {
   if ((!x1$2$1.d)) {
     var parse0$3 = x1$2$1;
   } else {
-    var x0$1 = x1$2$1.E;
+    var x0$1 = x1$2$1.D;
     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.D()), x0$1.z());
+    x1$2$1.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$3 = x1$2$1;
   }
   if ((!parse0$3.d)) {
     return parse0$3;
   } else {
-    var x0$2 = parse0$3.E;
+    var x0$2 = parse0$3.D;
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
-    parse0$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef(x0$2.z(), meta);
+    var meta = x0$2.E();
+    parse0$3.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef(x0$2.z(), meta);
     return parse0$3;
   }
 });
-$p.awB = (function(evidence$7) {
+$p.axO = (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$17 = evidence$7.c;
   var input$macro$26 = evidence$7.T;
-  $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$2 = evidence$7.c;
   var input$macro$11 = evidence$7.T;
-  this.aHe(evidence$7);
+  this.aIn(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)) {
@@ -572,22 +572,22 @@ $p.awB = (function(evidence$7) {
         var preRhsIndex$macro$4 = evidence$7.c;
         var input = evidence$7.T;
         var index = evidence$7.c;
-        if ((input.U(index) && (input.as.charCodeAt(index) === 58))) {
-          evidence$7.aI(((1 + index) | 0));
+        if ((input.V(index) && (input.as.charCodeAt(index) === 58))) {
+          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((() => "\":\""))));
         }
-        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);
-          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$7.P();
           }
@@ -603,31 +603,31 @@ $p.awB = (function(evidence$7) {
     var parse0$2 = 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)) {
       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)) {
         var parse0$2 = evidence$7;
       } else {
         var preRhsIndex$macro$19 = evidence$7.c;
-        this.aib(evidence$7);
-        var rhsAggregate$macro$22 = evidence$7.s;
+        this.aiO(evidence$7);
+        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.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$7.P();
           }
-          var res$macro$29 = evidence$7.ab(x1$2.aF(lhsValue$macro$27, evidence$7.E), nextIndex$macro$28);
+          var res$macro$29 = evidence$7.ab(x1$2.aG(lhsValue$macro$27, evidence$7.D), 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));
@@ -641,33 +641,33 @@ $p.awB = (function(evidence$7) {
   if ((!parse0$2.d)) {
     return parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    parse0$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField.$c_Lio_septimalmind_baboon_parser_model_RawField(x0.D(), x0.z());
+    parse0$2.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField.$c_Lio_septimalmind_baboon_parser_model_RawField(x0.E(), x0.z());
     return parse0$2;
   }
 });
-$p.aLU = (function(evidence$8) {
+$p.aN4 = (function(evidence$8) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$8.c;
   var input$macro$11 = evidence$8.T;
   var input = evidence$8.T;
   var index = evidence$8.c;
-  if ((input.U(index) && (input.as.charCodeAt(index) === 43))) {
-    evidence$8.aI(((1 + index) | 0));
+  if ((input.V(index) && (input.as.charCodeAt(index) === 43))) {
+    evidence$8.aJ(((1 + index) | 0));
   } else {
-    evidence$8.aG();
+    evidence$8.aH();
   }
   if (evidence$8.C) {
-    evidence$8.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"+\""))));
+    evidence$8.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$8.d)) {
     return evidence$8;
   } else {
     var postLhsIndex$macro$3 = evidence$8.c;
-    var lhsAggregate$macro$6 = evidence$8.s;
+    var lhsAggregate$macro$6 = evidence$8.v;
     var lhsMsg$macro$9 = evidence$8.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$8.P();
@@ -678,19 +678,19 @@ $p.aLU = (function(evidence$8) {
         return evidence$8;
       } else {
         var preRhsIndex$macro$4 = evidence$8.c;
-        this.Tz(evidence$8);
-        var rhsAggregate$macro$7 = evidence$8.s;
+        this.TV(evidence$8);
+        var rhsAggregate$macro$7 = evidence$8.v;
         var rhsMsg$macro$8 = evidence$8.F;
         if ((!evidence$8.d)) {
           var res$macro$14 = evidence$8;
         } else {
           var postRhsIndex$macro$5 = evidence$8.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$8.P();
           }
-          var res$macro$14 = evidence$8.ab(evidence$8.E, nextIndex$macro$13);
+          var res$macro$14 = evidence$8.ab(evidence$8.D, nextIndex$macro$13);
         }
         if (evidence$8.C) {
           evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
@@ -702,25 +702,25 @@ $p.aLU = (function(evidence$8) {
     }
   }
 });
-$p.aPc = (function(evidence$9) {
+$p.aQm = (function(evidence$9) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$9.c;
   var input$macro$11 = evidence$9.T;
   var input = evidence$9.T;
   var index = evidence$9.c;
-  if ((input.U(index) && (input.as.charCodeAt(index) === 45))) {
-    evidence$9.aI(((1 + index) | 0));
+  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
+    evidence$9.aJ(((1 + index) | 0));
   } else {
-    evidence$9.aG();
+    evidence$9.aH();
   }
   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((() => "\"-\""))));
+    evidence$9.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
   }
   if ((!evidence$9.d)) {
     return evidence$9;
   } else {
     var postLhsIndex$macro$3 = evidence$9.c;
-    var lhsAggregate$macro$6 = evidence$9.s;
+    var lhsAggregate$macro$6 = evidence$9.v;
     var lhsMsg$macro$9 = evidence$9.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$9.P();
@@ -731,19 +731,19 @@ $p.aPc = (function(evidence$9) {
         return evidence$9;
       } else {
         var preRhsIndex$macro$4 = evidence$9.c;
-        this.Tz(evidence$9);
-        var rhsAggregate$macro$7 = evidence$9.s;
+        this.TV(evidence$9);
+        var rhsAggregate$macro$7 = evidence$9.v;
         var rhsMsg$macro$8 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$14 = evidence$9;
         } else {
           var postRhsIndex$macro$5 = evidence$9.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$9.P();
           }
-          var res$macro$14 = evidence$9.ab(evidence$9.E, nextIndex$macro$13);
+          var res$macro$14 = evidence$9.ab(evidence$9.D, nextIndex$macro$13);
         }
         if (evidence$9.C) {
           evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$9.S));
@@ -755,25 +755,25 @@ $p.aPc = (function(evidence$9) {
     }
   }
 });
-$p.aJa = (function(evidence$10) {
+$p.aKj = (function(evidence$10) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$10.c;
   var input$macro$11 = evidence$10.T;
   var input = evidence$10.T;
   var index = evidence$10.c;
-  if ((input.U(index) && (input.as.charCodeAt(index) === 94))) {
-    evidence$10.aI(((1 + index) | 0));
+  if ((input.V(index) && (input.as.charCodeAt(index) === 94))) {
+    evidence$10.aJ(((1 + index) | 0));
   } else {
-    evidence$10.aG();
+    evidence$10.aH();
   }
   if (evidence$10.C) {
-    evidence$10.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"^\""))));
+    evidence$10.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$10.d)) {
     return evidence$10;
   } else {
     var postLhsIndex$macro$3 = evidence$10.c;
-    var lhsAggregate$macro$6 = evidence$10.s;
+    var lhsAggregate$macro$6 = evidence$10.v;
     var lhsMsg$macro$9 = evidence$10.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$10.P();
@@ -784,19 +784,19 @@ $p.aJa = (function(evidence$10) {
         return evidence$10;
       } else {
         var preRhsIndex$macro$4 = evidence$10.c;
-        this.Tz(evidence$10);
-        var rhsAggregate$macro$7 = evidence$10.s;
+        this.TV(evidence$10);
+        var rhsAggregate$macro$7 = evidence$10.v;
         var rhsMsg$macro$8 = evidence$10.F;
         if ((!evidence$10.d)) {
           var res$macro$14 = evidence$10;
         } else {
           var postRhsIndex$macro$5 = evidence$10.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$10.P();
           }
-          var res$macro$14 = evidence$10.ab(evidence$10.E, nextIndex$macro$13);
+          var res$macro$14 = evidence$10.ab(evidence$10.D, nextIndex$macro$13);
         }
         if (evidence$10.C) {
           evidence$10.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$10.S));
@@ -808,25 +808,25 @@ $p.aJa = (function(evidence$10) {
     }
   }
 });
-$p.aP8 = (function(evidence$11) {
+$p.aQi = (function(evidence$11) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$11.c;
   var input$macro$11 = evidence$11.T;
   var input = evidence$11.T;
   var index = evidence$11.c;
-  if ((input.U(index) && (input.as.charCodeAt(index) === 45))) {
-    evidence$11.aI(((1 + index) | 0));
+  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
+    evidence$11.aJ(((1 + index) | 0));
   } else {
-    evidence$11.aG();
+    evidence$11.aH();
   }
   if (evidence$11.C) {
-    evidence$11.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
+    evidence$11.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$11.d)) {
     return evidence$11;
   } else {
     var postLhsIndex$macro$3 = evidence$11.c;
-    var lhsAggregate$macro$6 = evidence$11.s;
+    var lhsAggregate$macro$6 = evidence$11.v;
     var lhsMsg$macro$9 = evidence$11.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$11.P();
@@ -837,19 +837,19 @@ $p.aP8 = (function(evidence$11) {
         return evidence$11;
       } else {
         var preRhsIndex$macro$4 = evidence$11.c;
-        this.awB(evidence$11);
-        var rhsAggregate$macro$7 = evidence$11.s;
+        this.axO(evidence$11);
+        var rhsAggregate$macro$7 = evidence$11.v;
         var rhsMsg$macro$8 = evidence$11.F;
         if ((!evidence$11.d)) {
           var res$macro$14 = evidence$11;
         } else {
           var postRhsIndex$macro$5 = evidence$11.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$11.P();
           }
-          var res$macro$14 = evidence$11.ab(evidence$11.E, nextIndex$macro$13);
+          var res$macro$14 = evidence$11.ab(evidence$11.D, nextIndex$macro$13);
         }
         if (evidence$11.C) {
           evidence$11.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$11.S));
@@ -861,7 +861,7 @@ $p.aP8 = (function(evidence$11) {
     }
   }
 });
-$p.aGy = (function(evidence$12) {
+$p.aHH = (function(evidence$12) {
   var oldCut = evidence$12.p;
   evidence$12.p = false;
   var startPos = evidence$12.c;
@@ -878,17 +878,17 @@ $p.aGy = (function(evidence$12) {
   evidence$12.p = false;
   var startPos$5 = evidence$12.c;
   var startIndex = evidence$12.c;
-  var instrument = (evidence$12.L !== null);
+  var instrument = (evidence$12.M !== null);
   if (instrument) {
-    evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex);
+    evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex);
   }
-  var this$1 = this.si;
+  var this$1 = this.sq;
   var startIndex$1 = evidence$12.c;
-  var instrument$1 = (evidence$12.L !== null);
+  var instrument$1 = (evidence$12.M !== null);
   if (instrument$1) {
-    evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$12.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$12.c;
   var input$macro$26 = evidence$12.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$());
@@ -898,30 +898,30 @@ $p.aGy = (function(evidence$12) {
   if ((!evidence$12.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$12.c;
-    var lhsAggregate$macro$6 = evidence$12.s;
+    var lhsAggregate$macro$6 = evidence$12.v;
     var lhsMsg$macro$9 = evidence$12.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$12.P();
     }
-    var lhsValue$macro$12 = evidence$12.E;
+    var lhsValue$macro$12 = evidence$12.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
     if (evidence$12.d) {
       if (((!evidence$12.d) && evidence$12.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$12.c;
-        this.awB(evidence$12);
-        var rhsAggregate$macro$7 = evidence$12.s;
+        this.axO(evidence$12);
+        var rhsAggregate$macro$7 = evidence$12.v;
         var rhsMsg$macro$8 = evidence$12.F;
         if ((!evidence$12.d)) {
           var res$macro$14 = evidence$12;
         } else {
           var postRhsIndex$macro$5 = evidence$12.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$12.P();
           }
-          var res$macro$14 = evidence$12.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$12.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$12.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$12.D), nextIndex$macro$13);
         }
         if (evidence$12.C) {
           evidence$12.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$12.S));
@@ -933,12 +933,12 @@ $p.aGy = (function(evidence$12) {
     var parse0$2 = evidence$12;
   } else {
     var postLhsIndex$macro$18 = evidence$12.c;
-    var lhsAggregate$macro$21 = evidence$12.s;
+    var lhsAggregate$macro$21 = evidence$12.v;
     var lhsMsg$macro$24 = evidence$12.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$12.P();
     }
-    var lhsValue$macro$27 = evidence$12.E;
+    var lhsValue$macro$27 = evidence$12.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
     if (evidence$12.d) {
       if (((!evidence$12.d) && evidence$12.p)) {
@@ -946,18 +946,18 @@ $p.aGy = (function(evidence$12) {
       } else {
         var preRhsIndex$macro$19 = evidence$12.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-        var rhsAggregate$macro$22 = evidence$12.s;
+        var rhsAggregate$macro$22 = evidence$12.v;
         var rhsMsg$macro$23 = evidence$12.F;
         if ((!evidence$12.d)) {
           var res$macro$29 = evidence$12;
         } else {
           var postRhsIndex$macro$20 = evidence$12.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$12.P();
           }
-          var res$macro$29 = evidence$12.ab(x1$2.aF(lhsValue$macro$27, (evidence$12.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$12.ab(x1$2.aG(lhsValue$macro$27, (evidence$12.D | 0)), nextIndex$macro$28);
         }
         if (evidence$12.C) {
           evidence$12.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$12.S));
@@ -971,25 +971,25 @@ $p.aGy = (function(evidence$12) {
   if ((!parse0$2.d)) {
     var x1$2$1 = parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.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$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$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.bj;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$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$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument$1) {
-    evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
     var newshortMsg = $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$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.s, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
     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$1), x1$2$1.Y);
     }
@@ -997,35 +997,35 @@ $p.aGy = (function(evidence$12) {
   if ((!x1$2$1.d)) {
     var x1$7 = x1$2$1;
   } else {
-    var x0$1 = x1$2$1.E;
+    var x0$1 = x1$2$1.D;
     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.D()), x0$1.z());
+    x1$2$1.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$7 = x1$2$1;
   }
   if (instrument) {
-    evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$7.c, x1$7.d);
+    evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$7.c, x1$7.d);
   }
   if (x1$7.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("dtoMember").B)));
     var forceAggregate$1 = (startIndex < x1$7.S);
-    x1$7.K(newshortMsg$1, x1$7.s, forceAggregate$1);
+    x1$7.K(newshortMsg$1, x1$7.v, forceAggregate$1);
     if ((!x1$7.d)) {
       x1$7.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("dtoMember").B, startIndex), x1$7.Y);
     }
   }
   if ((!x1$7.d)) {
   } else {
-    var x0$2 = x1$7.E;
+    var x0$2 = x1$7.D;
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
-    x1$7.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef(x0$2.z(), meta);
+    var meta = x0$2.E();
+    x1$7.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef(x0$2.z(), meta);
   }
   var lhsMsg = evidence$12.F;
-  var lhsAggregate = evidence$12.s;
+  var lhsAggregate = evidence$12.v;
   if (evidence$12.d) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$5)));
   } else if (evidence$12.p) {
@@ -1033,21 +1033,21 @@ $p.aGy = (function(evidence$12) {
     var verboseFailures = evidence$12.C;
     evidence$12.c = startPos$5;
     if (verboseFailures) {
-      evidence$12.K(lhsMsg, evidence$12.s, false);
+      evidence$12.K(lhsMsg, evidence$12.v, false);
     }
     evidence$12.p = false;
     var startIndex$2 = evidence$12.c;
-    var instrument$2 = (evidence$12.L !== null);
+    var instrument$2 = (evidence$12.M !== null);
     if (instrument$2) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
     }
-    var this$18 = this.si;
+    var this$18 = this.sq;
     var startIndex$3 = evidence$12.c;
-    var instrument$3 = (evidence$12.L !== null);
+    var instrument$3 = (evidence$12.M !== null);
     if (instrument$3) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3);
     }
-    var x1$2$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+    var x1$2$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
     var preLhsIndex$macro$17$1 = evidence$12.c;
     var input$macro$26$1 = evidence$12.T;
     var x1$4$1 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -1057,30 +1057,30 @@ $p.aGy = (function(evidence$12) {
     if ((!evidence$12.d)) {
     } else {
       var postLhsIndex$macro$3$1 = evidence$12.c;
-      var lhsAggregate$macro$6$1 = evidence$12.s;
+      var lhsAggregate$macro$6$1 = evidence$12.v;
       var lhsMsg$macro$9$1 = evidence$12.F;
       if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
         evidence$12.P();
       }
-      var lhsValue$macro$12$1 = evidence$12.E;
+      var lhsValue$macro$12$1 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
         } else {
           var preRhsIndex$macro$4$1 = evidence$12.c;
-          this.aLU(evidence$12);
-          var rhsAggregate$macro$7$1 = evidence$12.s;
+          this.aN4(evidence$12);
+          var rhsAggregate$macro$7$1 = evidence$12.v;
           var rhsMsg$macro$8$1 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$14$1 = evidence$12;
           } else {
             var postRhsIndex$macro$5$1 = evidence$12.c;
             var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$1);
-            var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$1.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$1);
+            var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$1.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$1);
             if (rhsMadeProgress$macro$10$1) {
               evidence$12.P();
             }
-            var res$macro$14$1 = evidence$12.ab(x1$4$1.aF((lhsValue$macro$12$1 | 0), evidence$12.E), nextIndex$macro$13$1);
+            var res$macro$14$1 = evidence$12.ab(x1$4$1.aG((lhsValue$macro$12$1 | 0), evidence$12.D), nextIndex$macro$13$1);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$1), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$1 === evidence$12.S));
@@ -1092,12 +1092,12 @@ $p.aGy = (function(evidence$12) {
       var parse0$6 = evidence$12;
     } else {
       var postLhsIndex$macro$18$1 = evidence$12.c;
-      var lhsAggregate$macro$21$1 = evidence$12.s;
+      var lhsAggregate$macro$21$1 = evidence$12.v;
       var lhsMsg$macro$24$1 = evidence$12.F;
       if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$1)) {
         evidence$12.P();
       }
-      var lhsValue$macro$27$1 = evidence$12.E;
+      var lhsValue$macro$27$1 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
@@ -1105,18 +1105,18 @@ $p.aGy = (function(evidence$12) {
         } else {
           var preRhsIndex$macro$19$1 = evidence$12.c;
           $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$1 = evidence$12.s;
+          var rhsAggregate$macro$22$1 = evidence$12.v;
           var rhsMsg$macro$23$1 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$29$1 = evidence$12;
           } else {
             var postRhsIndex$macro$20$1 = evidence$12.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$1.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$1.V(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
             if (rhsMadeProgress$macro$25$1) {
               evidence$12.P();
             }
-            var res$macro$29$1 = evidence$12.ab(x1$2$2.aF(lhsValue$macro$27$1, (evidence$12.E | 0)), nextIndex$macro$28$1);
+            var res$macro$29$1 = evidence$12.ab(x1$2$2.aG(lhsValue$macro$27$1, (evidence$12.D | 0)), nextIndex$macro$28$1);
           }
           if (evidence$12.C) {
             evidence$12.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$12.S));
@@ -1130,25 +1130,25 @@ $p.aGy = (function(evidence$12) {
     if ((!parse0$6.d)) {
       var x1$2$3 = parse0$6;
     } else {
-      var x0$3 = parse0$6.E;
+      var x0$3 = parse0$6.D;
       if ((x0$3 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
       }
-      var start$1 = (x0$3.aY | 0);
-      var value$1 = x0$3.bm;
-      var stop$1 = (x0$3.bs | 0);
-      var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$18.br.c8, start$1);
-      var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$18.br.c8, stop$1);
-      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$18.br.fu, begin$1, end$1), value$1);
+      var start$1 = (x0$3.aX | 0);
+      var value$1 = x0$3.bj;
+      var stop$1 = (x0$3.br | 0);
+      var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$18.bq.c7, start$1);
+      var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$18.bq.c7, stop$1);
+      parse0$6.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$18.bq.fy, begin$1, end$1), value$1);
       var x1$2$3 = parse0$6;
     }
     if (instrument$3) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+      evidence$12.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$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$3 < x1$2$3.S);
-      x1$2$3.K(newshortMsg$2, x1$2$3.s, forceAggregate$2);
+      x1$2$3.K(newshortMsg$2, x1$2$3.v, forceAggregate$2);
       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$3), x1$2$3.Y);
       }
@@ -1156,47 +1156,47 @@ $p.aGy = (function(evidence$12) {
     if ((!x1$2$3.d)) {
       var x1$10 = x1$2$3;
     } else {
-      var x0$4 = x1$2$3.E;
+      var x0$4 = x1$2$3.D;
       if ((x0$4 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$4);
       }
-      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$4.D()), x0$4.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$4.E()), x0$4.z());
       var x1$10 = x1$2$3;
     }
     if (instrument$2) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$10.c, x1$10.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$10.c, x1$10.d);
     }
     if (x1$10.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("dtoMember").B)));
       var forceAggregate$3 = (startIndex$2 < x1$10.S);
-      x1$10.K(newshortMsg$3, x1$10.s, forceAggregate$3);
+      x1$10.K(newshortMsg$3, x1$10.v, forceAggregate$3);
       if ((!x1$10.d)) {
         x1$10.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("dtoMember").B, startIndex$2), x1$10.Y);
       }
     }
     if (x1$10.d) {
-      var x0$5 = x1$10.E;
+      var x0$5 = x1$10.D;
       if ((x0$5 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$5);
       }
-      var meta$1 = x0$5.D();
-      x1$10.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef(x0$5.z(), meta$1);
+      var meta$1 = x0$5.E();
+      x1$10.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef(x0$5.z(), meta$1);
     }
     var rhsMsg = evidence$12.F;
     var rhsCut = evidence$12.p;
     var endCut = (!(!(rhsCut | oldCut$5)));
     if (((!evidence$12.d) && (!rhsCut))) {
-      evidence$12.cZ(startPos$5);
+      evidence$12.d1(startPos$5);
     }
     evidence$12.p = endCut;
     if (verboseFailures) {
       var $x_1 = lhsMsg.W(rhsMsg);
-      var rassoc$3 = evidence$12.s;
+      var rassoc$3 = evidence$12.v;
       evidence$12.K($x_1, lhsAggregate.W(rassoc$3), false);
     }
   }
   var lhsMsg$2 = evidence$12.F;
-  var lhsAggregate$2 = evidence$12.s;
+  var lhsAggregate$2 = evidence$12.v;
   if (evidence$12.d) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$4)));
   } else if (evidence$12.p) {
@@ -1204,21 +1204,21 @@ $p.aGy = (function(evidence$12) {
     var verboseFailures$2 = evidence$12.C;
     evidence$12.c = startPos$4;
     if (verboseFailures$2) {
-      evidence$12.K(lhsMsg$2, evidence$12.s, false);
+      evidence$12.K(lhsMsg$2, evidence$12.v, false);
     }
     evidence$12.p = false;
     var startIndex$3$1 = evidence$12.c;
-    var instrument$3$1 = (evidence$12.L !== null);
+    var instrument$3$1 = (evidence$12.M !== null);
     if (instrument$3$1) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
     }
-    var this$35 = this.si;
+    var this$35 = this.sq;
     var startIndex$4 = evidence$12.c;
-    var instrument$4 = (evidence$12.L !== null);
+    var instrument$4 = (evidence$12.M !== null);
     if (instrument$4) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4);
     }
-    var x1$2$4 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+    var x1$2$4 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
     var preLhsIndex$macro$17$2 = evidence$12.c;
     var input$macro$26$2 = evidence$12.T;
     var x1$4$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -1228,30 +1228,30 @@ $p.aGy = (function(evidence$12) {
     if ((!evidence$12.d)) {
     } else {
       var postLhsIndex$macro$3$2 = evidence$12.c;
-      var lhsAggregate$macro$6$2 = evidence$12.s;
+      var lhsAggregate$macro$6$2 = evidence$12.v;
       var lhsMsg$macro$9$2 = evidence$12.F;
       if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
         evidence$12.P();
       }
-      var lhsValue$macro$12$2 = evidence$12.E;
+      var lhsValue$macro$12$2 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
         } else {
           var preRhsIndex$macro$4$2 = evidence$12.c;
-          this.aP8(evidence$12);
-          var rhsAggregate$macro$7$2 = evidence$12.s;
+          this.aQi(evidence$12);
+          var rhsAggregate$macro$7$2 = evidence$12.v;
           var rhsMsg$macro$8$2 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$14$2 = evidence$12;
           } else {
             var postRhsIndex$macro$5$2 = evidence$12.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);
+            var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$2.V(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$2);
             if (rhsMadeProgress$macro$10$2) {
               evidence$12.P();
             }
-            var res$macro$14$2 = evidence$12.ab(x1$4$2.aF((lhsValue$macro$12$2 | 0), evidence$12.E), nextIndex$macro$13$2);
+            var res$macro$14$2 = evidence$12.ab(x1$4$2.aG((lhsValue$macro$12$2 | 0), evidence$12.D), nextIndex$macro$13$2);
           }
           if (evidence$12.C) {
             evidence$12.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$12.S));
@@ -1263,12 +1263,12 @@ $p.aGy = (function(evidence$12) {
       var parse0$10 = evidence$12;
     } else {
       var postLhsIndex$macro$18$2 = evidence$12.c;
-      var lhsAggregate$macro$21$2 = evidence$12.s;
+      var lhsAggregate$macro$21$2 = evidence$12.v;
       var lhsMsg$macro$24$2 = evidence$12.F;
       if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17$2)) {
         evidence$12.P();
       }
-      var lhsValue$macro$27$2 = evidence$12.E;
+      var lhsValue$macro$27$2 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
@@ -1276,18 +1276,18 @@ $p.aGy = (function(evidence$12) {
         } else {
           var preRhsIndex$macro$19$2 = evidence$12.c;
           $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$2 = evidence$12.s;
+          var rhsAggregate$macro$22$2 = evidence$12.v;
           var rhsMsg$macro$23$2 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$29$2 = evidence$12;
           } else {
             var postRhsIndex$macro$20$2 = evidence$12.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$2.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$2.V(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
             if (rhsMadeProgress$macro$25$2) {
               evidence$12.P();
             }
-            var res$macro$29$2 = evidence$12.ab(x1$2$4.aF(lhsValue$macro$27$2, (evidence$12.E | 0)), nextIndex$macro$28$2);
+            var res$macro$29$2 = evidence$12.ab(x1$2$4.aG(lhsValue$macro$27$2, (evidence$12.D | 0)), nextIndex$macro$28$2);
           }
           if (evidence$12.C) {
             evidence$12.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$12.S));
@@ -1301,25 +1301,25 @@ $p.aGy = (function(evidence$12) {
     if ((!parse0$10.d)) {
       var x1$2$5 = parse0$10;
     } else {
-      var x0$6 = parse0$10.E;
+      var x0$6 = parse0$10.D;
       if ((x0$6 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$6);
       }
-      var start$2 = (x0$6.aY | 0);
-      var value$2 = x0$6.bm;
-      var stop$2 = (x0$6.bs | 0);
-      var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$35.br.c8, start$2);
-      var end$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$35.br.c8, stop$2);
-      parse0$10.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$35.br.fu, begin$2, end$2), value$2);
+      var start$2 = (x0$6.aX | 0);
+      var value$2 = x0$6.bj;
+      var stop$2 = (x0$6.br | 0);
+      var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$35.bq.c7, start$2);
+      var end$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$35.bq.c7, stop$2);
+      parse0$10.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$35.bq.fy, begin$2, end$2), value$2);
       var x1$2$5 = parse0$10;
     }
     if (instrument$4) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$5.c, x1$2$5.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$5.c, x1$2$5.d);
     }
     if (x1$2$5.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$4 < x1$2$5.S);
-      x1$2$5.K(newshortMsg$5, x1$2$5.s, forceAggregate$4);
+      x1$2$5.K(newshortMsg$5, x1$2$5.v, forceAggregate$4);
       if ((!x1$2$5.d)) {
         x1$2$5.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$4), x1$2$5.Y);
       }
@@ -1327,47 +1327,47 @@ $p.aGy = (function(evidence$12) {
     if ((!x1$2$5.d)) {
       var x1$13 = x1$2$5;
     } else {
-      var x0$7 = x1$2$5.E;
+      var x0$7 = x1$2$5.D;
       if ((x0$7 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$7);
       }
-      x1$2$5.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$7.D()), x0$7.z());
+      x1$2$5.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$7.E()), x0$7.z());
       var x1$13 = x1$2$5;
     }
     if (instrument$3$1) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$13.c, x1$13.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$13.c, x1$13.d);
     }
     if (x1$13.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("dtoMember").B)));
       var forceAggregate$5 = (startIndex$3$1 < x1$13.S);
-      x1$13.K(newshortMsg$6, x1$13.s, forceAggregate$5);
+      x1$13.K(newshortMsg$6, x1$13.v, forceAggregate$5);
       if ((!x1$13.d)) {
         x1$13.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("dtoMember").B, startIndex$3$1), x1$13.Y);
       }
     }
     if (x1$13.d) {
-      var x0$8 = x1$13.E;
+      var x0$8 = x1$13.D;
       if ((x0$8 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$8);
       }
-      var meta$2 = x0$8.D();
-      x1$13.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef(x0$8.z(), meta$2);
+      var meta$2 = x0$8.E();
+      x1$13.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef(x0$8.z(), meta$2);
     }
     var rhsMsg$2 = evidence$12.F;
     var rhsCut$2 = evidence$12.p;
     var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
     if (((!evidence$12.d) && (!rhsCut$2))) {
-      evidence$12.cZ(startPos$4);
+      evidence$12.d1(startPos$4);
     }
     evidence$12.p = endCut$2;
     if (verboseFailures$2) {
       var $x_2 = lhsMsg$2.W(rhsMsg$2);
-      var rassoc$3$2 = evidence$12.s;
+      var rassoc$3$2 = evidence$12.v;
       evidence$12.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
     }
   }
   var lhsMsg$3 = evidence$12.F;
-  var lhsAggregate$3 = evidence$12.s;
+  var lhsAggregate$3 = evidence$12.v;
   if (evidence$12.d) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$3)));
   } else if (evidence$12.p) {
@@ -1375,21 +1375,21 @@ $p.aGy = (function(evidence$12) {
     var verboseFailures$3 = evidence$12.C;
     evidence$12.c = startPos$3;
     if (verboseFailures$3) {
-      evidence$12.K(lhsMsg$3, evidence$12.s, false);
+      evidence$12.K(lhsMsg$3, evidence$12.v, false);
     }
     evidence$12.p = false;
     var startIndex$4$1 = evidence$12.c;
-    var instrument$4$1 = (evidence$12.L !== null);
+    var instrument$4$1 = (evidence$12.M !== null);
     if (instrument$4$1) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
     }
-    var this$52 = this.si;
+    var this$52 = this.sq;
     var startIndex$5 = evidence$12.c;
-    var instrument$5 = (evidence$12.L !== null);
+    var instrument$5 = (evidence$12.M !== null);
     if (instrument$5) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5);
     }
-    var x1$2$6 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+    var x1$2$6 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
     var preLhsIndex$macro$17$3 = evidence$12.c;
     var input$macro$26$3 = evidence$12.T;
     var x1$4$3 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -1399,30 +1399,30 @@ $p.aGy = (function(evidence$12) {
     if ((!evidence$12.d)) {
     } else {
       var postLhsIndex$macro$3$3 = evidence$12.c;
-      var lhsAggregate$macro$6$3 = evidence$12.s;
+      var lhsAggregate$macro$6$3 = evidence$12.v;
       var lhsMsg$macro$9$3 = evidence$12.F;
       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
         evidence$12.P();
       }
-      var lhsValue$macro$12$3 = evidence$12.E;
+      var lhsValue$macro$12$3 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
         } else {
           var preRhsIndex$macro$4$3 = evidence$12.c;
-          this.aPc(evidence$12);
-          var rhsAggregate$macro$7$3 = evidence$12.s;
+          this.aQm(evidence$12);
+          var rhsAggregate$macro$7$3 = evidence$12.v;
           var rhsMsg$macro$8$3 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$14$3 = evidence$12;
           } else {
             var postRhsIndex$macro$5$3 = evidence$12.c;
             var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$3);
-            var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$3.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$3);
+            var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$3.V(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$3);
             if (rhsMadeProgress$macro$10$3) {
               evidence$12.P();
             }
-            var res$macro$14$3 = evidence$12.ab(x1$4$3.aF((lhsValue$macro$12$3 | 0), evidence$12.E), nextIndex$macro$13$3);
+            var res$macro$14$3 = evidence$12.ab(x1$4$3.aG((lhsValue$macro$12$3 | 0), evidence$12.D), nextIndex$macro$13$3);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$3), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$3 === evidence$12.S));
@@ -1434,12 +1434,12 @@ $p.aGy = (function(evidence$12) {
       var parse0$14 = evidence$12;
     } else {
       var postLhsIndex$macro$18$3 = evidence$12.c;
-      var lhsAggregate$macro$21$3 = evidence$12.s;
+      var lhsAggregate$macro$21$3 = evidence$12.v;
       var lhsMsg$macro$24$3 = evidence$12.F;
       if ((postLhsIndex$macro$18$3 > preLhsIndex$macro$17$3)) {
         evidence$12.P();
       }
-      var lhsValue$macro$27$3 = evidence$12.E;
+      var lhsValue$macro$27$3 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
@@ -1447,18 +1447,18 @@ $p.aGy = (function(evidence$12) {
         } else {
           var preRhsIndex$macro$19$3 = evidence$12.c;
           $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$3 = evidence$12.s;
+          var rhsAggregate$macro$22$3 = evidence$12.v;
           var rhsMsg$macro$23$3 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$29$3 = evidence$12;
           } else {
             var postRhsIndex$macro$20$3 = evidence$12.c;
             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$3.U(postRhsIndex$macro$20$3)) ? postLhsIndex$macro$18$3 : postRhsIndex$macro$20$3);
+            var nextIndex$macro$28$3 = (((!rhsMadeProgress$macro$25$3) && input$macro$26$3.V(postRhsIndex$macro$20$3)) ? postLhsIndex$macro$18$3 : postRhsIndex$macro$20$3);
             if (rhsMadeProgress$macro$25$3) {
               evidence$12.P();
             }
-            var res$macro$29$3 = evidence$12.ab(x1$2$6.aF(lhsValue$macro$27$3, (evidence$12.E | 0)), nextIndex$macro$28$3);
+            var res$macro$29$3 = evidence$12.ab(x1$2$6.aG(lhsValue$macro$27$3, (evidence$12.D | 0)), nextIndex$macro$28$3);
           }
           if (evidence$12.C) {
             evidence$12.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$12.S));
@@ -1472,25 +1472,25 @@ $p.aGy = (function(evidence$12) {
     if ((!parse0$14.d)) {
       var x1$2$7 = parse0$14;
     } else {
-      var x0$9 = parse0$14.E;
+      var x0$9 = parse0$14.D;
       if ((x0$9 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$9);
       }
-      var start$3 = (x0$9.aY | 0);
-      var value$3 = x0$9.bm;
-      var stop$3 = (x0$9.bs | 0);
-      var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$52.br.c8, start$3);
-      var end$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$52.br.c8, stop$3);
-      parse0$14.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$52.br.fu, begin$3, end$3), value$3);
+      var start$3 = (x0$9.aX | 0);
+      var value$3 = x0$9.bj;
+      var stop$3 = (x0$9.br | 0);
+      var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$52.bq.c7, start$3);
+      var end$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$52.bq.c7, stop$3);
+      parse0$14.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$52.bq.fy, begin$3, end$3), value$3);
       var x1$2$7 = parse0$14;
     }
     if (instrument$5) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$7.c, x1$2$7.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$7.c, x1$2$7.d);
     }
     if (x1$2$7.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("withMeta").B)));
       var forceAggregate$6 = (startIndex$5 < x1$2$7.S);
-      x1$2$7.K(newshortMsg$8, x1$2$7.s, forceAggregate$6);
+      x1$2$7.K(newshortMsg$8, x1$2$7.v, forceAggregate$6);
       if ((!x1$2$7.d)) {
         x1$2$7.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$5), x1$2$7.Y);
       }
@@ -1498,47 +1498,47 @@ $p.aGy = (function(evidence$12) {
     if ((!x1$2$7.d)) {
       var x1$16 = x1$2$7;
     } else {
-      var x0$10 = x1$2$7.E;
+      var x0$10 = x1$2$7.D;
       if ((x0$10 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$10);
       }
-      x1$2$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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$10.D()), x0$10.z());
+      x1$2$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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$10.E()), x0$10.z());
       var x1$16 = x1$2$7;
     }
     if (instrument$4$1) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$16.c, x1$16.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$16.c, x1$16.d);
     }
     if (x1$16.C) {
       var newshortMsg$9 = $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("dtoMember").B)));
       var forceAggregate$7 = (startIndex$4$1 < x1$16.S);
-      x1$16.K(newshortMsg$9, x1$16.s, forceAggregate$7);
+      x1$16.K(newshortMsg$9, x1$16.v, forceAggregate$7);
       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("dtoMember").B, startIndex$4$1), x1$16.Y);
       }
     }
     if (x1$16.d) {
-      var x0$11 = x1$16.E;
+      var x0$11 = x1$16.D;
       if ((x0$11 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$11);
       }
-      var meta$3 = x0$11.D();
-      x1$16.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef(x0$11.z(), meta$3);
+      var meta$3 = x0$11.E();
+      x1$16.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef(x0$11.z(), meta$3);
     }
     var rhsMsg$3 = evidence$12.F;
     var rhsCut$3 = evidence$12.p;
     var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
     if (((!evidence$12.d) && (!rhsCut$3))) {
-      evidence$12.cZ(startPos$3);
+      evidence$12.d1(startPos$3);
     }
     evidence$12.p = endCut$3;
     if (verboseFailures$3) {
       var $x_3 = lhsMsg$3.W(rhsMsg$3);
-      var rassoc$3$3 = evidence$12.s;
+      var rassoc$3$3 = evidence$12.v;
       evidence$12.K($x_3, lhsAggregate$3.W(rassoc$3$3), false);
     }
   }
   var lhsMsg$4 = evidence$12.F;
-  var lhsAggregate$4 = evidence$12.s;
+  var lhsAggregate$4 = evidence$12.v;
   if (evidence$12.d) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$2)));
   } else if (evidence$12.p) {
@@ -1546,21 +1546,21 @@ $p.aGy = (function(evidence$12) {
     var verboseFailures$4 = evidence$12.C;
     evidence$12.c = startPos$2;
     if (verboseFailures$4) {
-      evidence$12.K(lhsMsg$4, evidence$12.s, false);
+      evidence$12.K(lhsMsg$4, evidence$12.v, false);
     }
     evidence$12.p = false;
     var startIndex$5$1 = evidence$12.c;
-    var instrument$5$1 = (evidence$12.L !== null);
+    var instrument$5$1 = (evidence$12.M !== null);
     if (instrument$5$1) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
     }
-    var this$69 = this.si;
+    var this$69 = this.sq;
     var startIndex$6 = evidence$12.c;
-    var instrument$6 = (evidence$12.L !== null);
+    var instrument$6 = (evidence$12.M !== null);
     if (instrument$6) {
-      evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6);
+      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6);
     }
-    var x1$2$8 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+    var x1$2$8 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
     var preLhsIndex$macro$17$4 = evidence$12.c;
     var input$macro$26$4 = evidence$12.T;
     var x1$4$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -1570,30 +1570,30 @@ $p.aGy = (function(evidence$12) {
     if ((!evidence$12.d)) {
     } else {
       var postLhsIndex$macro$3$4 = evidence$12.c;
-      var lhsAggregate$macro$6$4 = evidence$12.s;
+      var lhsAggregate$macro$6$4 = evidence$12.v;
       var lhsMsg$macro$9$4 = evidence$12.F;
       if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
         evidence$12.P();
       }
-      var lhsValue$macro$12$4 = evidence$12.E;
+      var lhsValue$macro$12$4 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
         } else {
           var preRhsIndex$macro$4$4 = evidence$12.c;
-          this.aJa(evidence$12);
-          var rhsAggregate$macro$7$4 = evidence$12.s;
+          this.aKj(evidence$12);
+          var rhsAggregate$macro$7$4 = evidence$12.v;
           var rhsMsg$macro$8$4 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$14$4 = evidence$12;
           } else {
             var postRhsIndex$macro$5$4 = evidence$12.c;
             var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$4);
-            var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$4.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$4);
+            var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$4.V(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$4);
             if (rhsMadeProgress$macro$10$4) {
               evidence$12.P();
             }
-            var res$macro$14$4 = evidence$12.ab(x1$4$4.aF((lhsValue$macro$12$4 | 0), evidence$12.E), nextIndex$macro$13$4);
+            var res$macro$14$4 = evidence$12.ab(x1$4$4.aG((lhsValue$macro$12$4 | 0), evidence$12.D), nextIndex$macro$13$4);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$4), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$4 === evidence$12.S));
@@ -1605,12 +1605,12 @@ $p.aGy = (function(evidence$12) {
       var parse0$18 = evidence$12;
     } else {
       var postLhsIndex$macro$18$4 = evidence$12.c;
-      var lhsAggregate$macro$21$4 = evidence$12.s;
+      var lhsAggregate$macro$21$4 = evidence$12.v;
       var lhsMsg$macro$24$4 = evidence$12.F;
       if ((postLhsIndex$macro$18$4 > preLhsIndex$macro$17$4)) {
         evidence$12.P();
       }
-      var lhsValue$macro$27$4 = evidence$12.E;
+      var lhsValue$macro$27$4 = evidence$12.D;
       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
@@ -1618,18 +1618,18 @@ $p.aGy = (function(evidence$12) {
         } else {
           var preRhsIndex$macro$19$4 = evidence$12.c;
           $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$4 = evidence$12.s;
+          var rhsAggregate$macro$22$4 = evidence$12.v;
           var rhsMsg$macro$23$4 = evidence$12.F;
           if ((!evidence$12.d)) {
             var res$macro$29$4 = evidence$12;
           } else {
             var postRhsIndex$macro$20$4 = evidence$12.c;
             var rhsMadeProgress$macro$25$4 = (postRhsIndex$macro$20$4 > preRhsIndex$macro$19$4);
-            var nextIndex$macro$28$4 = (((!rhsMadeProgress$macro$25$4) && input$macro$26$4.U(postRhsIndex$macro$20$4)) ? postLhsIndex$macro$18$4 : postRhsIndex$macro$20$4);
+            var nextIndex$macro$28$4 = (((!rhsMadeProgress$macro$25$4) && input$macro$26$4.V(postRhsIndex$macro$20$4)) ? postLhsIndex$macro$18$4 : postRhsIndex$macro$20$4);
             if (rhsMadeProgress$macro$25$4) {
               evidence$12.P();
             }
-            var res$macro$29$4 = evidence$12.ab(x1$2$8.aF(lhsValue$macro$27$4, (evidence$12.E | 0)), nextIndex$macro$28$4);
+            var res$macro$29$4 = evidence$12.ab(x1$2$8.aG(lhsValue$macro$27$4, (evidence$12.D | 0)), nextIndex$macro$28$4);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$4, rhsMsg$macro$23$4), lhsAggregate$macro$21$4.W(rhsAggregate$macro$22$4), (preRhsIndex$macro$19$4 === evidence$12.S));
@@ -1643,25 +1643,25 @@ $p.aGy = (function(evidence$12) {
     if ((!parse0$18.d)) {
       var x1$2$9 = parse0$18;
     } else {
-      var x0$12 = parse0$18.E;
+      var x0$12 = parse0$18.D;
       if ((x0$12 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$12);
       }
-      var start$4 = (x0$12.aY | 0);
-      var value$4 = x0$12.bm;
-      var stop$4 = (x0$12.bs | 0);
-      var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$69.br.c8, start$4);
-      var end$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$69.br.c8, stop$4);
-      parse0$18.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$69.br.fu, begin$4, end$4), value$4);
+      var start$4 = (x0$12.aX | 0);
+      var value$4 = x0$12.bj;
+      var stop$4 = (x0$12.br | 0);
+      var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$69.bq.c7, start$4);
+      var end$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$69.bq.c7, stop$4);
+      parse0$18.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$69.bq.fy, begin$4, end$4), value$4);
       var x1$2$9 = parse0$18;
     }
     if (instrument$6) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$9.c, x1$2$9.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$9.c, x1$2$9.d);
     }
     if (x1$2$9.C) {
       var newshortMsg$11 = $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$8 = (startIndex$6 < x1$2$9.S);
-      x1$2$9.K(newshortMsg$11, x1$2$9.s, forceAggregate$8);
+      x1$2$9.K(newshortMsg$11, x1$2$9.v, forceAggregate$8);
       if ((!x1$2$9.d)) {
         x1$2$9.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$6), x1$2$9.Y);
       }
@@ -1669,47 +1669,47 @@ $p.aGy = (function(evidence$12) {
     if ((!x1$2$9.d)) {
       var x1$19 = x1$2$9;
     } else {
-      var x0$13 = x1$2$9.E;
+      var x0$13 = x1$2$9.D;
       if ((x0$13 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$13);
       }
-      x1$2$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$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$13.D()), x0$13.z());
+      x1$2$9.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$13.E()), x0$13.z());
       var x1$19 = x1$2$9;
     }
     if (instrument$5$1) {
-      evidence$12.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$19.c, x1$19.d);
+      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$19.c, x1$19.d);
     }
     if (x1$19.C) {
       var newshortMsg$12 = $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("dtoMember").B)));
       var forceAggregate$9 = (startIndex$5$1 < x1$19.S);
-      x1$19.K(newshortMsg$12, x1$19.s, forceAggregate$9);
+      x1$19.K(newshortMsg$12, x1$19.v, forceAggregate$9);
       if ((!x1$19.d)) {
         x1$19.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("dtoMember").B, startIndex$5$1), x1$19.Y);
       }
     }
     if (x1$19.d) {
-      var x0$14 = x1$19.E;
+      var x0$14 = x1$19.D;
       if ((x0$14 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$14);
       }
-      var meta$4 = x0$14.D();
-      x1$19.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef(x0$14.z(), meta$4);
+      var meta$4 = x0$14.E();
+      x1$19.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef(x0$14.z(), meta$4);
     }
     var rhsMsg$4 = evidence$12.F;
     var rhsCut$4 = evidence$12.p;
     var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
     if (((!evidence$12.d) && (!rhsCut$4))) {
-      evidence$12.cZ(startPos$2);
+      evidence$12.d1(startPos$2);
     }
     evidence$12.p = endCut$4;
     if (verboseFailures$4) {
       var $x_4 = lhsMsg$4.W(rhsMsg$4);
-      var rassoc$3$4 = evidence$12.s;
+      var rassoc$3$4 = evidence$12.v;
       evidence$12.K($x_4, lhsAggregate$4.W(rassoc$3$4), false);
     }
   }
   var lhsMsg$5 = evidence$12.F;
-  var lhsAggregate$5 = evidence$12.s;
+  var lhsAggregate$5 = evidence$12.v;
   if (evidence$12.d) {
     evidence$12.p = (!(!(evidence$12.p | oldCut)));
     return evidence$12;
@@ -1719,32 +1719,32 @@ $p.aGy = (function(evidence$12) {
     var verboseFailures$5 = evidence$12.C;
     evidence$12.c = startPos;
     if (verboseFailures$5) {
-      evidence$12.K(lhsMsg$5, evidence$12.s, false);
+      evidence$12.K(lhsMsg$5, evidence$12.v, false);
     }
     evidence$12.p = false;
-    this.awu(evidence$12);
+    this.axH(evidence$12);
     var rhsMsg$5 = evidence$12.F;
     var rhsCut$5 = evidence$12.p;
     var endCut$5 = (!(!(rhsCut$5 | oldCut)));
     if (((!evidence$12.d) && (!rhsCut$5))) {
-      evidence$12.cZ(startPos);
+      evidence$12.d1(startPos);
     }
     evidence$12.p = endCut$5;
     if (verboseFailures$5) {
       var $x_5 = lhsMsg$5.W(rhsMsg$5);
-      var rassoc$3$5 = evidence$12.s;
+      var rassoc$3$5 = evidence$12.v;
       evidence$12.K($x_5, lhsAggregate$5.W(rassoc$3$5), false);
     }
     return evidence$12;
   }
 });
-$p.a0p = (function(evidence$13) {
+$p.a0L = (function(evidence$13) {
   var startIndex = evidence$13.c;
-  var instrument = (evidence$13.L !== null);
+  var instrument = (evidence$13.M !== null);
   if (instrument) {
-    evidence$13.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, startIndex);
+    evidence$13.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").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();
@@ -1757,26 +1757,26 @@ $p.a0p = (function(evidence$13) {
   var x1$2;
   while (true) {
     evidence$13.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aGy(evidence$13);
+    this.aHH(evidence$13);
     var parsedMsg = evidence$13.F;
-    var parsedAgg = evidence$13.s;
+    var parsedAgg = evidence$13.v;
     var postCut = evidence$13.p;
     var verboseFailures = evidence$13.C;
     if ((!evidence$13.d)) {
       var res = (postCut ? evidence$13 : $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$13, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$13, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$1, 0, evidence$13, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       var x1$2 = res;
       break;
     } else {
       var beforeSepIndex = evidence$13.c;
-      acc.am(evidence$13.E);
+      acc.am(evidence$13.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$13, repeater, acc);
         if (verboseFailures) {
-          evidence$13.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$13.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;
@@ -1799,31 +1799,31 @@ $p.a0p = (function(evidence$13) {
     }
   }
   if (instrument) {
-    evidence$13.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, x1$2.c, x1$2.d);
+    evidence$13.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").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("dto").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("dto").B, startIndex), x1$2.Y);
     }
   }
   return x1$2;
 });
-$p.afy = (function(evidence$14) {
+$p.agb = (function(evidence$14) {
   var startIndex = evidence$14.c;
-  var instrument = (evidence$14.L !== null);
+  var instrument = (evidence$14.M !== null);
   if (instrument) {
-    evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
+    evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
   }
-  var this$1 = this.si;
+  var this$1 = this.sq;
   var startIndex$1 = evidence$14.c;
-  var instrument$1 = (evidence$14.L !== null);
+  var instrument$1 = (evidence$14.M !== null);
   if (instrument$1) {
-    evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$14.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$14.c;
   var input$macro$26 = evidence$14.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$());
@@ -1833,21 +1833,21 @@ $p.afy = (function(evidence$14) {
   if ((!evidence$14.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$14.c;
-    var lhsAggregate$macro$6 = evidence$14.s;
+    var lhsAggregate$macro$6 = evidence$14.v;
     var lhsMsg$macro$9 = evidence$14.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$14.P();
     }
-    var lhsValue$macro$12 = evidence$14.E;
+    var lhsValue$macro$12 = evidence$14.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
     if (evidence$14.d) {
       if (((!evidence$14.d) && evidence$14.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$14.c;
         var startIndex$2 = evidence$14.c;
-        var instrument$2 = (evidence$14.L !== null);
+        var instrument$2 = (evidence$14.M !== null);
         if (instrument$2) {
-          evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$14.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$14.c;
@@ -1857,7 +1857,7 @@ $p.afy = (function(evidence$14) {
           var x1$4$1 = evidence$14;
         } else {
           var postLhsIndex$macro$3$1 = evidence$14.c;
-          var lhsAggregate$macro$6$1 = evidence$14.s;
+          var lhsAggregate$macro$6$1 = evidence$14.v;
           var lhsMsg$macro$9$1 = evidence$14.F;
           evidence$14.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
@@ -1875,12 +1875,12 @@ $p.afy = (function(evidence$14) {
               $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$14);
               if (evidence$14.d) {
                 var postLhsIndex$macro$3$2 = evidence$14.c;
-                var lhsAggregate$macro$6$2 = evidence$14.s;
+                var lhsAggregate$macro$6$2 = evidence$14.v;
                 var lhsMsg$macro$9$2 = evidence$14.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
                   evidence$14.P();
                 }
-                var lhsValue$macro$12$2 = evidence$14.E;
+                var lhsValue$macro$12$2 = evidence$14.D;
                 $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
                 if (evidence$14.d) {
                   if ((!((!evidence$14.d) && evidence$14.p))) {
@@ -1888,34 +1888,34 @@ $p.afy = (function(evidence$14) {
                     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$14.c;
                     var input$macro$11$3 = evidence$14.T;
-                    this.si.a0m(evidence$14);
+                    this.sq.a0I(evidence$14);
                     if (evidence$14.d) {
                       var postLhsIndex$macro$3$3 = evidence$14.c;
-                      var lhsAggregate$macro$6$3 = evidence$14.s;
+                      var lhsAggregate$macro$6$3 = evidence$14.v;
                       var lhsMsg$macro$9$3 = evidence$14.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$14.P();
                       }
-                      var lhsValue$macro$12$3 = evidence$14.E;
+                      var lhsValue$macro$12$3 = evidence$14.D;
                       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
                       if (evidence$14.d) {
                         if ((!((!evidence$14.d) && evidence$14.p))) {
                           var preRhsIndex$macro$4$3 = evidence$14.c;
-                          var f = (() => this.a0p(evidence$14));
+                          var f = (() => this.a0L(evidence$14));
                           var startIndex$3 = evidence$14.c;
-                          var instrument$3 = (evidence$14.L !== null);
+                          var instrument$3 = (evidence$14.M !== null);
                           if (instrument$3) {
-                            evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
+                            evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                           }
                           var oldCut = evidence$14.p;
                           evidence$14.p = false;
                           var startPos = evidence$14.c;
                           var startIndex$4 = evidence$14.c;
-                          var instrument$4 = (evidence$14.L !== null);
+                          var instrument$4 = (evidence$14.M !== null);
                           if (instrument$4) {
-                            evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
+                            evidence$14.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$14.c;
                           var input$macro$26$1 = evidence$14.T;
                           $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -1923,18 +1923,18 @@ $p.afy = (function(evidence$14) {
                           var input$macro$11$4 = evidence$14.T;
                           var input = evidence$14.T;
                           var index = evidence$14.c;
-                          if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                            evidence$14.aI(((1 + index) | 0));
+                          if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
+                            evidence$14.aJ(((1 + index) | 0));
                           } else {
-                            evidence$14.aG();
+                            evidence$14.aH();
                           }
                           if (evidence$14.C) {
-                            evidence$14.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                            evidence$14.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$14.d)) {
                           } else {
                             var postLhsIndex$macro$3$4 = evidence$14.c;
-                            var lhsAggregate$macro$6$4 = evidence$14.s;
+                            var lhsAggregate$macro$6$4 = evidence$14.v;
                             var lhsMsg$macro$9$4 = evidence$14.F;
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                               evidence$14.P();
@@ -1945,18 +1945,18 @@ $p.afy = (function(evidence$14) {
                               } else {
                                 var preRhsIndex$macro$4$4 = evidence$14.c;
                                 f();
-                                var rhsAggregate$macro$7 = evidence$14.s;
+                                var rhsAggregate$macro$7 = evidence$14.v;
                                 var rhsMsg$macro$8 = evidence$14.F;
                                 if ((!evidence$14.d)) {
                                   var res$macro$14 = evidence$14;
                                 } else {
                                   var postRhsIndex$macro$5 = evidence$14.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$14.P();
                                   }
-                                  var res$macro$14 = evidence$14.ab(evidence$14.E, nextIndex$macro$13);
+                                  var res$macro$14 = evidence$14.ab(evidence$14.D, nextIndex$macro$13);
                                 }
                                 if (evidence$14.C) {
                                   evidence$14.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$14.S));
@@ -1968,12 +1968,12 @@ $p.afy = (function(evidence$14) {
                             var x1$8 = evidence$14;
                           } else {
                             var postLhsIndex$macro$18 = evidence$14.c;
-                            var lhsAggregate$macro$21 = evidence$14.s;
+                            var lhsAggregate$macro$21 = evidence$14.v;
                             var lhsMsg$macro$24 = evidence$14.F;
                             if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
                               evidence$14.P();
                             }
-                            var lhsValue$macro$27 = evidence$14.E;
+                            var lhsValue$macro$27 = evidence$14.D;
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
                             if (evidence$14.d) {
                               if (((!evidence$14.d) && evidence$14.p)) {
@@ -1982,22 +1982,22 @@ $p.afy = (function(evidence$14) {
                                 var preRhsIndex$macro$19 = evidence$14.c;
                                 var input$2 = evidence$14.T;
                                 var index$2 = evidence$14.c;
-                                if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                                  evidence$14.aI(((1 + index$2) | 0));
+                                if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
+                                  evidence$14.aJ(((1 + index$2) | 0));
                                 } else {
-                                  evidence$14.aG();
+                                  evidence$14.aH();
                                 }
                                 if (evidence$14.C) {
-                                  evidence$14.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$14.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$14.s;
+                                var rhsAggregate$macro$22 = evidence$14.v;
                                 var rhsMsg$macro$23 = evidence$14.F;
                                 if ((!evidence$14.d)) {
                                   var res$macro$29 = evidence$14;
                                 } else {
                                   var postRhsIndex$macro$20 = evidence$14.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$14.P();
                                   }
@@ -2013,18 +2013,18 @@ $p.afy = (function(evidence$14) {
                             }
                           }
                           if (instrument$4) {
-                            evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
+                            evidence$14.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$14.F;
-                          var lhsAggregate = evidence$14.s;
+                          var lhsAggregate = evidence$14.v;
                           if (evidence$14.d) {
                             evidence$14.p = (!(!(evidence$14.p | oldCut)));
                             var x1$3$3 = evidence$14;
@@ -2034,15 +2034,15 @@ $p.afy = (function(evidence$14) {
                             var verboseFailures = evidence$14.C;
                             evidence$14.c = startPos;
                             if (verboseFailures) {
-                              evidence$14.K(lhsMsg, evidence$14.s, false);
+                              evidence$14.K(lhsMsg, evidence$14.v, false);
                             }
                             evidence$14.p = false;
                             var startIndex$5 = evidence$14.c;
-                            var instrument$5 = (evidence$14.L !== null);
+                            var instrument$5 = (evidence$14.M !== null);
                             if (instrument$5) {
-                              evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
+                              evidence$14.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$14.c;
                             var input$macro$26$2 = evidence$14.T;
                             $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -2050,18 +2050,18 @@ $p.afy = (function(evidence$14) {
                             var input$macro$11$5 = evidence$14.T;
                             var input$1 = evidence$14.T;
                             var index$1 = evidence$14.c;
-                            if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                              evidence$14.aI(((1 + index$1) | 0));
+                            if ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
+                              evidence$14.aJ(((1 + index$1) | 0));
                             } else {
-                              evidence$14.aG();
+                              evidence$14.aH();
                             }
                             if (evidence$14.C) {
-                              evidence$14.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$14.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$14.d)) {
                             } else {
                               var postLhsIndex$macro$3$5 = evidence$14.c;
-                              var lhsAggregate$macro$6$5 = evidence$14.s;
+                              var lhsAggregate$macro$6$5 = evidence$14.v;
                               var lhsMsg$macro$9$5 = evidence$14.F;
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
                                 evidence$14.P();
@@ -2072,18 +2072,18 @@ $p.afy = (function(evidence$14) {
                                 } else {
                                   var preRhsIndex$macro$4$5 = evidence$14.c;
                                   f();
-                                  var rhsAggregate$macro$7$1 = evidence$14.s;
+                                  var rhsAggregate$macro$7$1 = evidence$14.v;
                                   var rhsMsg$macro$8$1 = evidence$14.F;
                                   if ((!evidence$14.d)) {
                                     var res$macro$14$1 = evidence$14;
                                   } else {
                                     var postRhsIndex$macro$5$1 = evidence$14.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$14.P();
                                     }
-                                    var res$macro$14$1 = evidence$14.ab(evidence$14.E, nextIndex$macro$13$1);
+                                    var res$macro$14$1 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$1);
                                   }
                                   if (evidence$14.C) {
                                     evidence$14.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$14.S));
@@ -2095,12 +2095,12 @@ $p.afy = (function(evidence$14) {
                               var x1$8$1 = evidence$14;
                             } else {
                               var postLhsIndex$macro$18$1 = evidence$14.c;
-                              var lhsAggregate$macro$21$1 = evidence$14.s;
+                              var lhsAggregate$macro$21$1 = evidence$14.v;
                               var lhsMsg$macro$24$1 = evidence$14.F;
                               if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
                                 evidence$14.P();
                               }
-                              var lhsValue$macro$27$1 = evidence$14.E;
+                              var lhsValue$macro$27$1 = evidence$14.D;
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
                               if (evidence$14.d) {
                                 if (((!evidence$14.d) && evidence$14.p)) {
@@ -2109,22 +2109,22 @@ $p.afy = (function(evidence$14) {
                                   var preRhsIndex$macro$19$1 = evidence$14.c;
                                   var input$2$1 = evidence$14.T;
                                   var index$2$1 = evidence$14.c;
-                                  if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                                    evidence$14.aI(((1 + index$2$1) | 0));
+                                  if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
+                                    evidence$14.aJ(((1 + index$2$1) | 0));
                                   } else {
-                                    evidence$14.aG();
+                                    evidence$14.aH();
                                   }
                                   if (evidence$14.C) {
-                                    evidence$14.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$14.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$14.s;
+                                  var rhsAggregate$macro$22$1 = evidence$14.v;
                                   var rhsMsg$macro$23$1 = evidence$14.F;
                                   if ((!evidence$14.d)) {
                                     var res$macro$29$1 = evidence$14;
                                   } else {
                                     var postRhsIndex$macro$20$1 = evidence$14.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$14.P();
                                     }
@@ -2140,12 +2140,12 @@ $p.afy = (function(evidence$14) {
                               }
                             }
                             if (instrument$5) {
-                              evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
+                              evidence$14.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);
                               }
@@ -2154,38 +2154,38 @@ $p.afy = (function(evidence$14) {
                             var rhsCut = evidence$14.p;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$14.d) && (!rhsCut))) {
-                              evidence$14.cZ(startPos);
+                              evidence$14.d1(startPos);
                             }
                             evidence$14.p = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
-                              var rassoc$3 = evidence$14.s;
+                              var rassoc$3 = evidence$14.v;
                               evidence$14.K($x_1, lhsAggregate.W(rassoc$3), false);
                             }
                             var x1$3$3 = evidence$14;
                           }
                           if (instrument$3) {
-                            evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
+                            evidence$14.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$14.s;
+                          var rhsAggregate$macro$7$2 = evidence$14.v;
                           var rhsMsg$macro$8$2 = evidence$14.F;
                           if ((!evidence$14.d)) {
                           } else {
                             var postRhsIndex$macro$5$2 = evidence$14.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$14.P();
                             }
-                            evidence$14.ab(x1$2$2.aF(lhsValue$macro$12$3, evidence$14.E), nextIndex$macro$13$2);
+                            evidence$14.ab(x1$2$2.aG(lhsValue$macro$12$3, evidence$14.D), nextIndex$macro$13$2);
                           }
                           if (evidence$14.C) {
                             evidence$14.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$14.S));
@@ -2193,17 +2193,17 @@ $p.afy = (function(evidence$14) {
                         }
                       }
                     }
-                    var rhsAggregate$macro$7$3 = evidence$14.s;
+                    var rhsAggregate$macro$7$3 = evidence$14.v;
                     var rhsMsg$macro$8$3 = evidence$14.F;
                     if ((!evidence$14.d)) {
                     } else {
                       var postRhsIndex$macro$5$3 = evidence$14.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$14.P();
                       }
-                      evidence$14.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$14.E), nextIndex$macro$13$3);
+                      evidence$14.ab(x1$2$1.aG(lhsValue$macro$12$2, evidence$14.D), nextIndex$macro$13$3);
                     }
                     if (evidence$14.C) {
                       evidence$14.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$14.S));
@@ -2211,7 +2211,7 @@ $p.afy = (function(evidence$14) {
                   }
                 }
               }
-              var rhsAggregate$macro$7$4 = evidence$14.s;
+              var rhsAggregate$macro$7$4 = evidence$14.v;
               var rhsMsg$macro$8$4 = evidence$14.F;
               if ((!evidence$14.d)) {
                 evidence$14.p = true;
@@ -2219,11 +2219,11 @@ $p.afy = (function(evidence$14) {
               } else {
                 var postRhsIndex$macro$5$4 = evidence$14.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$14.P();
                 }
-                var res$macro$14$4 = evidence$14.ab(evidence$14.E, nextIndex$macro$13$4);
+                var res$macro$14$4 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$4);
               }
               if (evidence$14.C) {
                 evidence$14.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$14.S));
@@ -2235,28 +2235,28 @@ $p.afy = (function(evidence$14) {
           }
         }
         if (instrument$2) {
-          evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$14.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$14.s;
+        var rhsAggregate$macro$7$5 = evidence$14.v;
         var rhsMsg$macro$8$5 = evidence$14.F;
         if ((!evidence$14.d)) {
           var res$macro$14$5 = evidence$14;
         } else {
           var postRhsIndex$macro$5$5 = evidence$14.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$14.P();
           }
-          var res$macro$14$5 = evidence$14.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$14.E), nextIndex$macro$13$5);
+          var res$macro$14$5 = evidence$14.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$14.D), nextIndex$macro$13$5);
         }
         if (evidence$14.C) {
           evidence$14.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$14.S));
@@ -2268,12 +2268,12 @@ $p.afy = (function(evidence$14) {
     var parse0$7 = evidence$14;
   } else {
     var postLhsIndex$macro$18$2 = evidence$14.c;
-    var lhsAggregate$macro$21$2 = evidence$14.s;
+    var lhsAggregate$macro$21$2 = evidence$14.v;
     var lhsMsg$macro$24$2 = evidence$14.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
       evidence$14.P();
     }
-    var lhsValue$macro$27$2 = evidence$14.E;
+    var lhsValue$macro$27$2 = evidence$14.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
     if (evidence$14.d) {
       if (((!evidence$14.d) && evidence$14.p)) {
@@ -2281,18 +2281,18 @@ $p.afy = (function(evidence$14) {
       } else {
         var preRhsIndex$macro$19$2 = evidence$14.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$14);
-        var rhsAggregate$macro$22$2 = evidence$14.s;
+        var rhsAggregate$macro$22$2 = evidence$14.v;
         var rhsMsg$macro$23$2 = evidence$14.F;
         if ((!evidence$14.d)) {
           var res$macro$29$2 = evidence$14;
         } else {
           var postRhsIndex$macro$20$2 = evidence$14.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$14.P();
           }
-          var res$macro$29$2 = evidence$14.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$14.E | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$14.ab(x1$2.aG(lhsValue$macro$27$2, (evidence$14.D | 0)), nextIndex$macro$28$2);
         }
         if (evidence$14.C) {
           evidence$14.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$14.S));
@@ -2306,25 +2306,25 @@ $p.afy = (function(evidence$14) {
   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.bj;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$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.fy, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
-    evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+    evidence$14.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);
     }
@@ -2332,39 +2332,39 @@ $p.afy = (function(evidence$14) {
   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$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, x1$2$4.c, x1$2$4.d);
+    evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").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("dtoEnclosed").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("dtoEnclosed").B, startIndex), x1$2$4.Y);
     }
@@ -2372,27 +2372,27 @@ $p.afy = (function(evidence$14) {
   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.bj;
+        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$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto(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_DefDto = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefDto, "io.septimalmind.baboon.parser.defns.DefDto", ({
-  vv: 1
+  vz: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefDto as $d_Lio_septimalmind_baboon_parser_defns_DefDto };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Dto.js.map