@7mind.io/baboon 0.0.160 → 0.0.164

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.se = null;
-  this.se = meta;
+  this.sh = null;
+  this.sh = 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,7 +49,7 @@ 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.aOH = (function(evidence$1) {
+$p.aOP = (function(evidence$1) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
@@ -63,7 +63,7 @@ $p.aOH = (function(evidence$1) {
   } else {
     evidence$1.aH();
   }
-  if (evidence$1.C) {
+  if (evidence$1.D) {
     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((() => "\"[\""))));
   }
   if ((!evidence$1.d)) {
@@ -74,7 +74,7 @@ $p.aOH = (function(evidence$1) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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)) {
       } else {
@@ -82,7 +82,7 @@ $p.aOH = (function(evidence$1) {
         var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
         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$().bQ();
+        var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
         var startIndex = evidence$1.c;
         var count = 0;
         var precut = false;
@@ -91,32 +91,32 @@ $p.aOH = (function(evidence$1) {
         var lastAgg = null;
         while (true) {
           evidence$1.p = (!(!(precut | ((count < 1) && outerCut))));
-          this.ahT(evidence$1);
+          this.ahZ(evidence$1);
           var parsedMsg = evidence$1.G;
           var parsedAgg = evidence$1.v;
           var postCut = evidence$1.p;
-          var verboseFailures = evidence$1.C;
+          var verboseFailures = evidence$1.D;
           if ((!evidence$1.d)) {
             if (postCut) {
             } 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, startIndex, startIndex, count, (!(!(outerCut | postCut))), 1, evidence$1, repeater, acc);
             }
             if (verboseFailures) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ir(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
               break;
             } else {
               break;
             }
           } else {
             var beforeSepIndex = evidence$1.c;
-            acc.am(evidence$1.E);
+            acc.al(evidence$1.E);
             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))))) {
+            if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace, evidence$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.aK(((1 + index$1) | 0)) : evidence$1.aH());
-              if (evidence$1.C) {
+              if (evidence$1.D) {
                 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((() => "\",\""))));
               }
               var sepCut = evidence$1.p;
@@ -130,7 +130,7 @@ $p.aOH = (function(evidence$1) {
                 lastAgg = parsedAgg;
               } else if (evidence$1.d) {
                 var sepMsg$2 = evidence$1.G;
-                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) && (sepCut || evidence$1.p)))))) {
+                if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace, evidence$1), (!((!evidence$1.d) && (sepCut || evidence$1.p)))))) {
                   startIndex = beforeSepIndex;
                   count = nextCount;
                   precut = sepCut;
@@ -142,12 +142,12 @@ $p.aOH = (function(evidence$1) {
                 }
               } else {
                 if (sepCut) {
-                  evidence$1.AS(beforeSepIndex, endCut);
+                  evidence$1.B7(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$().ir(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
+                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
                   break;
                 } else {
                   break;
@@ -171,8 +171,8 @@ $p.aOH = (function(evidence$1) {
           }
           var res$macro$14 = evidence$1.ab(evidence$1.E, 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));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
         }
       }
     }
@@ -187,7 +187,7 @@ $p.aOH = (function(evidence$1) {
       evidence$1.Q();
     }
     var lhsValue$macro$27 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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)) {
         var parse0$1 = evidence$1;
@@ -200,7 +200,7 @@ $p.aOH = (function(evidence$1) {
         } else {
           evidence$1.aH();
         }
-        if (evidence$1.C) {
+        if (evidence$1.D) {
           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((() => "\"]\""))));
         }
         var rhsAggregate$macro$22 = evidence$1.v;
@@ -216,8 +216,8 @@ $p.aOH = (function(evidence$1) {
           }
           var res$macro$29 = evidence$1.ab(lhsValue$macro$27, nextIndex$macro$28);
         }
-        if (evidence$1.C) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
         }
         var parse0$1 = res$macro$29;
       }
@@ -230,28 +230,28 @@ $p.aOH = (function(evidence$1) {
   } else {
     var x0 = parse0$1.E;
     var list = x0.aB();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().ek((!list.l()));
+    $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);
     return parse0$1;
   }
 });
-$p.Tj = (function(evidence$2) {
+$p.Tr = (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.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)))).aB();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().ek((!list.l()));
+    $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);
     return parse0;
   }
 });
-$p.ahT = (function(evidence$3) {
+$p.ahZ = (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.Tj(evidence$3);
+  this.Tr(evidence$3);
   if ((!evidence$3.d)) {
     var parse0$2 = evidence$3;
   } else {
@@ -262,31 +262,31 @@ $p.ahT = (function(evidence$3) {
       evidence$3.Q();
     }
     var lhsValue$macro$12 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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$().Ay();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
         var startPos = evidence$3.c;
         var startCut = evidence$3.p;
         evidence$3.p = false;
-        this.aOH(evidence$3);
+        this.aOP(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.aA))));
+          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.az))));
           res.p = (!(!(res.p | startCut)));
         } else if (evidence$3.p) {
         } else {
           var res$2 = evidence$3.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
           res$2.p = (!(!(res$2.p | startCut)));
         }
-        if (evidence$3.C) {
+        if (evidence$3.D) {
           var msg = evidence$3.G;
           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$().fD(msg.dB) + ".?")))), evidence$3.v, 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$().fD(msg.dC) + ".?")))), evidence$3.v, false);
           }
         }
         var rhsAggregate$macro$7 = evidence$3.v;
@@ -300,10 +300,10 @@ $p.ahT = (function(evidence$3) {
           if (rhsMadeProgress$macro$10) {
             evidence$3.Q();
           }
-          var res$macro$14 = evidence$3.ab(x1$2.aD(lhsValue$macro$12, evidence$3.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$3.ab(x1$2.aF(lhsValue$macro$12, evidence$3.E), 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));
+        if (evidence$3.D) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$3.S));
         }
         var parse0$2 = res$macro$14;
       }
@@ -318,12 +318,12 @@ $p.ahT = (function(evidence$3) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var ref = x0.D();
+    var ref = x0.C();
     var params = x0.z();
-    var name = ref.qG.bm().hr;
-    var prefix = ref.qG.fZ();
+    var name = ref.qJ.bm().hs;
+    var prefix = ref.qJ.fZ();
     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.ah.aA, prefix);
+      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.ai.az, prefix);
     } else {
       if (($j_java$002elang$002e$002dObject.$m_s_None$() !== params)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(params);
@@ -334,7 +334,7 @@ $p.ahT = (function(evidence$3) {
     return parse0$2;
   }
 });
-$p.aGP = (function(evidence$4) {
+$p.aH0 = (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;
@@ -343,7 +343,7 @@ $p.aGP = (function(evidence$4) {
     return parse0;
   }
 });
-$p.aFn = (function(evidence$5) {
+$p.aFz = (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;
@@ -365,7 +365,7 @@ $p.aFn = (function(evidence$5) {
   } else {
     evidence$5.aH();
   }
-  if (evidence$5.C) {
+  if (evidence$5.D) {
     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\""))));
   }
   if ((!evidence$5.d)) {
@@ -377,13 +377,13 @@ $p.aFn = (function(evidence$5) {
     if ((postLhsIndex$macro$5 > preLhsIndex$macro$4)) {
       evidence$5.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
         var parse0 = evidence$5;
       } else {
         var preRhsIndex$macro$6 = evidence$5.c;
-        this.Tj(evidence$5);
+        this.Tr(evidence$5);
         var rhsAggregate$macro$9 = evidence$5.v;
         var rhsMsg$macro$10 = evidence$5.G;
         if ((!evidence$5.d)) {
@@ -397,8 +397,8 @@ $p.aFn = (function(evidence$5) {
           }
           var res$macro$16 = evidence$5.ab(evidence$5.E, 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));
+        if (evidence$5.D) {
+          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$11, rhsMsg$macro$10), lhsAggregate$macro$8.W(rhsAggregate$macro$9), (preRhsIndex$macro$6 === evidence$5.S));
         }
         var parse0 = res$macro$16;
       }
@@ -413,8 +413,8 @@ $p.aFn = (function(evidence$5) {
     return parse0;
   }
 });
-$p.aw7 = (function(evidence$6) {
-  var this$1 = this.se;
+$p.awh = (function(evidence$6) {
+  var this$1 = this.sh;
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.L !== null);
   if (instrument) {
@@ -436,12 +436,12 @@ $p.aw7 = (function(evidence$6) {
       evidence$6.Q();
     }
     var lhsValue$macro$12 = evidence$6.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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);
+        this.aFz(evidence$6);
         var rhsAggregate$macro$7 = evidence$6.v;
         var rhsMsg$macro$8 = evidence$6.G;
         if ((!evidence$6.d)) {
@@ -453,10 +453,10 @@ $p.aw7 = (function(evidence$6) {
           if (rhsMadeProgress$macro$10) {
             evidence$6.Q();
           }
-          var res$macro$14 = evidence$6.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$6.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$6.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$6.E), 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));
+        if (evidence$6.D) {
+          evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
         }
       }
     }
@@ -471,7 +471,7 @@ $p.aw7 = (function(evidence$6) {
       evidence$6.Q();
     }
     var lhsValue$macro$27 = evidence$6.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
       if (((!evidence$6.d) && evidence$6.p)) {
         var parse0$2 = evidence$6;
@@ -489,10 +489,10 @@ $p.aw7 = (function(evidence$6) {
           if (rhsMadeProgress$macro$25) {
             evidence$6.Q();
           }
-          var res$macro$29 = evidence$6.ab(x1$2.aD(lhsValue$macro$27, (evidence$6.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$6.ab(x1$2.aF(lhsValue$macro$27, (evidence$6.E | 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));
+        if (evidence$6.D) {
+          evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$6.S));
         }
         var parse0$2 = res$macro$29;
       }
@@ -508,17 +508,17 @@ $p.aw7 = (function(evidence$6) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, 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.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$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.bq.ft, 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);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     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.v, forceAggregate);
@@ -533,7 +533,7 @@ $p.aw7 = (function(evidence$6) {
     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.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$3 = x1$2$1;
   }
   if ((!parse0$3.d)) {
@@ -543,19 +543,19 @@ $p.aw7 = (function(evidence$6) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
+    var meta = x0$2.C();
     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);
     return parse0$3;
   }
 });
-$p.awf = (function(evidence$7) {
+$p.awo = (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$().eN();
   var preLhsIndex$macro$2 = evidence$7.c;
   var input$macro$11 = evidence$7.T;
-  this.aGP(evidence$7);
+  this.aH0(evidence$7);
   if ((!evidence$7.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$7.c;
@@ -565,7 +565,7 @@ $p.awf = (function(evidence$7) {
       evidence$7.Q();
     }
     var lhsValue$macro$12 = evidence$7.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
       if (((!evidence$7.d) && evidence$7.p)) {
       } else {
@@ -577,7 +577,7 @@ $p.awf = (function(evidence$7) {
         } else {
           evidence$7.aH();
         }
-        if (evidence$7.C) {
+        if (evidence$7.D) {
           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((() => "\":\""))));
         }
         var rhsAggregate$macro$7 = evidence$7.v;
@@ -593,8 +593,8 @@ $p.awf = (function(evidence$7) {
           }
           var res$macro$14 = evidence$7.ab(lhsValue$macro$12, nextIndex$macro$13);
         }
-        if (evidence$7.C) {
-          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
+        if (evidence$7.D) {
+          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
         }
       }
     }
@@ -609,13 +609,13 @@ $p.awf = (function(evidence$7) {
       evidence$7.Q();
     }
     var lhsValue$macro$27 = evidence$7.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.ahT(evidence$7);
+        this.ahZ(evidence$7);
         var rhsAggregate$macro$22 = evidence$7.v;
         var rhsMsg$macro$23 = evidence$7.G;
         if ((!evidence$7.d)) {
@@ -627,10 +627,10 @@ $p.awf = (function(evidence$7) {
           if (rhsMadeProgress$macro$25) {
             evidence$7.Q();
           }
-          var res$macro$29 = evidence$7.ab(x1$2.aD(lhsValue$macro$27, evidence$7.E), nextIndex$macro$28);
+          var res$macro$29 = evidence$7.ab(x1$2.aF(lhsValue$macro$27, evidence$7.E), 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));
+        if (evidence$7.D) {
+          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$7.S));
         }
         var parse0$2 = res$macro$29;
       }
@@ -645,11 +645,11 @@ $p.awf = (function(evidence$7) {
     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.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField.$c_Lio_septimalmind_baboon_parser_model_RawField(x0.C(), x0.z());
     return parse0$2;
   }
 });
-$p.aLt = (function(evidence$8) {
+$p.aLF = (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;
@@ -660,7 +660,7 @@ $p.aLt = (function(evidence$8) {
   } else {
     evidence$8.aH();
   }
-  if (evidence$8.C) {
+  if (evidence$8.D) {
     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((() => "\"+\""))));
   }
   if ((!evidence$8.d)) {
@@ -672,13 +672,13 @@ $p.aLt = (function(evidence$8) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$8.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
       if (((!evidence$8.d) && evidence$8.p)) {
         return evidence$8;
       } else {
         var preRhsIndex$macro$4 = evidence$8.c;
-        this.Tj(evidence$8);
+        this.Tr(evidence$8);
         var rhsAggregate$macro$7 = evidence$8.v;
         var rhsMsg$macro$8 = evidence$8.G;
         if ((!evidence$8.d)) {
@@ -692,8 +692,8 @@ $p.aLt = (function(evidence$8) {
           }
           var res$macro$14 = evidence$8.ab(evidence$8.E, 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));
+        if (evidence$8.D) {
+          evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
         }
         return res$macro$14;
       }
@@ -702,7 +702,7 @@ $p.aLt = (function(evidence$8) {
     }
   }
 });
-$p.aOP = (function(evidence$9) {
+$p.aOX = (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;
@@ -713,7 +713,7 @@ $p.aOP = (function(evidence$9) {
   } else {
     evidence$9.aH();
   }
-  if (evidence$9.C) {
+  if (evidence$9.D) {
     evidence$9.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
   }
   if ((!evidence$9.d)) {
@@ -725,13 +725,13 @@ $p.aOP = (function(evidence$9) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$9.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
       if (((!evidence$9.d) && evidence$9.p)) {
         return evidence$9;
       } else {
         var preRhsIndex$macro$4 = evidence$9.c;
-        this.Tj(evidence$9);
+        this.Tr(evidence$9);
         var rhsAggregate$macro$7 = evidence$9.v;
         var rhsMsg$macro$8 = evidence$9.G;
         if ((!evidence$9.d)) {
@@ -745,8 +745,8 @@ $p.aOP = (function(evidence$9) {
           }
           var res$macro$14 = evidence$9.ab(evidence$9.E, 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));
+        if (evidence$9.D) {
+          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$9.S));
         }
         return res$macro$14;
       }
@@ -755,7 +755,7 @@ $p.aOP = (function(evidence$9) {
     }
   }
 });
-$p.aIL = (function(evidence$10) {
+$p.aIW = (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;
@@ -766,7 +766,7 @@ $p.aIL = (function(evidence$10) {
   } else {
     evidence$10.aH();
   }
-  if (evidence$10.C) {
+  if (evidence$10.D) {
     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((() => "\"^\""))));
   }
   if ((!evidence$10.d)) {
@@ -778,13 +778,13 @@ $p.aIL = (function(evidence$10) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$10.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$10);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$10);
     if (evidence$10.d) {
       if (((!evidence$10.d) && evidence$10.p)) {
         return evidence$10;
       } else {
         var preRhsIndex$macro$4 = evidence$10.c;
-        this.Tj(evidence$10);
+        this.Tr(evidence$10);
         var rhsAggregate$macro$7 = evidence$10.v;
         var rhsMsg$macro$8 = evidence$10.G;
         if ((!evidence$10.d)) {
@@ -798,8 +798,8 @@ $p.aIL = (function(evidence$10) {
           }
           var res$macro$14 = evidence$10.ab(evidence$10.E, 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));
+        if (evidence$10.D) {
+          evidence$10.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$10.S));
         }
         return res$macro$14;
       }
@@ -808,7 +808,7 @@ $p.aIL = (function(evidence$10) {
     }
   }
 });
-$p.aOL = (function(evidence$11) {
+$p.aOT = (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;
@@ -819,7 +819,7 @@ $p.aOL = (function(evidence$11) {
   } else {
     evidence$11.aH();
   }
-  if (evidence$11.C) {
+  if (evidence$11.D) {
     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((() => "\"-\""))));
   }
   if ((!evidence$11.d)) {
@@ -831,13 +831,13 @@ $p.aOL = (function(evidence$11) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$11.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$11);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$11);
     if (evidence$11.d) {
       if (((!evidence$11.d) && evidence$11.p)) {
         return evidence$11;
       } else {
         var preRhsIndex$macro$4 = evidence$11.c;
-        this.awf(evidence$11);
+        this.awo(evidence$11);
         var rhsAggregate$macro$7 = evidence$11.v;
         var rhsMsg$macro$8 = evidence$11.G;
         if ((!evidence$11.d)) {
@@ -851,8 +851,8 @@ $p.aOL = (function(evidence$11) {
           }
           var res$macro$14 = evidence$11.ab(evidence$11.E, 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));
+        if (evidence$11.D) {
+          evidence$11.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$11.S));
         }
         return res$macro$14;
       }
@@ -861,7 +861,7 @@ $p.aOL = (function(evidence$11) {
     }
   }
 });
-$p.aG8 = (function(evidence$12) {
+$p.aGk = (function(evidence$12) {
   var oldCut = evidence$12.p;
   evidence$12.p = false;
   var startPos = evidence$12.c;
@@ -882,7 +882,7 @@ $p.aG8 = (function(evidence$12) {
   if (instrument) {
     evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex);
   }
-  var this$1 = this.se;
+  var this$1 = this.sh;
   var startIndex$1 = evidence$12.c;
   var instrument$1 = (evidence$12.L !== null);
   if (instrument$1) {
@@ -904,12 +904,12 @@ $p.aG8 = (function(evidence$12) {
       evidence$12.Q();
     }
     var lhsValue$macro$12 = evidence$12.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.awf(evidence$12);
+        this.awo(evidence$12);
         var rhsAggregate$macro$7 = evidence$12.v;
         var rhsMsg$macro$8 = evidence$12.G;
         if ((!evidence$12.d)) {
@@ -921,10 +921,10 @@ $p.aG8 = (function(evidence$12) {
           if (rhsMadeProgress$macro$10) {
             evidence$12.Q();
           }
-          var res$macro$14 = evidence$12.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$12.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$12.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$12.E), 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));
+        if (evidence$12.D) {
+          evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$12.S));
         }
       }
     }
@@ -939,7 +939,7 @@ $p.aG8 = (function(evidence$12) {
       evidence$12.Q();
     }
     var lhsValue$macro$27 = evidence$12.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
     if (evidence$12.d) {
       if (((!evidence$12.d) && evidence$12.p)) {
         var parse0$2 = evidence$12;
@@ -957,10 +957,10 @@ $p.aG8 = (function(evidence$12) {
           if (rhsMadeProgress$macro$25) {
             evidence$12.Q();
           }
-          var res$macro$29 = evidence$12.ab(x1$2.aD(lhsValue$macro$27, (evidence$12.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$12.ab(x1$2.aF(lhsValue$macro$27, (evidence$12.E | 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));
+        if (evidence$12.D) {
+          evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$12.S));
         }
         var parse0$2 = res$macro$29;
       }
@@ -976,17 +976,17 @@ $p.aG8 = (function(evidence$12) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, 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.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$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.bq.ft, 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);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     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.v, forceAggregate);
@@ -1001,13 +1001,13 @@ $p.aG8 = (function(evidence$12) {
     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.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     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);
   }
-  if (x1$7.C) {
+  if (x1$7.D) {
     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.v, forceAggregate$1);
@@ -1021,7 +1021,7 @@ $p.aG8 = (function(evidence$12) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
+    var meta = x0$2.C();
     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 lhsMsg = evidence$12.G;
@@ -1030,7 +1030,7 @@ $p.aG8 = (function(evidence$12) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$5)));
   } else if (evidence$12.p) {
   } else {
-    var verboseFailures = evidence$12.C;
+    var verboseFailures = evidence$12.D;
     evidence$12.c = startPos$5;
     if (verboseFailures) {
       evidence$12.K(lhsMsg, evidence$12.v, false);
@@ -1041,7 +1041,7 @@ $p.aG8 = (function(evidence$12) {
     if (instrument$2) {
       evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
     }
-    var this$18 = this.se;
+    var this$18 = this.sh;
     var startIndex$3 = evidence$12.c;
     var instrument$3 = (evidence$12.L !== null);
     if (instrument$3) {
@@ -1063,12 +1063,12 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$12$1 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.aLt(evidence$12);
+          this.aLF(evidence$12);
           var rhsAggregate$macro$7$1 = evidence$12.v;
           var rhsMsg$macro$8$1 = evidence$12.G;
           if ((!evidence$12.d)) {
@@ -1080,10 +1080,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$1) {
               evidence$12.Q();
             }
-            var res$macro$14$1 = evidence$12.ab(x1$4$1.aD((lhsValue$macro$12$1 | 0), evidence$12.E), nextIndex$macro$13$1);
+            var res$macro$14$1 = evidence$12.ab(x1$4$1.aF((lhsValue$macro$12$1 | 0), evidence$12.E), 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8$1), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$1 === evidence$12.S));
           }
         }
       }
@@ -1098,7 +1098,7 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$27$1 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
           var parse0$6 = evidence$12;
@@ -1116,10 +1116,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$1) {
               evidence$12.Q();
             }
-            var res$macro$29$1 = evidence$12.ab(x1$2$2.aD(lhsValue$macro$27$1, (evidence$12.E | 0)), nextIndex$macro$28$1);
+            var res$macro$29$1 = evidence$12.ab(x1$2$2.aF(lhsValue$macro$27$1, (evidence$12.E | 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$12.S));
           }
           var parse0$6 = res$macro$29$1;
         }
@@ -1135,17 +1135,17 @@ $p.aG8 = (function(evidence$12) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
       }
       var start$1 = (x0$3.aY | 0);
-      var value$1 = x0$3.be;
-      var stop$1 = (x0$3.bn | 0);
-      var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$18.br.c7, start$1);
-      var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$18.br.c7, 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.ft, begin$1, end$1), value$1);
+      var value$1 = x0$3.bk;
+      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$().cF(this$18.bq.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.bq.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.bq.ft, 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);
     }
-    if (x1$2$3.C) {
+    if (x1$2$3.D) {
       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.v, forceAggregate$2);
@@ -1160,13 +1160,13 @@ $p.aG8 = (function(evidence$12) {
       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.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.C()), 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);
     }
-    if (x1$10.C) {
+    if (x1$10.D) {
       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.v, forceAggregate$3);
@@ -1179,14 +1179,14 @@ $p.aG8 = (function(evidence$12) {
       if ((x0$5 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$5);
       }
-      var meta$1 = x0$5.D();
+      var meta$1 = x0$5.C();
       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 rhsMsg = evidence$12.G;
     var rhsCut = evidence$12.p;
     var endCut = (!(!(rhsCut | oldCut$5)));
     if (((!evidence$12.d) && (!rhsCut))) {
-      evidence$12.d2(startPos$5);
+      evidence$12.d3(startPos$5);
     }
     evidence$12.p = endCut;
     if (verboseFailures) {
@@ -1201,7 +1201,7 @@ $p.aG8 = (function(evidence$12) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$4)));
   } else if (evidence$12.p) {
   } else {
-    var verboseFailures$2 = evidence$12.C;
+    var verboseFailures$2 = evidence$12.D;
     evidence$12.c = startPos$4;
     if (verboseFailures$2) {
       evidence$12.K(lhsMsg$2, evidence$12.v, false);
@@ -1212,7 +1212,7 @@ $p.aG8 = (function(evidence$12) {
     if (instrument$3$1) {
       evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
     }
-    var this$35 = this.se;
+    var this$35 = this.sh;
     var startIndex$4 = evidence$12.c;
     var instrument$4 = (evidence$12.L !== null);
     if (instrument$4) {
@@ -1234,12 +1234,12 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$12$2 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.aOL(evidence$12);
+          this.aOT(evidence$12);
           var rhsAggregate$macro$7$2 = evidence$12.v;
           var rhsMsg$macro$8$2 = evidence$12.G;
           if ((!evidence$12.d)) {
@@ -1251,10 +1251,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$2) {
               evidence$12.Q();
             }
-            var res$macro$14$2 = evidence$12.ab(x1$4$2.aD((lhsValue$macro$12$2 | 0), evidence$12.E), nextIndex$macro$13$2);
+            var res$macro$14$2 = evidence$12.ab(x1$4$2.aF((lhsValue$macro$12$2 | 0), evidence$12.E), 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$12.S));
           }
         }
       }
@@ -1269,7 +1269,7 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$27$2 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
           var parse0$10 = evidence$12;
@@ -1287,10 +1287,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$2) {
               evidence$12.Q();
             }
-            var res$macro$29$2 = evidence$12.ab(x1$2$4.aD(lhsValue$macro$27$2, (evidence$12.E | 0)), nextIndex$macro$28$2);
+            var res$macro$29$2 = evidence$12.ab(x1$2$4.aF(lhsValue$macro$27$2, (evidence$12.E | 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$12.S));
           }
           var parse0$10 = res$macro$29$2;
         }
@@ -1306,17 +1306,17 @@ $p.aG8 = (function(evidence$12) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$6);
       }
       var start$2 = (x0$6.aY | 0);
-      var value$2 = x0$6.be;
-      var stop$2 = (x0$6.bn | 0);
-      var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$35.br.c7, start$2);
-      var end$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$35.br.c7, 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.ft, begin$2, end$2), value$2);
+      var value$2 = x0$6.bk;
+      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$().cF(this$35.bq.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.bq.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.bq.ft, 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);
     }
-    if (x1$2$5.C) {
+    if (x1$2$5.D) {
       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.v, forceAggregate$4);
@@ -1331,13 +1331,13 @@ $p.aG8 = (function(evidence$12) {
       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.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.C()), 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);
     }
-    if (x1$13.C) {
+    if (x1$13.D) {
       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.v, forceAggregate$5);
@@ -1350,14 +1350,14 @@ $p.aG8 = (function(evidence$12) {
       if ((x0$8 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$8);
       }
-      var meta$2 = x0$8.D();
+      var meta$2 = x0$8.C();
       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 rhsMsg$2 = evidence$12.G;
     var rhsCut$2 = evidence$12.p;
     var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
     if (((!evidence$12.d) && (!rhsCut$2))) {
-      evidence$12.d2(startPos$4);
+      evidence$12.d3(startPos$4);
     }
     evidence$12.p = endCut$2;
     if (verboseFailures$2) {
@@ -1372,7 +1372,7 @@ $p.aG8 = (function(evidence$12) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$3)));
   } else if (evidence$12.p) {
   } else {
-    var verboseFailures$3 = evidence$12.C;
+    var verboseFailures$3 = evidence$12.D;
     evidence$12.c = startPos$3;
     if (verboseFailures$3) {
       evidence$12.K(lhsMsg$3, evidence$12.v, false);
@@ -1383,7 +1383,7 @@ $p.aG8 = (function(evidence$12) {
     if (instrument$4$1) {
       evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
     }
-    var this$52 = this.se;
+    var this$52 = this.sh;
     var startIndex$5 = evidence$12.c;
     var instrument$5 = (evidence$12.L !== null);
     if (instrument$5) {
@@ -1405,12 +1405,12 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$12$3 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.aOP(evidence$12);
+          this.aOX(evidence$12);
           var rhsAggregate$macro$7$3 = evidence$12.v;
           var rhsMsg$macro$8$3 = evidence$12.G;
           if ((!evidence$12.d)) {
@@ -1422,10 +1422,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$3) {
               evidence$12.Q();
             }
-            var res$macro$14$3 = evidence$12.ab(x1$4$3.aD((lhsValue$macro$12$3 | 0), evidence$12.E), nextIndex$macro$13$3);
+            var res$macro$14$3 = evidence$12.ab(x1$4$3.aF((lhsValue$macro$12$3 | 0), evidence$12.E), 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8$3), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$3 === evidence$12.S));
           }
         }
       }
@@ -1440,7 +1440,7 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$27$3 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
           var parse0$14 = evidence$12;
@@ -1458,10 +1458,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$3) {
               evidence$12.Q();
             }
-            var res$macro$29$3 = evidence$12.ab(x1$2$6.aD(lhsValue$macro$27$3, (evidence$12.E | 0)), nextIndex$macro$28$3);
+            var res$macro$29$3 = evidence$12.ab(x1$2$6.aF(lhsValue$macro$27$3, (evidence$12.E | 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$12.S));
           }
           var parse0$14 = res$macro$29$3;
         }
@@ -1477,17 +1477,17 @@ $p.aG8 = (function(evidence$12) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$9);
       }
       var start$3 = (x0$9.aY | 0);
-      var value$3 = x0$9.be;
-      var stop$3 = (x0$9.bn | 0);
-      var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$52.br.c7, start$3);
-      var end$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$52.br.c7, 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.ft, begin$3, end$3), value$3);
+      var value$3 = x0$9.bk;
+      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$().cF(this$52.bq.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.bq.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.bq.ft, 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);
     }
-    if (x1$2$7.C) {
+    if (x1$2$7.D) {
       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.v, forceAggregate$6);
@@ -1502,13 +1502,13 @@ $p.aG8 = (function(evidence$12) {
       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.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.C()), 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);
     }
-    if (x1$16.C) {
+    if (x1$16.D) {
       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.v, forceAggregate$7);
@@ -1521,14 +1521,14 @@ $p.aG8 = (function(evidence$12) {
       if ((x0$11 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$11);
       }
-      var meta$3 = x0$11.D();
+      var meta$3 = x0$11.C();
       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 rhsMsg$3 = evidence$12.G;
     var rhsCut$3 = evidence$12.p;
     var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
     if (((!evidence$12.d) && (!rhsCut$3))) {
-      evidence$12.d2(startPos$3);
+      evidence$12.d3(startPos$3);
     }
     evidence$12.p = endCut$3;
     if (verboseFailures$3) {
@@ -1543,7 +1543,7 @@ $p.aG8 = (function(evidence$12) {
     evidence$12.p = (!(!(evidence$12.p | oldCut$2)));
   } else if (evidence$12.p) {
   } else {
-    var verboseFailures$4 = evidence$12.C;
+    var verboseFailures$4 = evidence$12.D;
     evidence$12.c = startPos$2;
     if (verboseFailures$4) {
       evidence$12.K(lhsMsg$4, evidence$12.v, false);
@@ -1554,7 +1554,7 @@ $p.aG8 = (function(evidence$12) {
     if (instrument$5$1) {
       evidence$12.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
     }
-    var this$69 = this.se;
+    var this$69 = this.sh;
     var startIndex$6 = evidence$12.c;
     var instrument$6 = (evidence$12.L !== null);
     if (instrument$6) {
@@ -1576,12 +1576,12 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$12$4 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.aIL(evidence$12);
+          this.aIW(evidence$12);
           var rhsAggregate$macro$7$4 = evidence$12.v;
           var rhsMsg$macro$8$4 = evidence$12.G;
           if ((!evidence$12.d)) {
@@ -1593,10 +1593,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$4) {
               evidence$12.Q();
             }
-            var res$macro$14$4 = evidence$12.ab(x1$4$4.aD((lhsValue$macro$12$4 | 0), evidence$12.E), nextIndex$macro$13$4);
+            var res$macro$14$4 = evidence$12.ab(x1$4$4.aF((lhsValue$macro$12$4 | 0), evidence$12.E), 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8$4), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$4 === evidence$12.S));
           }
         }
       }
@@ -1611,7 +1611,7 @@ $p.aG8 = (function(evidence$12) {
         evidence$12.Q();
       }
       var lhsValue$macro$27$4 = evidence$12.E;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
       if (evidence$12.d) {
         if (((!evidence$12.d) && evidence$12.p)) {
           var parse0$18 = evidence$12;
@@ -1629,10 +1629,10 @@ $p.aG8 = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$4) {
               evidence$12.Q();
             }
-            var res$macro$29$4 = evidence$12.ab(x1$2$8.aD(lhsValue$macro$27$4, (evidence$12.E | 0)), nextIndex$macro$28$4);
+            var res$macro$29$4 = evidence$12.ab(x1$2$8.aF(lhsValue$macro$27$4, (evidence$12.E | 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));
+          if (evidence$12.D) {
+            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$4, rhsMsg$macro$23$4), lhsAggregate$macro$21$4.W(rhsAggregate$macro$22$4), (preRhsIndex$macro$19$4 === evidence$12.S));
           }
           var parse0$18 = res$macro$29$4;
         }
@@ -1648,17 +1648,17 @@ $p.aG8 = (function(evidence$12) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$12);
       }
       var start$4 = (x0$12.aY | 0);
-      var value$4 = x0$12.be;
-      var stop$4 = (x0$12.bn | 0);
-      var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$69.br.c7, start$4);
-      var end$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$69.br.c7, 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.ft, begin$4, end$4), value$4);
+      var value$4 = x0$12.bk;
+      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$().cF(this$69.bq.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.bq.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.bq.ft, 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);
     }
-    if (x1$2$9.C) {
+    if (x1$2$9.D) {
       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.v, forceAggregate$8);
@@ -1673,13 +1673,13 @@ $p.aG8 = (function(evidence$12) {
       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.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.C()), 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);
     }
-    if (x1$19.C) {
+    if (x1$19.D) {
       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.v, forceAggregate$9);
@@ -1692,14 +1692,14 @@ $p.aG8 = (function(evidence$12) {
       if ((x0$14 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$14);
       }
-      var meta$4 = x0$14.D();
+      var meta$4 = x0$14.C();
       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 rhsMsg$4 = evidence$12.G;
     var rhsCut$4 = evidence$12.p;
     var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
     if (((!evidence$12.d) && (!rhsCut$4))) {
-      evidence$12.d2(startPos$2);
+      evidence$12.d3(startPos$2);
     }
     evidence$12.p = endCut$4;
     if (verboseFailures$4) {
@@ -1716,18 +1716,18 @@ $p.aG8 = (function(evidence$12) {
   } else if (evidence$12.p) {
     return evidence$12;
   } else {
-    var verboseFailures$5 = evidence$12.C;
+    var verboseFailures$5 = evidence$12.D;
     evidence$12.c = startPos;
     if (verboseFailures$5) {
       evidence$12.K(lhsMsg$5, evidence$12.v, false);
     }
     evidence$12.p = false;
-    this.aw7(evidence$12);
+    this.awh(evidence$12);
     var rhsMsg$5 = evidence$12.G;
     var rhsCut$5 = evidence$12.p;
     var endCut$5 = (!(!(rhsCut$5 | oldCut)));
     if (((!evidence$12.d) && (!rhsCut$5))) {
-      evidence$12.d2(startPos);
+      evidence$12.d3(startPos);
     }
     evidence$12.p = endCut$5;
     if (verboseFailures$5) {
@@ -1738,7 +1738,7 @@ $p.aG8 = (function(evidence$12) {
     return evidence$12;
   }
 });
-$p.a0c = (function(evidence$13) {
+$p.a0g = (function(evidence$13) {
   var startIndex = evidence$13.c;
   var instrument = (evidence$13.L !== null);
   if (instrument) {
@@ -1747,7 +1747,7 @@ $p.a0c = (function(evidence$13) {
   var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
   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$().bQ();
+  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
   var startIndex$1 = evidence$13.c;
   var count = 0;
   var precut = false;
@@ -1757,31 +1757,31 @@ $p.a0c = (function(evidence$13) {
   var x1$2;
   while (true) {
     evidence$13.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aG8(evidence$13);
+    this.aGk(evidence$13);
     var parsedMsg = evidence$13.G;
     var parsedAgg = evidence$13.v;
     var postCut = evidence$13.p;
-    var verboseFailures = evidence$13.C;
+    var verboseFailures = evidence$13.D;
     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$().ir(startIndex$1, 0, evidence$13, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(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.al(evidence$13.E);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$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$().fD(parsedMsg.dB) + ".rep")))(parsedMsg))));
+          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$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
         }
         var x1$2 = res$2;
         break;
       } else {
-        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$13), (!((!evidence$13.d) && evidence$13.p))))) {
+        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace, evidence$13), (!((!evidence$13.d) && evidence$13.p))))) {
           evidence$13.p = false;
           var sepCut = evidence$13.p;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
@@ -1801,7 +1801,7 @@ $p.a0c = (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);
   }
-  if (x1$2.C) {
+  if (x1$2.D) {
     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.v, forceAggregate);
@@ -1811,13 +1811,13 @@ $p.a0c = (function(evidence$13) {
   }
   return x1$2;
 });
-$p.afe = (function(evidence$14) {
+$p.afn = (function(evidence$14) {
   var startIndex = evidence$14.c;
   var instrument = (evidence$14.L !== null);
   if (instrument) {
     evidence$14.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
   }
-  var this$1 = this.se;
+  var this$1 = this.sh;
   var startIndex$1 = evidence$14.c;
   var instrument$1 = (evidence$14.L !== null);
   if (instrument$1) {
@@ -1839,7 +1839,7 @@ $p.afe = (function(evidence$14) {
       evidence$14.Q();
     }
     var lhsValue$macro$12 = evidence$14.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 {
@@ -1863,7 +1863,7 @@ $p.afe = (function(evidence$14) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$14.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 x1$4$1 = evidence$14;
@@ -1881,14 +1881,14 @@ $p.afe = (function(evidence$14) {
                   evidence$14.Q();
                 }
                 var lhsValue$macro$12$2 = evidence$14.E;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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$2 = evidence$14.c;
                     var x1$2$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
                     var preLhsIndex$macro$2$3 = evidence$14.c;
                     var input$macro$11$3 = evidence$14.T;
-                    this.se.a08(evidence$14);
+                    this.sh.a0d(evidence$14);
                     if (evidence$14.d) {
                       var postLhsIndex$macro$3$3 = evidence$14.c;
                       var lhsAggregate$macro$6$3 = evidence$14.v;
@@ -1897,11 +1897,11 @@ $p.afe = (function(evidence$14) {
                         evidence$14.Q();
                       }
                       var lhsValue$macro$12$3 = evidence$14.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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.a0c(evidence$14));
+                          var f = (() => this.a0g(evidence$14));
                           var startIndex$3 = evidence$14.c;
                           var instrument$3 = (evidence$14.L !== null);
                           if (instrument$3) {
@@ -1928,7 +1928,7 @@ $p.afe = (function(evidence$14) {
                           } else {
                             evidence$14.aH();
                           }
-                          if (evidence$14.C) {
+                          if (evidence$14.D) {
                             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((() => "\"{\""))));
                           }
                           if ((!evidence$14.d)) {
@@ -1939,7 +1939,7 @@ $p.afe = (function(evidence$14) {
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                               evidence$14.Q();
                             }
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 {
@@ -1958,8 +1958,8 @@ $p.afe = (function(evidence$14) {
                                   }
                                   var res$macro$14 = evidence$14.ab(evidence$14.E, 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));
+                                if (evidence$14.D) {
+                                  evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$14.S));
                                 }
                               }
                             }
@@ -1974,7 +1974,7 @@ $p.afe = (function(evidence$14) {
                               evidence$14.Q();
                             }
                             var lhsValue$macro$27 = evidence$14.E;
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 x1$8 = evidence$14;
@@ -1987,7 +1987,7 @@ $p.afe = (function(evidence$14) {
                                 } else {
                                   evidence$14.aH();
                                 }
-                                if (evidence$14.C) {
+                                if (evidence$14.D) {
                                   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((() => "\"}\""))));
                                 }
                                 var rhsAggregate$macro$22 = evidence$14.v;
@@ -2003,8 +2003,8 @@ $p.afe = (function(evidence$14) {
                                   }
                                   var res$macro$29 = evidence$14.ab(lhsValue$macro$27, nextIndex$macro$28);
                                 }
-                                if (evidence$14.C) {
-                                  evidence$14.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$14.S));
+                                if (evidence$14.D) {
+                                  evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$14.S));
                                 }
                                 var x1$8 = res$macro$29;
                               }
@@ -2015,7 +2015,7 @@ $p.afe = (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);
                           }
-                          if (x1$8.C) {
+                          if (x1$8.D) {
                             var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                             var forceAggregate = (startIndex$4 < x1$8.S);
                             x1$8.K(newshortMsg, x1$8.v, forceAggregate);
@@ -2031,7 +2031,7 @@ $p.afe = (function(evidence$14) {
                           } else if (evidence$14.p) {
                             var x1$3$3 = evidence$14;
                           } else {
-                            var verboseFailures = evidence$14.C;
+                            var verboseFailures = evidence$14.D;
                             evidence$14.c = startPos;
                             if (verboseFailures) {
                               evidence$14.K(lhsMsg, evidence$14.v, false);
@@ -2055,7 +2055,7 @@ $p.afe = (function(evidence$14) {
                             } else {
                               evidence$14.aH();
                             }
-                            if (evidence$14.C) {
+                            if (evidence$14.D) {
                               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((() => "\"(\""))));
                             }
                             if ((!evidence$14.d)) {
@@ -2066,7 +2066,7 @@ $p.afe = (function(evidence$14) {
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
                                 evidence$14.Q();
                               }
-                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 {
@@ -2085,8 +2085,8 @@ $p.afe = (function(evidence$14) {
                                     }
                                     var res$macro$14$1 = evidence$14.ab(evidence$14.E, 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));
+                                  if (evidence$14.D) {
+                                    evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$14.S));
                                   }
                                 }
                               }
@@ -2101,7 +2101,7 @@ $p.afe = (function(evidence$14) {
                                 evidence$14.Q();
                               }
                               var lhsValue$macro$27$1 = evidence$14.E;
-                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 x1$8$1 = evidence$14;
@@ -2114,7 +2114,7 @@ $p.afe = (function(evidence$14) {
                                   } else {
                                     evidence$14.aH();
                                   }
-                                  if (evidence$14.C) {
+                                  if (evidence$14.D) {
                                     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((() => "\")\""))));
                                   }
                                   var rhsAggregate$macro$22$1 = evidence$14.v;
@@ -2130,8 +2130,8 @@ $p.afe = (function(evidence$14) {
                                     }
                                     var res$macro$29$1 = evidence$14.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                                   }
-                                  if (evidence$14.C) {
-                                    evidence$14.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$14.S));
+                                  if (evidence$14.D) {
+                                    evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$14.S));
                                   }
                                   var x1$8$1 = res$macro$29$1;
                                 }
@@ -2142,7 +2142,7 @@ $p.afe = (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);
                             }
-                            if (x1$8$1.C) {
+                            if (x1$8$1.D) {
                               var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                               var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
                               x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
@@ -2154,7 +2154,7 @@ $p.afe = (function(evidence$14) {
                             var rhsCut = evidence$14.p;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$14.d) && (!rhsCut))) {
-                              evidence$14.d2(startPos);
+                              evidence$14.d3(startPos);
                             }
                             evidence$14.p = endCut;
                             if (verboseFailures) {
@@ -2167,7 +2167,7 @@ $p.afe = (function(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);
                           }
-                          if (x1$3$3.C) {
+                          if (x1$3$3.D) {
                             var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                             var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
                             x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
@@ -2185,10 +2185,10 @@ $p.afe = (function(evidence$14) {
                             if (rhsMadeProgress$macro$10$2) {
                               evidence$14.Q();
                             }
-                            evidence$14.ab(x1$2$2.aD(lhsValue$macro$12$3, evidence$14.E), nextIndex$macro$13$2);
+                            evidence$14.ab(x1$2$2.aF(lhsValue$macro$12$3, evidence$14.E), 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));
+                          if (evidence$14.D) {
+                            evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$14.S));
                           }
                         }
                       }
@@ -2203,10 +2203,10 @@ $p.afe = (function(evidence$14) {
                       if (rhsMadeProgress$macro$10$3) {
                         evidence$14.Q();
                       }
-                      evidence$14.ab(x1$2$1.aD(lhsValue$macro$12$2, evidence$14.E), nextIndex$macro$13$3);
+                      evidence$14.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$14.E), 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));
+                    if (evidence$14.D) {
+                      evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$14.S));
                     }
                   }
                 }
@@ -2225,8 +2225,8 @@ $p.afe = (function(evidence$14) {
                 }
                 var res$macro$14$4 = evidence$14.ab(evidence$14.E, 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));
+              if (evidence$14.D) {
+                evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$14.S));
               }
               var x1$4$1 = res$macro$14$4;
             }
@@ -2237,7 +2237,7 @@ $p.afe = (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);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
@@ -2256,10 +2256,10 @@ $p.afe = (function(evidence$14) {
           if (rhsMadeProgress$macro$10$5) {
             evidence$14.Q();
           }
-          var res$macro$14$5 = evidence$14.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$14.E), nextIndex$macro$13$5);
+          var res$macro$14$5 = evidence$14.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$14.E), 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));
+        if (evidence$14.D) {
+          evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$14.S));
         }
       }
     }
@@ -2274,7 +2274,7 @@ $p.afe = (function(evidence$14) {
       evidence$14.Q();
     }
     var lhsValue$macro$27$2 = evidence$14.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($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 parse0$7 = evidence$14;
@@ -2292,10 +2292,10 @@ $p.afe = (function(evidence$14) {
           if (rhsMadeProgress$macro$25$2) {
             evidence$14.Q();
           }
-          var res$macro$29$2 = evidence$14.ab(x1$2.aD(lhsValue$macro$27$2, (evidence$14.E | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$14.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$14.E | 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));
+        if (evidence$14.D) {
+          evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$14.S));
         }
         var parse0$7 = res$macro$29$2;
       }
@@ -2311,17 +2311,17 @@ $p.afe = (function(evidence$14) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, 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.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$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.bq.ft, 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);
   }
-  if (x1$2$3.C) {
+  if (x1$2$3.D) {
     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.v, forceAggregate$4);
@@ -2336,7 +2336,7 @@ $p.afe = (function(evidence$14) {
     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.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$8 = x1$2$3;
   }
   if ((!parse0$8.d)) {
@@ -2346,10 +2346,10 @@ $p.afe = (function(evidence$14) {
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.D();
+        var m = x0$2.C();
         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.C(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -2361,7 +2361,7 @@ $p.afe = (function(evidence$14) {
   if (instrument) {
     evidence$14.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, x1$2$4.c, x1$2$4.d);
   }
-  if (x1$2$4.C) {
+  if (x1$2$4.D) {
     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.v, forceAggregate$5);
@@ -2377,10 +2377,10 @@ $p.afe = (function(evidence$14) {
       var $x_3;
       if ((x0$3 !== null)) {
         var meta = x0$3.aY;
-        var name = x0$3.be;
-        var p2$1 = x0$3.bn;
+        var name = x0$3.bk;
+        var p2$1 = x0$3.br;
         if ((p2$1 !== null)) {
-          var derived = p2$1.D();
+          var derived = p2$1.C();
           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;
         }
@@ -2392,7 +2392,7 @@ $p.afe = (function(evidence$14) {
   }
 });
 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", ({
-  vo: 1
+  vs: 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