@7mind.io/baboon 0.0.167 → 0.0.171

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

@@ -36,10 +36,55 @@ import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 import * as $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1 from "./scala.scalajs.runtime.-Anon-Function0.$$-Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1.js";
 import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
+function $p_Lio_septimalmind_baboon_parser_defns_DefDto__fieldWas__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$7) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
+  var preLhsIndex$macro$2 = evidence$7.c;
+  var input$macro$11 = evidence$7.T;
+  $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__kw__T__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), "was", evidence$7);
+  if ((!evidence$7.d)) {
+    return evidence$7;
+  } else {
+    var postLhsIndex$macro$3 = evidence$7.c;
+    var lhsAggregate$macro$6 = evidence$7.r;
+    var lhsMsg$macro$9 = evidence$7.F;
+    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+      evidence$7.P();
+    }
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    if (evidence$7.d) {
+      if (((!evidence$7.d) && evidence$7.o)) {
+        return evidence$7;
+      } else {
+        var preRhsIndex$macro$4 = evidence$7.c;
+        $thiz.ays(evidence$7);
+        var rhsAggregate$macro$7 = evidence$7.r;
+        var rhsMsg$macro$8 = evidence$7.F;
+        if ((!evidence$7.d)) {
+          var res$macro$14 = evidence$7;
+        } else {
+          var postRhsIndex$macro$5 = evidence$7.c;
+          var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
+          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
+          if (rhsMadeProgress$macro$10) {
+            evidence$7.P();
+          }
+          var res$macro$14 = evidence$7.a8(evidence$7.D, nextIndex$macro$13);
+        }
+        if (evidence$7.C) {
+          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
+        }
+        return res$macro$14;
+      }
+    } else {
+      return evidence$7;
+    }
+  }
+}
+export { $p_Lio_septimalmind_baboon_parser_defns_DefDto__fieldWas__Lfastparse_ParsingRun__Lfastparse_ParsingRun as $p_Lio_septimalmind_baboon_parser_defns_DefDto__fieldWas__Lfastparse_ParsingRun__Lfastparse_ParsingRun };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefDto(context, meta) {
-  this.sq = null;
-  this.sq = meta;
+  this.sF = null;
+  this.sF = meta;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefDto as $c_Lio_septimalmind_baboon_parser_defns_DefDto };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -49,8 +94,8 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefDto() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefDto as $h_Lio_septimalmind_baboon_parser_defns_DefDto };
 $h_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = $p;
-$p.aQe = (function(evidence$1) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
+$p.aQU = (function(evidence$1) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -61,40 +106,40 @@ $p.aQe = (function(evidence$1) {
   if ((input.V(index) && (input.as.charCodeAt(index) === 91))) {
     evidence$1.aJ(((1 + index) | 0));
   } else {
-    evidence$1.aH();
+    evidence$1.aE();
   }
   if (evidence$1.C) {
-    evidence$1.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"[\""))));
+    evidence$1.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"[\""))));
   }
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.v;
+    var lhsAggregate$macro$6 = evidence$1.r;
     var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($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)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
+        var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nm();
         var whitespace = $j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$();
         var this$8 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-        var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
+        var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
         var startIndex = evidence$1.c;
         var count = 0;
         var precut = false;
-        var outerCut = evidence$1.p;
+        var outerCut = evidence$1.o;
         var sepMsg = null;
         var lastAgg = null;
         while (true) {
-          evidence$1.p = (!(!(precut | ((count < 1) && outerCut))));
-          this.aiO(evidence$1);
+          evidence$1.o = (!(!(precut | ((count < 1) && outerCut))));
+          this.ajq(evidence$1);
           var parsedMsg = evidence$1.F;
-          var parsedAgg = evidence$1.v;
-          var postCut = evidence$1.p;
+          var parsedAgg = evidence$1.r;
+          var postCut = evidence$1.o;
           var verboseFailures = evidence$1.C;
           if ((!evidence$1.d)) {
             if (postCut) {
@@ -102,7 +147,7 @@ $p.aQe = (function(evidence$1) {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$4__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$8, startIndex, startIndex, count, (!(!(outerCut | postCut))), 1, evidence$1, repeater, acc);
             }
             if (verboseFailures) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex, 1, evidence$1, sepMsg, parsedMsg, lastAgg, (precut || postCut));
               break;
             } else {
               break;
@@ -111,15 +156,15 @@ $p.aQe = (function(evidence$1) {
             var beforeSepIndex = evidence$1.c;
             acc.am(evidence$1.D);
             var nextCount = ((1 + count) | 0);
-            if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$1), (!((!evidence$1.d) && evidence$1.p))))) {
-              evidence$1.p = false;
+            if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab(whitespace, evidence$1), (!((!evidence$1.d) && evidence$1.o))))) {
+              evidence$1.o = false;
               var input$1 = evidence$1.T;
               var index$1 = evidence$1.c;
-              var res$2 = ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 44)) ? evidence$1.aJ(((1 + index$1) | 0)) : evidence$1.aH());
+              var res$2 = ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 44)) ? evidence$1.aJ(((1 + index$1) | 0)) : evidence$1.aE());
               if (evidence$1.C) {
-                evidence$1.av(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\",\""))));
+                evidence$1.at(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\",\""))));
               }
-              var sepCut = evidence$1.p;
+              var sepCut = evidence$1.o;
               var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
               if ((res$2 === null)) {
                 startIndex = beforeSepIndex;
@@ -130,7 +175,7 @@ $p.aQe = (function(evidence$1) {
                 lastAgg = parsedAgg;
               } else if (evidence$1.d) {
                 var sepMsg$2 = evidence$1.F;
-                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$().ab(whitespace, evidence$1), (!((!evidence$1.d) && (sepCut || evidence$1.o)))))) {
                   startIndex = beforeSepIndex;
                   count = nextCount;
                   precut = sepCut;
@@ -142,12 +187,12 @@ $p.aQe = (function(evidence$1) {
                 }
               } else {
                 if (sepCut) {
-                  evidence$1.Bh(beforeSepIndex, endCut);
+                  evidence$1.Bv(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$().iv(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
+                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex, 1, evidence$1, null, parsedMsg, parsedAgg, true);
                   break;
                 } else {
                   break;
@@ -158,7 +203,7 @@ $p.aQe = (function(evidence$1) {
             }
           }
         }
-        var rhsAggregate$macro$7 = evidence$1.v;
+        var rhsAggregate$macro$7 = evidence$1.r;
         var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
@@ -169,7 +214,7 @@ $p.aQe = (function(evidence$1) {
           if (rhsMadeProgress$macro$10) {
             evidence$1.P();
           }
-          var res$macro$14 = evidence$1.ab(evidence$1.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$1.a8(evidence$1.D, nextIndex$macro$13);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
@@ -181,15 +226,15 @@ $p.aQe = (function(evidence$1) {
     var parse0$1 = evidence$1;
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.v;
+    var lhsAggregate$macro$21 = evidence$1.r;
     var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$1.P();
     }
     var lhsValue$macro$27 = evidence$1.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($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)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
         var parse0$1 = evidence$1;
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
@@ -198,12 +243,12 @@ $p.aQe = (function(evidence$1) {
         if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
           evidence$1.aJ(((1 + index$2) | 0));
         } else {
-          evidence$1.aH();
+          evidence$1.aE();
         }
         if (evidence$1.C) {
-          evidence$1.av(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"]\""))));
+          evidence$1.at(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"]\""))));
         }
-        var rhsAggregate$macro$22 = evidence$1.v;
+        var rhsAggregate$macro$22 = evidence$1.r;
         var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
@@ -214,7 +259,7 @@ $p.aQe = (function(evidence$1) {
           if (rhsMadeProgress$macro$25) {
             evidence$1.P();
           }
-          var res$macro$29 = evidence$1.ab(lhsValue$macro$27, nextIndex$macro$28);
+          var res$macro$29 = evidence$1.a8(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));
@@ -230,66 +275,66 @@ $p.aQe = (function(evidence$1) {
   } else {
     var x0 = parse0$1.D;
     var list = x0.aC();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().e3((!list.m()));
+    $j_java$002elang$002e$002dObject.$m_s_Predef$().dZ((!list.l()));
     parse0$1.D = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list);
     return parse0$1;
   }
 });
-$p.TV = (function(evidence$2) {
+$p.Ut = (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.D;
-    var list = x0.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((p$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(p$2$2)))).aC();
-    $j_java$002elang$002e$002dObject.$m_s_Predef$().e3((!list.m()));
+    var list = x0.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((p$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(p$2$2)))).aC();
+    $j_java$002elang$002e$002dObject.$m_s_Predef$().dZ((!list.l()));
     parse0.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dScoped$002dRef.$c_Lio_septimalmind_baboon_parser_model_ScopedRef(list);
     return parse0;
   }
 });
-$p.aiO = (function(evidence$3) {
+$p.ajq = (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.TV(evidence$3);
+  this.Ut(evidence$3);
   if ((!evidence$3.d)) {
     var parse0$2 = evidence$3;
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.v;
+    var lhsAggregate$macro$6 = evidence$3.r;
     var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$3.P();
     }
     var lhsValue$macro$12 = evidence$3.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($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)) {
+      if (((!evidence$3.d) && evidence$3.o)) {
         var parse0$2 = evidence$3;
       } else {
         var preRhsIndex$macro$4 = evidence$3.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AW();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().ua();
         var startPos = evidence$3.c;
-        var startCut = evidence$3.p;
-        evidence$3.p = false;
-        this.aQe(evidence$3);
+        var startCut = evidence$3.o;
+        evidence$3.o = false;
+        this.aQU(evidence$3);
         var postSuccess = evidence$3.d;
         if (postSuccess) {
           var ev$1 = evidence$3.D;
-          var res = evidence$3.k2(new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(((ev$1 === null) ? null : ev$1.ay))));
-          res.p = (!(!(res.p | startCut)));
-        } else if (evidence$3.p) {
+          var res = evidence$3.ja(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.av))));
+          res.o = (!(!(res.o | startCut)));
+        } else if (evidence$3.o) {
         } else {
-          var res$2 = evidence$3.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-          res$2.p = (!(!(res$2.p | startCut)));
+          var res$2 = evidence$3.a8($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+          res$2.o = (!(!(res$2.o | startCut)));
         }
         if (evidence$3.C) {
           var msg = evidence$3.F;
           if ((!postSuccess)) {
-            evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(msg.dL) + ".?")))), evidence$3.v, false);
+            evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(msg.dp) + ".?")))), evidence$3.r, false);
           }
         }
-        var rhsAggregate$macro$7 = evidence$3.v;
+        var rhsAggregate$macro$7 = evidence$3.r;
         var rhsMsg$macro$8 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14 = evidence$3;
@@ -300,7 +345,7 @@ $p.aiO = (function(evidence$3) {
           if (rhsMadeProgress$macro$10) {
             evidence$3.P();
           }
-          var res$macro$14 = evidence$3.ab(x1$2.aG(lhsValue$macro$12, evidence$3.D), nextIndex$macro$13);
+          var res$macro$14 = evidence$3.a8(x1$2.aG(lhsValue$macro$12, evidence$3.D), nextIndex$macro$13);
         }
         if (evidence$3.C) {
           evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$3.S));
@@ -320,10 +365,10 @@ $p.aiO = (function(evidence$3) {
     }
     var ref = x0.E();
     var params = x0.z();
-    var name = ref.qR.bl().gG;
-    var prefix = ref.qR.fF();
+    var name = ref.r5.bk().gs;
+    var prefix = ref.r5.fd();
     if ((params instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
-      var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Constructor(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), params.af.ay, prefix);
+      var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Constructor(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), params.af.av, 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 +379,7 @@ $p.aiO = (function(evidence$3) {
     return parse0$2;
   }
 });
-$p.aIn = (function(evidence$4) {
+$p.ays = (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 +388,7 @@ $p.aIn = (function(evidence$4) {
     return parse0;
   }
 });
-$p.aGW = (function(evidence$5) {
+$p.aHA = (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;
@@ -363,28 +408,28 @@ $p.aGW = (function(evidence$5) {
   if ($x_1) {
     evidence$5.aJ(end);
   } else {
-    evidence$5.aH();
+    evidence$5.aE();
   }
   if (evidence$5.C) {
-    evidence$5.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"is\""))));
+    evidence$5.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"is\""))));
   }
   if ((!evidence$5.d)) {
     var parse0 = evidence$5;
   } else {
     var postLhsIndex$macro$5 = evidence$5.c;
-    var lhsAggregate$macro$8 = evidence$5.v;
+    var lhsAggregate$macro$8 = evidence$5.r;
     var lhsMsg$macro$11 = evidence$5.F;
     if ((postLhsIndex$macro$5 > preLhsIndex$macro$4)) {
       evidence$5.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
-      if (((!evidence$5.d) && evidence$5.p)) {
+      if (((!evidence$5.d) && evidence$5.o)) {
         var parse0 = evidence$5;
       } else {
         var preRhsIndex$macro$6 = evidence$5.c;
-        this.TV(evidence$5);
-        var rhsAggregate$macro$9 = evidence$5.v;
+        this.Ut(evidence$5);
+        var rhsAggregate$macro$9 = evidence$5.r;
         var rhsMsg$macro$10 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$16 = evidence$5;
@@ -395,7 +440,7 @@ $p.aGW = (function(evidence$5) {
           if (rhsMadeProgress$macro$12) {
             evidence$5.P();
           }
-          var res$macro$16 = evidence$5.ab(evidence$5.D, nextIndex$macro$15);
+          var res$macro$16 = evidence$5.a8(evidence$5.D, nextIndex$macro$15);
         }
         if (evidence$5.C) {
           evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$11, rhsMsg$macro$10), lhsAggregate$macro$8.W(rhsAggregate$macro$9), (preRhsIndex$macro$6 === evidence$5.S));
@@ -413,14 +458,14 @@ $p.aGW = (function(evidence$5) {
     return parse0;
   }
 });
-$p.axH = (function(evidence$6) {
-  var this$1 = this.sq;
+$p.ayk = (function(evidence$6) {
+  var this$1 = this.sF;
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.M !== null);
   if (instrument) {
-    evidence$6.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
+    evidence$6.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
   var preLhsIndex$macro$17 = evidence$6.c;
   var input$macro$26 = evidence$6.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -430,19 +475,19 @@ $p.axH = (function(evidence$6) {
   if ((!evidence$6.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$6.c;
-    var lhsAggregate$macro$6 = evidence$6.v;
+    var lhsAggregate$macro$6 = evidence$6.r;
     var lhsMsg$macro$9 = evidence$6.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$6.P();
     }
     var lhsValue$macro$12 = evidence$6.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
-      if (((!evidence$6.d) && evidence$6.p)) {
+      if (((!evidence$6.d) && evidence$6.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$6.c;
-        this.aGW(evidence$6);
-        var rhsAggregate$macro$7 = evidence$6.v;
+        this.aHA(evidence$6);
+        var rhsAggregate$macro$7 = evidence$6.r;
         var rhsMsg$macro$8 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$14 = evidence$6;
@@ -453,7 +498,7 @@ $p.axH = (function(evidence$6) {
           if (rhsMadeProgress$macro$10) {
             evidence$6.P();
           }
-          var res$macro$14 = evidence$6.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$6.D), nextIndex$macro$13);
+          var res$macro$14 = evidence$6.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$6.D), nextIndex$macro$13);
         }
         if (evidence$6.C) {
           evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
@@ -465,20 +510,20 @@ $p.axH = (function(evidence$6) {
     var parse0$2 = evidence$6;
   } else {
     var postLhsIndex$macro$18 = evidence$6.c;
-    var lhsAggregate$macro$21 = evidence$6.v;
+    var lhsAggregate$macro$21 = evidence$6.r;
     var lhsMsg$macro$24 = evidence$6.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$6.P();
     }
     var lhsValue$macro$27 = evidence$6.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
-      if (((!evidence$6.d) && evidence$6.p)) {
+      if (((!evidence$6.d) && evidence$6.o)) {
         var parse0$2 = evidence$6;
       } else {
         var preRhsIndex$macro$19 = evidence$6.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$6);
-        var rhsAggregate$macro$22 = evidence$6.v;
+        var rhsAggregate$macro$22 = evidence$6.r;
         var rhsMsg$macro$23 = evidence$6.F;
         if ((!evidence$6.d)) {
           var res$macro$29 = evidence$6;
@@ -489,7 +534,7 @@ $p.axH = (function(evidence$6) {
           if (rhsMadeProgress$macro$25) {
             evidence$6.P();
           }
-          var res$macro$29 = evidence$6.ab(x1$2.aG(lhsValue$macro$27, (evidence$6.D | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$6.a8(x1$2.aG(lhsValue$macro$27, (evidence$6.D | 0)), nextIndex$macro$28);
         }
         if (evidence$6.C) {
           evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$6.S));
@@ -507,23 +552,23 @@ $p.axH = (function(evidence$6) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument) {
-    evidence$6.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$6.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate = (startIndex < x1$2$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.r, forceAggregate);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -548,191 +593,194 @@ $p.axH = (function(evidence$6) {
     return parse0$3;
   }
 });
-$p.axO = (function(evidence$7) {
-  var x1$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-  var preLhsIndex$macro$17 = evidence$7.c;
-  var input$macro$26 = evidence$7.T;
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
-  var preLhsIndex$macro$2 = evidence$7.c;
-  var input$macro$11 = evidence$7.T;
-  this.aIn(evidence$7);
-  if ((!evidence$7.d)) {
+$p.ayr = (function(evidence$8) {
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+  var preLhsIndex$macro$32 = evidence$8.c;
+  var input$macro$41 = evidence$8.T;
+  var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
+  var preLhsIndex$macro$17 = evidence$8.c;
+  var input$macro$26 = evidence$8.T;
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
+  var preLhsIndex$macro$2 = evidence$8.c;
+  var input$macro$11 = evidence$8.T;
+  this.ays(evidence$8);
+  if ((!evidence$8.d)) {
   } else {
-    var postLhsIndex$macro$3 = evidence$7.c;
-    var lhsAggregate$macro$6 = evidence$7.v;
-    var lhsMsg$macro$9 = evidence$7.F;
+    var postLhsIndex$macro$3 = evidence$8.c;
+    var lhsAggregate$macro$6 = evidence$8.r;
+    var lhsMsg$macro$9 = evidence$8.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$7.P();
+      evidence$8.P();
     }
-    var lhsValue$macro$12 = evidence$7.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
-    if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+    var lhsValue$macro$12 = evidence$8.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    if (evidence$8.d) {
+      if (((!evidence$8.d) && evidence$8.o)) {
       } else {
-        var preRhsIndex$macro$4 = evidence$7.c;
-        var input = evidence$7.T;
-        var index = evidence$7.c;
+        var preRhsIndex$macro$4 = evidence$8.c;
+        var input = evidence$8.T;
+        var index = evidence$8.c;
         if ((input.V(index) && (input.as.charCodeAt(index) === 58))) {
-          evidence$7.aJ(((1 + index) | 0));
+          evidence$8.aJ(((1 + index) | 0));
         } else {
-          evidence$7.aH();
+          evidence$8.aE();
         }
-        if (evidence$7.C) {
-          evidence$7.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\":\""))));
+        if (evidence$8.C) {
+          evidence$8.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\":\""))));
         }
-        var rhsAggregate$macro$7 = evidence$7.v;
-        var rhsMsg$macro$8 = evidence$7.F;
-        if ((!evidence$7.d)) {
-          var res$macro$14 = evidence$7;
+        var rhsAggregate$macro$7 = evidence$8.r;
+        var rhsMsg$macro$8 = evidence$8.F;
+        if ((!evidence$8.d)) {
+          var res$macro$14 = evidence$8;
         } else {
-          var postRhsIndex$macro$5 = evidence$7.c;
+          var postRhsIndex$macro$5 = evidence$8.c;
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$7.P();
+            evidence$8.P();
           }
-          var res$macro$14 = evidence$7.ab(lhsValue$macro$12, nextIndex$macro$13);
+          var res$macro$14 = evidence$8.a8(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$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$7.d)) {
-    var parse0$2 = evidence$7;
+  if ((!evidence$8.d)) {
   } else {
-    var postLhsIndex$macro$18 = evidence$7.c;
-    var lhsAggregate$macro$21 = evidence$7.v;
-    var lhsMsg$macro$24 = evidence$7.F;
+    var postLhsIndex$macro$18 = evidence$8.c;
+    var lhsAggregate$macro$21 = evidence$8.r;
+    var lhsMsg$macro$24 = evidence$8.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$7.P();
+      evidence$8.P();
     }
-    var lhsValue$macro$27 = evidence$7.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
-    if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
-        var parse0$2 = evidence$7;
+    var lhsValue$macro$27 = evidence$8.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    if (evidence$8.d) {
+      if (((!evidence$8.d) && evidence$8.o)) {
       } else {
-        var preRhsIndex$macro$19 = evidence$7.c;
-        this.aiO(evidence$7);
-        var rhsAggregate$macro$22 = evidence$7.v;
-        var rhsMsg$macro$23 = evidence$7.F;
-        if ((!evidence$7.d)) {
-          var res$macro$29 = evidence$7;
+        var preRhsIndex$macro$19 = evidence$8.c;
+        this.ajq(evidence$8);
+        var rhsAggregate$macro$22 = evidence$8.r;
+        var rhsMsg$macro$23 = evidence$8.F;
+        if ((!evidence$8.d)) {
+          var res$macro$29 = evidence$8;
         } else {
-          var postRhsIndex$macro$20 = evidence$7.c;
+          var postRhsIndex$macro$20 = evidence$8.c;
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$7.P();
+            evidence$8.P();
           }
-          var res$macro$29 = evidence$7.ab(x1$2.aG(lhsValue$macro$27, evidence$7.D), nextIndex$macro$28);
+          var res$macro$29 = evidence$8.a8(x1$4.aG(lhsValue$macro$27, evidence$8.D), nextIndex$macro$28);
         }
-        if (evidence$7.C) {
-          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$7.S));
+        if (evidence$8.C) {
+          evidence$8.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$8.S));
         }
-        var parse0$2 = res$macro$29;
       }
-    } else {
-      var parse0$2 = evidence$7;
-    }
-  }
-  if ((!parse0$2.d)) {
-    return parse0$2;
-  } else {
-    var x0 = parse0$2.D;
-    if ((x0 === null)) {
-      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    parse0$2.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField.$c_Lio_septimalmind_baboon_parser_model_RawField(x0.E(), x0.z());
-    return parse0$2;
-  }
-});
-$p.aN4 = (function(evidence$8) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-  var preLhsIndex$macro$2 = evidence$8.c;
-  var input$macro$11 = evidence$8.T;
-  var input = evidence$8.T;
-  var index = evidence$8.c;
-  if ((input.V(index) && (input.as.charCodeAt(index) === 43))) {
-    evidence$8.aJ(((1 + index) | 0));
-  } else {
-    evidence$8.aH();
-  }
-  if (evidence$8.C) {
-    evidence$8.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"+\""))));
   }
   if ((!evidence$8.d)) {
-    return evidence$8;
+    var parse0$4 = evidence$8;
   } else {
-    var postLhsIndex$macro$3 = evidence$8.c;
-    var lhsAggregate$macro$6 = evidence$8.v;
-    var lhsMsg$macro$9 = evidence$8.F;
-    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+    var postLhsIndex$macro$33 = evidence$8.c;
+    var lhsAggregate$macro$36 = evidence$8.r;
+    var lhsMsg$macro$39 = evidence$8.F;
+    if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
       evidence$8.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    var lhsValue$macro$42 = evidence$8.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
-      if (((!evidence$8.d) && evidence$8.p)) {
-        return evidence$8;
+      if (((!evidence$8.d) && evidence$8.o)) {
+        var parse0$4 = evidence$8;
       } else {
-        var preRhsIndex$macro$4 = evidence$8.c;
-        this.TV(evidence$8);
-        var rhsAggregate$macro$7 = evidence$8.v;
-        var rhsMsg$macro$8 = evidence$8.F;
+        var preRhsIndex$macro$34 = evidence$8.c;
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().ua();
+        var startPos = evidence$8.c;
+        var startCut = evidence$8.o;
+        evidence$8.o = false;
+        $p_Lio_septimalmind_baboon_parser_defns_DefDto__fieldWas__Lfastparse_ParsingRun__Lfastparse_ParsingRun(this, evidence$8);
+        var postSuccess = evidence$8.d;
+        if (postSuccess) {
+          var res$2 = evidence$8.ja(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$8.D));
+          res$2.o = (!(!(res$2.o | startCut)));
+        } else if (evidence$8.o) {
+        } else {
+          var res$3 = evidence$8.a8($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+          res$3.o = (!(!(res$3.o | startCut)));
+        }
+        if (evidence$8.C) {
+          var msg = evidence$8.F;
+          if ((!postSuccess)) {
+            evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(msg.dp) + ".?")))), evidence$8.r, false);
+          }
+        }
+        var rhsAggregate$macro$37 = evidence$8.r;
+        var rhsMsg$macro$38 = evidence$8.F;
         if ((!evidence$8.d)) {
-          var res$macro$14 = evidence$8;
+          var res$macro$44 = evidence$8;
         } else {
-          var postRhsIndex$macro$5 = evidence$8.c;
-          var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
-          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
-          if (rhsMadeProgress$macro$10) {
+          var postRhsIndex$macro$35 = evidence$8.c;
+          var rhsMadeProgress$macro$40 = (postRhsIndex$macro$35 > preRhsIndex$macro$34);
+          var nextIndex$macro$43 = (((!rhsMadeProgress$macro$40) && input$macro$41.V(postRhsIndex$macro$35)) ? postLhsIndex$macro$33 : postRhsIndex$macro$35);
+          if (rhsMadeProgress$macro$40) {
             evidence$8.P();
           }
-          var res$macro$14 = evidence$8.ab(evidence$8.D, nextIndex$macro$13);
+          var res$macro$44 = evidence$8.a8(x1$2.aG(lhsValue$macro$42, evidence$8.D), nextIndex$macro$43);
         }
         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));
+          evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$8.S));
         }
-        return res$macro$14;
+        var parse0$4 = res$macro$44;
       }
     } else {
-      return evidence$8;
+      var parse0$4 = evidence$8;
+    }
+  }
+  if ((!parse0$4.d)) {
+    return parse0$4;
+  } else {
+    var x0 = parse0$4.D;
+    if ((x0 === null)) {
+      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
+    parse0$4.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dField.$c_Lio_septimalmind_baboon_parser_model_RawField(x0.aS, x0.b5, x0.bd);
+    return parse0$4;
   }
 });
-$p.aQm = (function(evidence$9) {
+$p.aNK = (function(evidence$9) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$9.c;
   var input$macro$11 = evidence$9.T;
   var input = evidence$9.T;
   var index = evidence$9.c;
-  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
+  if ((input.V(index) && (input.as.charCodeAt(index) === 43))) {
     evidence$9.aJ(((1 + index) | 0));
   } else {
-    evidence$9.aH();
+    evidence$9.aE();
   }
   if (evidence$9.C) {
-    evidence$9.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
+    evidence$9.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"+\""))));
   }
   if ((!evidence$9.d)) {
     return evidence$9;
   } else {
     var postLhsIndex$macro$3 = evidence$9.c;
-    var lhsAggregate$macro$6 = evidence$9.v;
+    var lhsAggregate$macro$6 = evidence$9.r;
     var lhsMsg$macro$9 = evidence$9.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$9.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
-      if (((!evidence$9.d) && evidence$9.p)) {
+      if (((!evidence$9.d) && evidence$9.o)) {
         return evidence$9;
       } else {
         var preRhsIndex$macro$4 = evidence$9.c;
-        this.TV(evidence$9);
-        var rhsAggregate$macro$7 = evidence$9.v;
+        this.Ut(evidence$9);
+        var rhsAggregate$macro$7 = evidence$9.r;
         var rhsMsg$macro$8 = evidence$9.F;
         if ((!evidence$9.d)) {
           var res$macro$14 = evidence$9;
@@ -743,7 +791,7 @@ $p.aQm = (function(evidence$9) {
           if (rhsMadeProgress$macro$10) {
             evidence$9.P();
           }
-          var res$macro$14 = evidence$9.ab(evidence$9.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$9.a8(evidence$9.D, nextIndex$macro$13);
         }
         if (evidence$9.C) {
           evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$9.S));
@@ -755,37 +803,37 @@ $p.aQm = (function(evidence$9) {
     }
   }
 });
-$p.aKj = (function(evidence$10) {
+$p.aR2 = (function(evidence$10) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$10.c;
   var input$macro$11 = evidence$10.T;
   var input = evidence$10.T;
   var index = evidence$10.c;
-  if ((input.V(index) && (input.as.charCodeAt(index) === 94))) {
+  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
     evidence$10.aJ(((1 + index) | 0));
   } else {
-    evidence$10.aH();
+    evidence$10.aE();
   }
   if (evidence$10.C) {
-    evidence$10.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"^\""))));
+    evidence$10.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
   }
   if ((!evidence$10.d)) {
     return evidence$10;
   } else {
     var postLhsIndex$macro$3 = evidence$10.c;
-    var lhsAggregate$macro$6 = evidence$10.v;
+    var lhsAggregate$macro$6 = evidence$10.r;
     var lhsMsg$macro$9 = evidence$10.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$10.P();
     }
-    $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$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$10);
     if (evidence$10.d) {
-      if (((!evidence$10.d) && evidence$10.p)) {
+      if (((!evidence$10.d) && evidence$10.o)) {
         return evidence$10;
       } else {
         var preRhsIndex$macro$4 = evidence$10.c;
-        this.TV(evidence$10);
-        var rhsAggregate$macro$7 = evidence$10.v;
+        this.Ut(evidence$10);
+        var rhsAggregate$macro$7 = evidence$10.r;
         var rhsMsg$macro$8 = evidence$10.F;
         if ((!evidence$10.d)) {
           var res$macro$14 = evidence$10;
@@ -796,7 +844,7 @@ $p.aKj = (function(evidence$10) {
           if (rhsMadeProgress$macro$10) {
             evidence$10.P();
           }
-          var res$macro$14 = evidence$10.ab(evidence$10.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$10.a8(evidence$10.D, nextIndex$macro$13);
         }
         if (evidence$10.C) {
           evidence$10.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$10.S));
@@ -808,37 +856,37 @@ $p.aKj = (function(evidence$10) {
     }
   }
 });
-$p.aQi = (function(evidence$11) {
+$p.aKY = (function(evidence$11) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$11.c;
   var input$macro$11 = evidence$11.T;
   var input = evidence$11.T;
   var index = evidence$11.c;
-  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
+  if ((input.V(index) && (input.as.charCodeAt(index) === 94))) {
     evidence$11.aJ(((1 + index) | 0));
   } else {
-    evidence$11.aH();
+    evidence$11.aE();
   }
   if (evidence$11.C) {
-    evidence$11.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
+    evidence$11.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"^\""))));
   }
   if ((!evidence$11.d)) {
     return evidence$11;
   } else {
     var postLhsIndex$macro$3 = evidence$11.c;
-    var lhsAggregate$macro$6 = evidence$11.v;
+    var lhsAggregate$macro$6 = evidence$11.r;
     var lhsMsg$macro$9 = evidence$11.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$11.P();
     }
-    $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$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$11);
     if (evidence$11.d) {
-      if (((!evidence$11.d) && evidence$11.p)) {
+      if (((!evidence$11.d) && evidence$11.o)) {
         return evidence$11;
       } else {
         var preRhsIndex$macro$4 = evidence$11.c;
-        this.axO(evidence$11);
-        var rhsAggregate$macro$7 = evidence$11.v;
+        this.Ut(evidence$11);
+        var rhsAggregate$macro$7 = evidence$11.r;
         var rhsMsg$macro$8 = evidence$11.F;
         if ((!evidence$11.d)) {
           var res$macro$14 = evidence$11;
@@ -849,7 +897,7 @@ $p.aQi = (function(evidence$11) {
           if (rhsMadeProgress$macro$10) {
             evidence$11.P();
           }
-          var res$macro$14 = evidence$11.ab(evidence$11.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$11.a8(evidence$11.D, nextIndex$macro$13);
         }
         if (evidence$11.C) {
           evidence$11.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$11.S));
@@ -861,56 +909,37 @@ $p.aQi = (function(evidence$11) {
     }
   }
 });
-$p.aHH = (function(evidence$12) {
-  var oldCut = evidence$12.p;
-  evidence$12.p = false;
-  var startPos = evidence$12.c;
-  var oldCut$2 = evidence$12.p;
-  evidence$12.p = false;
-  var startPos$2 = evidence$12.c;
-  var oldCut$3 = evidence$12.p;
-  evidence$12.p = false;
-  var startPos$3 = evidence$12.c;
-  var oldCut$4 = evidence$12.p;
-  evidence$12.p = false;
-  var startPos$4 = evidence$12.c;
-  var oldCut$5 = evidence$12.p;
-  evidence$12.p = false;
-  var startPos$5 = evidence$12.c;
-  var startIndex = evidence$12.c;
-  var instrument = (evidence$12.M !== null);
-  if (instrument) {
-    evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex);
-  }
-  var this$1 = this.sq;
-  var startIndex$1 = evidence$12.c;
-  var instrument$1 = (evidence$12.M !== null);
-  if (instrument$1) {
-    evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
-  }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-  var preLhsIndex$macro$17 = evidence$12.c;
-  var input$macro$26 = evidence$12.T;
-  var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
+$p.aQY = (function(evidence$12) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
   var preLhsIndex$macro$2 = evidence$12.c;
   var input$macro$11 = evidence$12.T;
-  $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
+  var input = evidence$12.T;
+  var index = evidence$12.c;
+  if ((input.V(index) && (input.as.charCodeAt(index) === 45))) {
+    evidence$12.aJ(((1 + index) | 0));
+  } else {
+    evidence$12.aE();
+  }
+  if (evidence$12.C) {
+    evidence$12.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"-\""))));
+  }
   if ((!evidence$12.d)) {
+    return evidence$12;
   } else {
     var postLhsIndex$macro$3 = evidence$12.c;
-    var lhsAggregate$macro$6 = evidence$12.v;
+    var lhsAggregate$macro$6 = evidence$12.r;
     var lhsMsg$macro$9 = evidence$12.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$12.P();
     }
-    var lhsValue$macro$12 = evidence$12.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
     if (evidence$12.d) {
-      if (((!evidence$12.d) && evidence$12.p)) {
+      if (((!evidence$12.d) && evidence$12.o)) {
+        return evidence$12;
       } else {
         var preRhsIndex$macro$4 = evidence$12.c;
-        this.axO(evidence$12);
-        var rhsAggregate$macro$7 = evidence$12.v;
+        this.ayr(evidence$12);
+        var rhsAggregate$macro$7 = evidence$12.r;
         var rhsMsg$macro$8 = evidence$12.F;
         if ((!evidence$12.d)) {
           var res$macro$14 = evidence$12;
@@ -921,51 +950,123 @@ $p.aHH = (function(evidence$12) {
           if (rhsMadeProgress$macro$10) {
             evidence$12.P();
           }
-          var res$macro$14 = evidence$12.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$12.D), nextIndex$macro$13);
+          var res$macro$14 = evidence$12.a8(evidence$12.D, nextIndex$macro$13);
         }
         if (evidence$12.C) {
           evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$12.S));
         }
+        return res$macro$14;
       }
+    } else {
+      return evidence$12;
     }
   }
-  if ((!evidence$12.d)) {
-    var parse0$2 = evidence$12;
+});
+$p.aIl = (function(evidence$13) {
+  var oldCut = evidence$13.o;
+  evidence$13.o = false;
+  var startPos = evidence$13.c;
+  var oldCut$2 = evidence$13.o;
+  evidence$13.o = false;
+  var startPos$2 = evidence$13.c;
+  var oldCut$3 = evidence$13.o;
+  evidence$13.o = false;
+  var startPos$3 = evidence$13.c;
+  var oldCut$4 = evidence$13.o;
+  evidence$13.o = false;
+  var startPos$4 = evidence$13.c;
+  var oldCut$5 = evidence$13.o;
+  evidence$13.o = false;
+  var startPos$5 = evidence$13.c;
+  var startIndex = evidence$13.c;
+  var instrument = (evidence$13.M !== null);
+  if (instrument) {
+    evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex);
+  }
+  var this$1 = this.sF;
+  var startIndex$1 = evidence$13.c;
+  var instrument$1 = (evidence$13.M !== null);
+  if (instrument$1) {
+    evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+  }
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+  var preLhsIndex$macro$17 = evidence$13.c;
+  var input$macro$26 = evidence$13.T;
+  var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
+  var preLhsIndex$macro$2 = evidence$13.c;
+  var input$macro$11 = evidence$13.T;
+  $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+  if ((!evidence$13.d)) {
+  } else {
+    var postLhsIndex$macro$3 = evidence$13.c;
+    var lhsAggregate$macro$6 = evidence$13.r;
+    var lhsMsg$macro$9 = evidence$13.F;
+    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+      evidence$13.P();
+    }
+    var lhsValue$macro$12 = evidence$13.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+    if (evidence$13.d) {
+      if (((!evidence$13.d) && evidence$13.o)) {
+      } else {
+        var preRhsIndex$macro$4 = evidence$13.c;
+        this.ayr(evidence$13);
+        var rhsAggregate$macro$7 = evidence$13.r;
+        var rhsMsg$macro$8 = evidence$13.F;
+        if ((!evidence$13.d)) {
+          var res$macro$14 = evidence$13;
+        } else {
+          var postRhsIndex$macro$5 = evidence$13.c;
+          var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
+          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
+          if (rhsMadeProgress$macro$10) {
+            evidence$13.P();
+          }
+          var res$macro$14 = evidence$13.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$13.D), nextIndex$macro$13);
+        }
+        if (evidence$13.C) {
+          evidence$13.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$13.S));
+        }
+      }
+    }
+  }
+  if ((!evidence$13.d)) {
+    var parse0$2 = evidence$13;
   } else {
-    var postLhsIndex$macro$18 = evidence$12.c;
-    var lhsAggregate$macro$21 = evidence$12.v;
-    var lhsMsg$macro$24 = evidence$12.F;
+    var postLhsIndex$macro$18 = evidence$13.c;
+    var lhsAggregate$macro$21 = evidence$13.r;
+    var lhsMsg$macro$24 = evidence$13.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$12.P();
+      evidence$13.P();
     }
-    var lhsValue$macro$27 = evidence$12.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-    if (evidence$12.d) {
-      if (((!evidence$12.d) && evidence$12.p)) {
-        var parse0$2 = evidence$12;
+    var lhsValue$macro$27 = evidence$13.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+    if (evidence$13.d) {
+      if (((!evidence$13.d) && evidence$13.o)) {
+        var parse0$2 = evidence$13;
       } else {
-        var preRhsIndex$macro$19 = evidence$12.c;
-        $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-        var rhsAggregate$macro$22 = evidence$12.v;
-        var rhsMsg$macro$23 = evidence$12.F;
-        if ((!evidence$12.d)) {
-          var res$macro$29 = evidence$12;
+        var preRhsIndex$macro$19 = evidence$13.c;
+        $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+        var rhsAggregate$macro$22 = evidence$13.r;
+        var rhsMsg$macro$23 = evidence$13.F;
+        if ((!evidence$13.d)) {
+          var res$macro$29 = evidence$13;
         } else {
-          var postRhsIndex$macro$20 = evidence$12.c;
+          var postRhsIndex$macro$20 = evidence$13.c;
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$12.P();
+            evidence$13.P();
           }
-          var res$macro$29 = evidence$12.ab(x1$2.aG(lhsValue$macro$27, (evidence$12.D | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$13.a8(x1$2.aG(lhsValue$macro$27, (evidence$13.D | 0)), nextIndex$macro$28);
         }
-        if (evidence$12.C) {
-          evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$12.S));
+        if (evidence$13.C) {
+          evidence$13.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$13.S));
         }
         var parse0$2 = res$macro$29;
       }
     } else {
-      var parse0$2 = evidence$12;
+      var parse0$2 = evidence$13;
     }
   }
   if ((!parse0$2.d)) {
@@ -975,23 +1076,23 @@ $p.aHH = (function(evidence$12) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument$1) {
-    evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
-    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate = (startIndex$1 < x1$2$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.r, forceAggregate);
     if ((!x1$2$1.d)) {
-      x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$1.Y);
+      x1$2$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$1.a0);
     }
   }
   if ((!x1$2$1.d)) {
@@ -1005,14 +1106,14 @@ $p.aHH = (function(evidence$12) {
     var x1$7 = x1$2$1;
   }
   if (instrument) {
-    evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$7.c, x1$7.d);
+    evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$7.c, x1$7.d);
   }
   if (x1$7.C) {
-    var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
+    var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
     var forceAggregate$1 = (startIndex < x1$7.S);
-    x1$7.K(newshortMsg$1, x1$7.v, forceAggregate$1);
+    x1$7.K(newshortMsg$1, x1$7.r, forceAggregate$1);
     if ((!x1$7.d)) {
-      x1$7.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex), x1$7.Y);
+      x1$7.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex), x1$7.a0);
     }
   }
   if ((!x1$7.d)) {
@@ -1024,107 +1125,107 @@ $p.aHH = (function(evidence$12) {
     var meta = x0$2.E();
     x1$7.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef(x0$2.z(), meta);
   }
-  var lhsMsg = evidence$12.F;
-  var lhsAggregate = evidence$12.v;
-  if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut$5)));
-  } else if (evidence$12.p) {
+  var lhsMsg = evidence$13.F;
+  var lhsAggregate = evidence$13.r;
+  if (evidence$13.d) {
+    evidence$13.o = (!(!(evidence$13.o | oldCut$5)));
+  } else if (evidence$13.o) {
   } else {
-    var verboseFailures = evidence$12.C;
-    evidence$12.c = startPos$5;
+    var verboseFailures = evidence$13.C;
+    evidence$13.c = startPos$5;
     if (verboseFailures) {
-      evidence$12.K(lhsMsg, evidence$12.v, false);
+      evidence$13.K(lhsMsg, evidence$13.r, false);
     }
-    evidence$12.p = false;
-    var startIndex$2 = evidence$12.c;
-    var instrument$2 = (evidence$12.M !== null);
+    evidence$13.o = false;
+    var startIndex$2 = evidence$13.c;
+    var instrument$2 = (evidence$13.M !== null);
     if (instrument$2) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
     }
-    var this$18 = this.sq;
-    var startIndex$3 = evidence$12.c;
-    var instrument$3 = (evidence$12.M !== null);
+    var this$18 = this.sF;
+    var startIndex$3 = evidence$13.c;
+    var instrument$3 = (evidence$13.M !== null);
     if (instrument$3) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3);
     }
-    var x1$2$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-    var preLhsIndex$macro$17$1 = evidence$12.c;
-    var input$macro$26$1 = evidence$12.T;
+    var x1$2$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+    var preLhsIndex$macro$17$1 = evidence$13.c;
+    var input$macro$26$1 = evidence$13.T;
     var x1$4$1 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-    var preLhsIndex$macro$2$1 = evidence$12.c;
-    var input$macro$11$1 = evidence$12.T;
-    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-    if ((!evidence$12.d)) {
+    var preLhsIndex$macro$2$1 = evidence$13.c;
+    var input$macro$11$1 = evidence$13.T;
+    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+    if ((!evidence$13.d)) {
     } else {
-      var postLhsIndex$macro$3$1 = evidence$12.c;
-      var lhsAggregate$macro$6$1 = evidence$12.v;
-      var lhsMsg$macro$9$1 = evidence$12.F;
+      var postLhsIndex$macro$3$1 = evidence$13.c;
+      var lhsAggregate$macro$6$1 = evidence$13.r;
+      var lhsMsg$macro$9$1 = evidence$13.F;
       if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$12$1 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
+      var lhsValue$macro$12$1 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
         } else {
-          var preRhsIndex$macro$4$1 = evidence$12.c;
-          this.aN4(evidence$12);
-          var rhsAggregate$macro$7$1 = evidence$12.v;
-          var rhsMsg$macro$8$1 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$14$1 = evidence$12;
+          var preRhsIndex$macro$4$1 = evidence$13.c;
+          this.aNK(evidence$13);
+          var rhsAggregate$macro$7$1 = evidence$13.r;
+          var rhsMsg$macro$8$1 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$14$1 = evidence$13;
           } else {
-            var postRhsIndex$macro$5$1 = evidence$12.c;
+            var postRhsIndex$macro$5$1 = evidence$13.c;
             var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$1);
             var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$1.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$1);
             if (rhsMadeProgress$macro$10$1) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$14$1 = evidence$12.ab(x1$4$1.aG((lhsValue$macro$12$1 | 0), evidence$12.D), nextIndex$macro$13$1);
+            var res$macro$14$1 = evidence$13.a8(x1$4$1.aG((lhsValue$macro$12$1 | 0), evidence$13.D), nextIndex$macro$13$1);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$1), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$1 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
         }
       }
     }
-    if ((!evidence$12.d)) {
-      var parse0$6 = evidence$12;
+    if ((!evidence$13.d)) {
+      var parse0$6 = evidence$13;
     } else {
-      var postLhsIndex$macro$18$1 = evidence$12.c;
-      var lhsAggregate$macro$21$1 = evidence$12.v;
-      var lhsMsg$macro$24$1 = evidence$12.F;
+      var postLhsIndex$macro$18$1 = evidence$13.c;
+      var lhsAggregate$macro$21$1 = evidence$13.r;
+      var lhsMsg$macro$24$1 = evidence$13.F;
       if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$1)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$27$1 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
-          var parse0$6 = evidence$12;
+      var lhsValue$macro$27$1 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
+          var parse0$6 = evidence$13;
         } else {
-          var preRhsIndex$macro$19$1 = evidence$12.c;
-          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$1 = evidence$12.v;
-          var rhsMsg$macro$23$1 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$29$1 = evidence$12;
+          var preRhsIndex$macro$19$1 = evidence$13.c;
+          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+          var rhsAggregate$macro$22$1 = evidence$13.r;
+          var rhsMsg$macro$23$1 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$29$1 = evidence$13;
           } else {
-            var postRhsIndex$macro$20$1 = evidence$12.c;
+            var postRhsIndex$macro$20$1 = evidence$13.c;
             var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
             var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$1.V(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
             if (rhsMadeProgress$macro$25$1) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$29$1 = evidence$12.ab(x1$2$2.aG(lhsValue$macro$27$1, (evidence$12.D | 0)), nextIndex$macro$28$1);
+            var res$macro$29$1 = evidence$13.a8(x1$2$2.aG(lhsValue$macro$27$1, (evidence$13.D | 0)), nextIndex$macro$28$1);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
           var parse0$6 = res$macro$29$1;
         }
       } else {
-        var parse0$6 = evidence$12;
+        var parse0$6 = evidence$13;
       }
     }
     if ((!parse0$6.d)) {
@@ -1134,23 +1235,23 @@ $p.aHH = (function(evidence$12) {
       if ((x0$3 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
       }
-      var start$1 = (x0$3.aX | 0);
-      var value$1 = x0$3.bj;
-      var stop$1 = (x0$3.br | 0);
-      var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$18.bq.c7, start$1);
-      var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$18.bq.c7, stop$1);
-      parse0$6.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$18.bq.fy, begin$1, end$1), value$1);
+      var start$1 = (x0$3.aS | 0);
+      var value$1 = x0$3.b5;
+      var stop$1 = (x0$3.bd | 0);
+      var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$18.br.c9, start$1);
+      var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$18.br.c9, stop$1);
+      parse0$6.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$18.br.fC, begin$1, end$1), value$1);
       var x1$2$3 = parse0$6;
     }
     if (instrument$3) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
     }
     if (x1$2$3.C) {
-      var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+      var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
       var forceAggregate$2 = (startIndex$3 < x1$2$3.S);
-      x1$2$3.K(newshortMsg$2, x1$2$3.v, forceAggregate$2);
+      x1$2$3.K(newshortMsg$2, x1$2$3.r, forceAggregate$2);
       if ((!x1$2$3.d)) {
-        x1$2$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3), x1$2$3.Y);
+        x1$2$3.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$3), x1$2$3.a0);
       }
     }
     if ((!x1$2$3.d)) {
@@ -1164,14 +1265,14 @@ $p.aHH = (function(evidence$12) {
       var x1$10 = x1$2$3;
     }
     if (instrument$2) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$10.c, x1$10.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$10.c, x1$10.d);
     }
     if (x1$10.C) {
-      var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
+      var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
       var forceAggregate$3 = (startIndex$2 < x1$10.S);
-      x1$10.K(newshortMsg$3, x1$10.v, forceAggregate$3);
+      x1$10.K(newshortMsg$3, x1$10.r, forceAggregate$3);
       if ((!x1$10.d)) {
-        x1$10.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2), x1$10.Y);
+        x1$10.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2), x1$10.a0);
       }
     }
     if (x1$10.d) {
@@ -1182,120 +1283,120 @@ $p.aHH = (function(evidence$12) {
       var meta$1 = x0$5.E();
       x1$10.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef(x0$5.z(), meta$1);
     }
-    var rhsMsg = evidence$12.F;
-    var rhsCut = evidence$12.p;
+    var rhsMsg = evidence$13.F;
+    var rhsCut = evidence$13.o;
     var endCut = (!(!(rhsCut | oldCut$5)));
-    if (((!evidence$12.d) && (!rhsCut))) {
-      evidence$12.d1(startPos$5);
+    if (((!evidence$13.d) && (!rhsCut))) {
+      evidence$13.d2(startPos$5);
     }
-    evidence$12.p = endCut;
+    evidence$13.o = endCut;
     if (verboseFailures) {
       var $x_1 = lhsMsg.W(rhsMsg);
-      var rassoc$3 = evidence$12.v;
-      evidence$12.K($x_1, lhsAggregate.W(rassoc$3), false);
+      var rassoc$3 = evidence$13.r;
+      evidence$13.K($x_1, lhsAggregate.W(rassoc$3), false);
     }
   }
-  var lhsMsg$2 = evidence$12.F;
-  var lhsAggregate$2 = evidence$12.v;
-  if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut$4)));
-  } else if (evidence$12.p) {
+  var lhsMsg$2 = evidence$13.F;
+  var lhsAggregate$2 = evidence$13.r;
+  if (evidence$13.d) {
+    evidence$13.o = (!(!(evidence$13.o | oldCut$4)));
+  } else if (evidence$13.o) {
   } else {
-    var verboseFailures$2 = evidence$12.C;
-    evidence$12.c = startPos$4;
+    var verboseFailures$2 = evidence$13.C;
+    evidence$13.c = startPos$4;
     if (verboseFailures$2) {
-      evidence$12.K(lhsMsg$2, evidence$12.v, false);
+      evidence$13.K(lhsMsg$2, evidence$13.r, false);
     }
-    evidence$12.p = false;
-    var startIndex$3$1 = evidence$12.c;
-    var instrument$3$1 = (evidence$12.M !== null);
+    evidence$13.o = false;
+    var startIndex$3$1 = evidence$13.c;
+    var instrument$3$1 = (evidence$13.M !== null);
     if (instrument$3$1) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
     }
-    var this$35 = this.sq;
-    var startIndex$4 = evidence$12.c;
-    var instrument$4 = (evidence$12.M !== null);
+    var this$35 = this.sF;
+    var startIndex$4 = evidence$13.c;
+    var instrument$4 = (evidence$13.M !== null);
     if (instrument$4) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4);
     }
-    var x1$2$4 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-    var preLhsIndex$macro$17$2 = evidence$12.c;
-    var input$macro$26$2 = evidence$12.T;
+    var x1$2$4 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+    var preLhsIndex$macro$17$2 = evidence$13.c;
+    var input$macro$26$2 = evidence$13.T;
     var x1$4$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-    var preLhsIndex$macro$2$2 = evidence$12.c;
-    var input$macro$11$2 = evidence$12.T;
-    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-    if ((!evidence$12.d)) {
+    var preLhsIndex$macro$2$2 = evidence$13.c;
+    var input$macro$11$2 = evidence$13.T;
+    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+    if ((!evidence$13.d)) {
     } else {
-      var postLhsIndex$macro$3$2 = evidence$12.c;
-      var lhsAggregate$macro$6$2 = evidence$12.v;
-      var lhsMsg$macro$9$2 = evidence$12.F;
+      var postLhsIndex$macro$3$2 = evidence$13.c;
+      var lhsAggregate$macro$6$2 = evidence$13.r;
+      var lhsMsg$macro$9$2 = evidence$13.F;
       if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$12$2 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
+      var lhsValue$macro$12$2 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
         } else {
-          var preRhsIndex$macro$4$2 = evidence$12.c;
-          this.aQi(evidence$12);
-          var rhsAggregate$macro$7$2 = evidence$12.v;
-          var rhsMsg$macro$8$2 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$14$2 = evidence$12;
+          var preRhsIndex$macro$4$2 = evidence$13.c;
+          this.aQY(evidence$13);
+          var rhsAggregate$macro$7$2 = evidence$13.r;
+          var rhsMsg$macro$8$2 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$14$2 = evidence$13;
           } else {
-            var postRhsIndex$macro$5$2 = evidence$12.c;
+            var postRhsIndex$macro$5$2 = evidence$13.c;
             var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$2);
             var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$2.V(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$2);
             if (rhsMadeProgress$macro$10$2) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$14$2 = evidence$12.ab(x1$4$2.aG((lhsValue$macro$12$2 | 0), evidence$12.D), nextIndex$macro$13$2);
+            var res$macro$14$2 = evidence$13.a8(x1$4$2.aG((lhsValue$macro$12$2 | 0), evidence$13.D), nextIndex$macro$13$2);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
         }
       }
     }
-    if ((!evidence$12.d)) {
-      var parse0$10 = evidence$12;
+    if ((!evidence$13.d)) {
+      var parse0$10 = evidence$13;
     } else {
-      var postLhsIndex$macro$18$2 = evidence$12.c;
-      var lhsAggregate$macro$21$2 = evidence$12.v;
-      var lhsMsg$macro$24$2 = evidence$12.F;
+      var postLhsIndex$macro$18$2 = evidence$13.c;
+      var lhsAggregate$macro$21$2 = evidence$13.r;
+      var lhsMsg$macro$24$2 = evidence$13.F;
       if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17$2)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$27$2 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
-          var parse0$10 = evidence$12;
+      var lhsValue$macro$27$2 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
+          var parse0$10 = evidence$13;
         } else {
-          var preRhsIndex$macro$19$2 = evidence$12.c;
-          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$2 = evidence$12.v;
-          var rhsMsg$macro$23$2 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$29$2 = evidence$12;
+          var preRhsIndex$macro$19$2 = evidence$13.c;
+          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+          var rhsAggregate$macro$22$2 = evidence$13.r;
+          var rhsMsg$macro$23$2 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$29$2 = evidence$13;
           } else {
-            var postRhsIndex$macro$20$2 = evidence$12.c;
+            var postRhsIndex$macro$20$2 = evidence$13.c;
             var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
             var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26$2.V(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
             if (rhsMadeProgress$macro$25$2) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$29$2 = evidence$12.ab(x1$2$4.aG(lhsValue$macro$27$2, (evidence$12.D | 0)), nextIndex$macro$28$2);
+            var res$macro$29$2 = evidence$13.a8(x1$2$4.aG(lhsValue$macro$27$2, (evidence$13.D | 0)), nextIndex$macro$28$2);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
           var parse0$10 = res$macro$29$2;
         }
       } else {
-        var parse0$10 = evidence$12;
+        var parse0$10 = evidence$13;
       }
     }
     if ((!parse0$10.d)) {
@@ -1305,23 +1406,23 @@ $p.aHH = (function(evidence$12) {
       if ((x0$6 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$6);
       }
-      var start$2 = (x0$6.aX | 0);
-      var value$2 = x0$6.bj;
-      var stop$2 = (x0$6.br | 0);
-      var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$35.bq.c7, start$2);
-      var end$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$35.bq.c7, stop$2);
-      parse0$10.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$35.bq.fy, begin$2, end$2), value$2);
+      var start$2 = (x0$6.aS | 0);
+      var value$2 = x0$6.b5;
+      var stop$2 = (x0$6.bd | 0);
+      var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$35.br.c9, start$2);
+      var end$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$35.br.c9, stop$2);
+      parse0$10.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$35.br.fC, begin$2, end$2), value$2);
       var x1$2$5 = parse0$10;
     }
     if (instrument$4) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$5.c, x1$2$5.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$5.c, x1$2$5.d);
     }
     if (x1$2$5.C) {
-      var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+      var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
       var forceAggregate$4 = (startIndex$4 < x1$2$5.S);
-      x1$2$5.K(newshortMsg$5, x1$2$5.v, forceAggregate$4);
+      x1$2$5.K(newshortMsg$5, x1$2$5.r, forceAggregate$4);
       if ((!x1$2$5.d)) {
-        x1$2$5.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4), x1$2$5.Y);
+        x1$2$5.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$4), x1$2$5.a0);
       }
     }
     if ((!x1$2$5.d)) {
@@ -1335,14 +1436,14 @@ $p.aHH = (function(evidence$12) {
       var x1$13 = x1$2$5;
     }
     if (instrument$3$1) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$13.c, x1$13.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$13.c, x1$13.d);
     }
     if (x1$13.C) {
-      var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
+      var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
       var forceAggregate$5 = (startIndex$3$1 < x1$13.S);
-      x1$13.K(newshortMsg$6, x1$13.v, forceAggregate$5);
+      x1$13.K(newshortMsg$6, x1$13.r, forceAggregate$5);
       if ((!x1$13.d)) {
-        x1$13.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1), x1$13.Y);
+        x1$13.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1), x1$13.a0);
       }
     }
     if (x1$13.d) {
@@ -1353,120 +1454,120 @@ $p.aHH = (function(evidence$12) {
       var meta$2 = x0$8.E();
       x1$13.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef(x0$8.z(), meta$2);
     }
-    var rhsMsg$2 = evidence$12.F;
-    var rhsCut$2 = evidence$12.p;
+    var rhsMsg$2 = evidence$13.F;
+    var rhsCut$2 = evidence$13.o;
     var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
-    if (((!evidence$12.d) && (!rhsCut$2))) {
-      evidence$12.d1(startPos$4);
+    if (((!evidence$13.d) && (!rhsCut$2))) {
+      evidence$13.d2(startPos$4);
     }
-    evidence$12.p = endCut$2;
+    evidence$13.o = endCut$2;
     if (verboseFailures$2) {
       var $x_2 = lhsMsg$2.W(rhsMsg$2);
-      var rassoc$3$2 = evidence$12.v;
-      evidence$12.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
+      var rassoc$3$2 = evidence$13.r;
+      evidence$13.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
     }
   }
-  var lhsMsg$3 = evidence$12.F;
-  var lhsAggregate$3 = evidence$12.v;
-  if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut$3)));
-  } else if (evidence$12.p) {
+  var lhsMsg$3 = evidence$13.F;
+  var lhsAggregate$3 = evidence$13.r;
+  if (evidence$13.d) {
+    evidence$13.o = (!(!(evidence$13.o | oldCut$3)));
+  } else if (evidence$13.o) {
   } else {
-    var verboseFailures$3 = evidence$12.C;
-    evidence$12.c = startPos$3;
+    var verboseFailures$3 = evidence$13.C;
+    evidence$13.c = startPos$3;
     if (verboseFailures$3) {
-      evidence$12.K(lhsMsg$3, evidence$12.v, false);
+      evidence$13.K(lhsMsg$3, evidence$13.r, false);
     }
-    evidence$12.p = false;
-    var startIndex$4$1 = evidence$12.c;
-    var instrument$4$1 = (evidence$12.M !== null);
+    evidence$13.o = false;
+    var startIndex$4$1 = evidence$13.c;
+    var instrument$4$1 = (evidence$13.M !== null);
     if (instrument$4$1) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
     }
-    var this$52 = this.sq;
-    var startIndex$5 = evidence$12.c;
-    var instrument$5 = (evidence$12.M !== null);
+    var this$52 = this.sF;
+    var startIndex$5 = evidence$13.c;
+    var instrument$5 = (evidence$13.M !== null);
     if (instrument$5) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5);
     }
-    var x1$2$6 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-    var preLhsIndex$macro$17$3 = evidence$12.c;
-    var input$macro$26$3 = evidence$12.T;
+    var x1$2$6 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+    var preLhsIndex$macro$17$3 = evidence$13.c;
+    var input$macro$26$3 = evidence$13.T;
     var x1$4$3 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-    var preLhsIndex$macro$2$3 = evidence$12.c;
-    var input$macro$11$3 = evidence$12.T;
-    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-    if ((!evidence$12.d)) {
+    var preLhsIndex$macro$2$3 = evidence$13.c;
+    var input$macro$11$3 = evidence$13.T;
+    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+    if ((!evidence$13.d)) {
     } else {
-      var postLhsIndex$macro$3$3 = evidence$12.c;
-      var lhsAggregate$macro$6$3 = evidence$12.v;
-      var lhsMsg$macro$9$3 = evidence$12.F;
+      var postLhsIndex$macro$3$3 = evidence$13.c;
+      var lhsAggregate$macro$6$3 = evidence$13.r;
+      var lhsMsg$macro$9$3 = evidence$13.F;
       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$12$3 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
+      var lhsValue$macro$12$3 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
         } else {
-          var preRhsIndex$macro$4$3 = evidence$12.c;
-          this.aQm(evidence$12);
-          var rhsAggregate$macro$7$3 = evidence$12.v;
-          var rhsMsg$macro$8$3 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$14$3 = evidence$12;
+          var preRhsIndex$macro$4$3 = evidence$13.c;
+          this.aR2(evidence$13);
+          var rhsAggregate$macro$7$3 = evidence$13.r;
+          var rhsMsg$macro$8$3 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$14$3 = evidence$13;
           } else {
-            var postRhsIndex$macro$5$3 = evidence$12.c;
+            var postRhsIndex$macro$5$3 = evidence$13.c;
             var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$3);
             var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$3.V(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$3);
             if (rhsMadeProgress$macro$10$3) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$14$3 = evidence$12.ab(x1$4$3.aG((lhsValue$macro$12$3 | 0), evidence$12.D), nextIndex$macro$13$3);
+            var res$macro$14$3 = evidence$13.a8(x1$4$3.aG((lhsValue$macro$12$3 | 0), evidence$13.D), nextIndex$macro$13$3);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$3), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$3 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
         }
       }
     }
-    if ((!evidence$12.d)) {
-      var parse0$14 = evidence$12;
+    if ((!evidence$13.d)) {
+      var parse0$14 = evidence$13;
     } else {
-      var postLhsIndex$macro$18$3 = evidence$12.c;
-      var lhsAggregate$macro$21$3 = evidence$12.v;
-      var lhsMsg$macro$24$3 = evidence$12.F;
+      var postLhsIndex$macro$18$3 = evidence$13.c;
+      var lhsAggregate$macro$21$3 = evidence$13.r;
+      var lhsMsg$macro$24$3 = evidence$13.F;
       if ((postLhsIndex$macro$18$3 > preLhsIndex$macro$17$3)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$27$3 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
-          var parse0$14 = evidence$12;
+      var lhsValue$macro$27$3 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
+          var parse0$14 = evidence$13;
         } else {
-          var preRhsIndex$macro$19$3 = evidence$12.c;
-          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$3 = evidence$12.v;
-          var rhsMsg$macro$23$3 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$29$3 = evidence$12;
+          var preRhsIndex$macro$19$3 = evidence$13.c;
+          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+          var rhsAggregate$macro$22$3 = evidence$13.r;
+          var rhsMsg$macro$23$3 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$29$3 = evidence$13;
           } else {
-            var postRhsIndex$macro$20$3 = evidence$12.c;
+            var postRhsIndex$macro$20$3 = evidence$13.c;
             var rhsMadeProgress$macro$25$3 = (postRhsIndex$macro$20$3 > preRhsIndex$macro$19$3);
             var nextIndex$macro$28$3 = (((!rhsMadeProgress$macro$25$3) && input$macro$26$3.V(postRhsIndex$macro$20$3)) ? postLhsIndex$macro$18$3 : postRhsIndex$macro$20$3);
             if (rhsMadeProgress$macro$25$3) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$29$3 = evidence$12.ab(x1$2$6.aG(lhsValue$macro$27$3, (evidence$12.D | 0)), nextIndex$macro$28$3);
+            var res$macro$29$3 = evidence$13.a8(x1$2$6.aG(lhsValue$macro$27$3, (evidence$13.D | 0)), nextIndex$macro$28$3);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
           var parse0$14 = res$macro$29$3;
         }
       } else {
-        var parse0$14 = evidence$12;
+        var parse0$14 = evidence$13;
       }
     }
     if ((!parse0$14.d)) {
@@ -1476,23 +1577,23 @@ $p.aHH = (function(evidence$12) {
       if ((x0$9 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$9);
       }
-      var start$3 = (x0$9.aX | 0);
-      var value$3 = x0$9.bj;
-      var stop$3 = (x0$9.br | 0);
-      var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$52.bq.c7, start$3);
-      var end$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$52.bq.c7, stop$3);
-      parse0$14.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$52.bq.fy, begin$3, end$3), value$3);
+      var start$3 = (x0$9.aS | 0);
+      var value$3 = x0$9.b5;
+      var stop$3 = (x0$9.bd | 0);
+      var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$52.br.c9, start$3);
+      var end$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$52.br.c9, stop$3);
+      parse0$14.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$52.br.fC, begin$3, end$3), value$3);
       var x1$2$7 = parse0$14;
     }
     if (instrument$5) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$7.c, x1$2$7.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$7.c, x1$2$7.d);
     }
     if (x1$2$7.C) {
-      var newshortMsg$8 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+      var newshortMsg$8 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
       var forceAggregate$6 = (startIndex$5 < x1$2$7.S);
-      x1$2$7.K(newshortMsg$8, x1$2$7.v, forceAggregate$6);
+      x1$2$7.K(newshortMsg$8, x1$2$7.r, forceAggregate$6);
       if ((!x1$2$7.d)) {
-        x1$2$7.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5), x1$2$7.Y);
+        x1$2$7.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$5), x1$2$7.a0);
       }
     }
     if ((!x1$2$7.d)) {
@@ -1506,14 +1607,14 @@ $p.aHH = (function(evidence$12) {
       var x1$16 = x1$2$7;
     }
     if (instrument$4$1) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$16.c, x1$16.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$16.c, x1$16.d);
     }
     if (x1$16.C) {
-      var newshortMsg$9 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
+      var newshortMsg$9 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
       var forceAggregate$7 = (startIndex$4$1 < x1$16.S);
-      x1$16.K(newshortMsg$9, x1$16.v, forceAggregate$7);
+      x1$16.K(newshortMsg$9, x1$16.r, forceAggregate$7);
       if ((!x1$16.d)) {
-        x1$16.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1), x1$16.Y);
+        x1$16.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1), x1$16.a0);
       }
     }
     if (x1$16.d) {
@@ -1524,120 +1625,120 @@ $p.aHH = (function(evidence$12) {
       var meta$3 = x0$11.E();
       x1$16.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef(x0$11.z(), meta$3);
     }
-    var rhsMsg$3 = evidence$12.F;
-    var rhsCut$3 = evidence$12.p;
+    var rhsMsg$3 = evidence$13.F;
+    var rhsCut$3 = evidence$13.o;
     var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
-    if (((!evidence$12.d) && (!rhsCut$3))) {
-      evidence$12.d1(startPos$3);
+    if (((!evidence$13.d) && (!rhsCut$3))) {
+      evidence$13.d2(startPos$3);
     }
-    evidence$12.p = endCut$3;
+    evidence$13.o = endCut$3;
     if (verboseFailures$3) {
       var $x_3 = lhsMsg$3.W(rhsMsg$3);
-      var rassoc$3$3 = evidence$12.v;
-      evidence$12.K($x_3, lhsAggregate$3.W(rassoc$3$3), false);
+      var rassoc$3$3 = evidence$13.r;
+      evidence$13.K($x_3, lhsAggregate$3.W(rassoc$3$3), false);
     }
   }
-  var lhsMsg$4 = evidence$12.F;
-  var lhsAggregate$4 = evidence$12.v;
-  if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut$2)));
-  } else if (evidence$12.p) {
+  var lhsMsg$4 = evidence$13.F;
+  var lhsAggregate$4 = evidence$13.r;
+  if (evidence$13.d) {
+    evidence$13.o = (!(!(evidence$13.o | oldCut$2)));
+  } else if (evidence$13.o) {
   } else {
-    var verboseFailures$4 = evidence$12.C;
-    evidence$12.c = startPos$2;
+    var verboseFailures$4 = evidence$13.C;
+    evidence$13.c = startPos$2;
     if (verboseFailures$4) {
-      evidence$12.K(lhsMsg$4, evidence$12.v, false);
+      evidence$13.K(lhsMsg$4, evidence$13.r, false);
     }
-    evidence$12.p = false;
-    var startIndex$5$1 = evidence$12.c;
-    var instrument$5$1 = (evidence$12.M !== null);
+    evidence$13.o = false;
+    var startIndex$5$1 = evidence$13.c;
+    var instrument$5$1 = (evidence$13.M !== null);
     if (instrument$5$1) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
     }
-    var this$69 = this.sq;
-    var startIndex$6 = evidence$12.c;
-    var instrument$6 = (evidence$12.M !== null);
+    var this$69 = this.sF;
+    var startIndex$6 = evidence$13.c;
+    var instrument$6 = (evidence$13.M !== null);
     if (instrument$6) {
-      evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6);
+      evidence$13.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6);
     }
-    var x1$2$8 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-    var preLhsIndex$macro$17$4 = evidence$12.c;
-    var input$macro$26$4 = evidence$12.T;
+    var x1$2$8 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+    var preLhsIndex$macro$17$4 = evidence$13.c;
+    var input$macro$26$4 = evidence$13.T;
     var x1$4$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-    var preLhsIndex$macro$2$4 = evidence$12.c;
-    var input$macro$11$4 = evidence$12.T;
-    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-    if ((!evidence$12.d)) {
+    var preLhsIndex$macro$2$4 = evidence$13.c;
+    var input$macro$11$4 = evidence$13.T;
+    $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+    if ((!evidence$13.d)) {
     } else {
-      var postLhsIndex$macro$3$4 = evidence$12.c;
-      var lhsAggregate$macro$6$4 = evidence$12.v;
-      var lhsMsg$macro$9$4 = evidence$12.F;
+      var postLhsIndex$macro$3$4 = evidence$13.c;
+      var lhsAggregate$macro$6$4 = evidence$13.r;
+      var lhsMsg$macro$9$4 = evidence$13.F;
       if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$12$4 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
+      var lhsValue$macro$12$4 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
         } else {
-          var preRhsIndex$macro$4$4 = evidence$12.c;
-          this.aKj(evidence$12);
-          var rhsAggregate$macro$7$4 = evidence$12.v;
-          var rhsMsg$macro$8$4 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$14$4 = evidence$12;
+          var preRhsIndex$macro$4$4 = evidence$13.c;
+          this.aKY(evidence$13);
+          var rhsAggregate$macro$7$4 = evidence$13.r;
+          var rhsMsg$macro$8$4 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$14$4 = evidence$13;
           } else {
-            var postRhsIndex$macro$5$4 = evidence$12.c;
+            var postRhsIndex$macro$5$4 = evidence$13.c;
             var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$4);
             var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$4.V(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$4);
             if (rhsMadeProgress$macro$10$4) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$14$4 = evidence$12.ab(x1$4$4.aG((lhsValue$macro$12$4 | 0), evidence$12.D), nextIndex$macro$13$4);
+            var res$macro$14$4 = evidence$13.a8(x1$4$4.aG((lhsValue$macro$12$4 | 0), evidence$13.D), nextIndex$macro$13$4);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$4), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$4 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
         }
       }
     }
-    if ((!evidence$12.d)) {
-      var parse0$18 = evidence$12;
+    if ((!evidence$13.d)) {
+      var parse0$18 = evidence$13;
     } else {
-      var postLhsIndex$macro$18$4 = evidence$12.c;
-      var lhsAggregate$macro$21$4 = evidence$12.v;
-      var lhsMsg$macro$24$4 = evidence$12.F;
+      var postLhsIndex$macro$18$4 = evidence$13.c;
+      var lhsAggregate$macro$21$4 = evidence$13.r;
+      var lhsMsg$macro$24$4 = evidence$13.F;
       if ((postLhsIndex$macro$18$4 > preLhsIndex$macro$17$4)) {
-        evidence$12.P();
+        evidence$13.P();
       }
-      var lhsValue$macro$27$4 = evidence$12.D;
-      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
-      if (evidence$12.d) {
-        if (((!evidence$12.d) && evidence$12.p)) {
-          var parse0$18 = evidence$12;
+      var lhsValue$macro$27$4 = evidence$13.D;
+      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$13);
+      if (evidence$13.d) {
+        if (((!evidence$13.d) && evidence$13.o)) {
+          var parse0$18 = evidence$13;
         } else {
-          var preRhsIndex$macro$19$4 = evidence$12.c;
-          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$12);
-          var rhsAggregate$macro$22$4 = evidence$12.v;
-          var rhsMsg$macro$23$4 = evidence$12.F;
-          if ((!evidence$12.d)) {
-            var res$macro$29$4 = evidence$12;
+          var preRhsIndex$macro$19$4 = evidence$13.c;
+          $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$13);
+          var rhsAggregate$macro$22$4 = evidence$13.r;
+          var rhsMsg$macro$23$4 = evidence$13.F;
+          if ((!evidence$13.d)) {
+            var res$macro$29$4 = evidence$13;
           } else {
-            var postRhsIndex$macro$20$4 = evidence$12.c;
+            var postRhsIndex$macro$20$4 = evidence$13.c;
             var rhsMadeProgress$macro$25$4 = (postRhsIndex$macro$20$4 > preRhsIndex$macro$19$4);
             var nextIndex$macro$28$4 = (((!rhsMadeProgress$macro$25$4) && input$macro$26$4.V(postRhsIndex$macro$20$4)) ? postLhsIndex$macro$18$4 : postRhsIndex$macro$20$4);
             if (rhsMadeProgress$macro$25$4) {
-              evidence$12.P();
+              evidence$13.P();
             }
-            var res$macro$29$4 = evidence$12.ab(x1$2$8.aG(lhsValue$macro$27$4, (evidence$12.D | 0)), nextIndex$macro$28$4);
+            var res$macro$29$4 = evidence$13.a8(x1$2$8.aG(lhsValue$macro$27$4, (evidence$13.D | 0)), nextIndex$macro$28$4);
           }
-          if (evidence$12.C) {
-            evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$4, rhsMsg$macro$23$4), lhsAggregate$macro$21$4.W(rhsAggregate$macro$22$4), (preRhsIndex$macro$19$4 === evidence$12.S));
+          if (evidence$13.C) {
+            evidence$13.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$13.S));
           }
           var parse0$18 = res$macro$29$4;
         }
       } else {
-        var parse0$18 = evidence$12;
+        var parse0$18 = evidence$13;
       }
     }
     if ((!parse0$18.d)) {
@@ -1647,23 +1748,23 @@ $p.aHH = (function(evidence$12) {
       if ((x0$12 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$12);
       }
-      var start$4 = (x0$12.aX | 0);
-      var value$4 = x0$12.bj;
-      var stop$4 = (x0$12.br | 0);
-      var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$69.bq.c7, start$4);
-      var end$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$69.bq.c7, stop$4);
-      parse0$18.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$69.bq.fy, begin$4, end$4), value$4);
+      var start$4 = (x0$12.aS | 0);
+      var value$4 = x0$12.b5;
+      var stop$4 = (x0$12.bd | 0);
+      var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$69.br.c9, start$4);
+      var end$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$69.br.c9, stop$4);
+      parse0$18.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$69.br.fC, begin$4, end$4), value$4);
       var x1$2$9 = parse0$18;
     }
     if (instrument$6) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$9.c, x1$2$9.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$9.c, x1$2$9.d);
     }
     if (x1$2$9.C) {
-      var newshortMsg$11 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+      var newshortMsg$11 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
       var forceAggregate$8 = (startIndex$6 < x1$2$9.S);
-      x1$2$9.K(newshortMsg$11, x1$2$9.v, forceAggregate$8);
+      x1$2$9.K(newshortMsg$11, x1$2$9.r, forceAggregate$8);
       if ((!x1$2$9.d)) {
-        x1$2$9.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6), x1$2$9.Y);
+        x1$2$9.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$6), x1$2$9.a0);
       }
     }
     if ((!x1$2$9.d)) {
@@ -1677,14 +1778,14 @@ $p.aHH = (function(evidence$12) {
       var x1$19 = x1$2$9;
     }
     if (instrument$5$1) {
-      evidence$12.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$19.c, x1$19.d);
+      evidence$13.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, x1$19.c, x1$19.d);
     }
     if (x1$19.C) {
-      var newshortMsg$12 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
+      var newshortMsg$12 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B)));
       var forceAggregate$9 = (startIndex$5$1 < x1$19.S);
-      x1$19.K(newshortMsg$12, x1$19.v, forceAggregate$9);
+      x1$19.K(newshortMsg$12, x1$19.r, forceAggregate$9);
       if ((!x1$19.d)) {
-        x1$19.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1), x1$19.Y);
+        x1$19.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1), x1$19.a0);
       }
     }
     if (x1$19.d) {
@@ -1695,95 +1796,95 @@ $p.aHH = (function(evidence$12) {
       var meta$4 = x0$14.E();
       x1$19.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef(x0$14.z(), meta$4);
     }
-    var rhsMsg$4 = evidence$12.F;
-    var rhsCut$4 = evidence$12.p;
+    var rhsMsg$4 = evidence$13.F;
+    var rhsCut$4 = evidence$13.o;
     var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
-    if (((!evidence$12.d) && (!rhsCut$4))) {
-      evidence$12.d1(startPos$2);
+    if (((!evidence$13.d) && (!rhsCut$4))) {
+      evidence$13.d2(startPos$2);
     }
-    evidence$12.p = endCut$4;
+    evidence$13.o = endCut$4;
     if (verboseFailures$4) {
       var $x_4 = lhsMsg$4.W(rhsMsg$4);
-      var rassoc$3$4 = evidence$12.v;
-      evidence$12.K($x_4, lhsAggregate$4.W(rassoc$3$4), false);
+      var rassoc$3$4 = evidence$13.r;
+      evidence$13.K($x_4, lhsAggregate$4.W(rassoc$3$4), false);
     }
   }
-  var lhsMsg$5 = evidence$12.F;
-  var lhsAggregate$5 = evidence$12.v;
-  if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut)));
-    return evidence$12;
-  } else if (evidence$12.p) {
-    return evidence$12;
+  var lhsMsg$5 = evidence$13.F;
+  var lhsAggregate$5 = evidence$13.r;
+  if (evidence$13.d) {
+    evidence$13.o = (!(!(evidence$13.o | oldCut)));
+    return evidence$13;
+  } else if (evidence$13.o) {
+    return evidence$13;
   } else {
-    var verboseFailures$5 = evidence$12.C;
-    evidence$12.c = startPos;
+    var verboseFailures$5 = evidence$13.C;
+    evidence$13.c = startPos;
     if (verboseFailures$5) {
-      evidence$12.K(lhsMsg$5, evidence$12.v, false);
+      evidence$13.K(lhsMsg$5, evidence$13.r, false);
     }
-    evidence$12.p = false;
-    this.axH(evidence$12);
-    var rhsMsg$5 = evidence$12.F;
-    var rhsCut$5 = evidence$12.p;
+    evidence$13.o = false;
+    this.ayk(evidence$13);
+    var rhsMsg$5 = evidence$13.F;
+    var rhsCut$5 = evidence$13.o;
     var endCut$5 = (!(!(rhsCut$5 | oldCut)));
-    if (((!evidence$12.d) && (!rhsCut$5))) {
-      evidence$12.d1(startPos);
+    if (((!evidence$13.d) && (!rhsCut$5))) {
+      evidence$13.d2(startPos);
     }
-    evidence$12.p = endCut$5;
+    evidence$13.o = endCut$5;
     if (verboseFailures$5) {
       var $x_5 = lhsMsg$5.W(rhsMsg$5);
-      var rassoc$3$5 = evidence$12.v;
-      evidence$12.K($x_5, lhsAggregate$5.W(rassoc$3$5), false);
+      var rassoc$3$5 = evidence$13.r;
+      evidence$13.K($x_5, lhsAggregate$5.W(rassoc$3$5), false);
     }
-    return evidence$12;
+    return evidence$13;
   }
 });
-$p.a0L = (function(evidence$13) {
-  var startIndex = evidence$13.c;
-  var instrument = (evidence$13.M !== null);
+$p.a1m = (function(evidence$14) {
+  var startIndex = evidence$14.c;
+  var instrument = (evidence$14.M !== null);
   if (instrument) {
-    evidence$13.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, startIndex);
+    evidence$14.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, startIndex);
   }
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nm();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$4 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
-  var startIndex$1 = evidence$13.c;
+  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
+  var startIndex$1 = evidence$14.c;
   var count = 0;
   var precut = false;
-  var outerCut = evidence$13.p;
+  var outerCut = evidence$14.o;
   var sepMsg = null;
   var lastAgg = null;
   var x1$2;
   while (true) {
-    evidence$13.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aHH(evidence$13);
-    var parsedMsg = evidence$13.F;
-    var parsedAgg = evidence$13.v;
-    var postCut = evidence$13.p;
-    var verboseFailures = evidence$13.C;
-    if ((!evidence$13.d)) {
-      var res = (postCut ? evidence$13 : $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, evidence$13, repeater, acc));
+    evidence$14.o = (!(!(precut | ((count < 0) && outerCut))));
+    this.aIl(evidence$14);
+    var parsedMsg = evidence$14.F;
+    var parsedAgg = evidence$14.r;
+    var postCut = evidence$14.o;
+    var verboseFailures = evidence$14.C;
+    if ((!evidence$14.d)) {
+      var res = (postCut ? evidence$14 : $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$14, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex$1, 0, evidence$13, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iy(startIndex$1, 0, evidence$14, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       var x1$2 = res;
       break;
     } else {
-      var beforeSepIndex = evidence$13.c;
-      acc.am(evidence$13.D);
+      var beforeSepIndex = evidence$14.c;
+      acc.am(evidence$14.D);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
-        var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$13, repeater, acc);
+        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$14, repeater, acc);
         if (verboseFailures) {
-          evidence$13.av(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g3(parsedMsg.dL) + ".rep")))(parsedMsg))));
+          evidence$14.at(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fA(parsedMsg.dp) + ".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))))) {
-          evidence$13.p = false;
-          var sepCut = 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$().ab(whitespace, evidence$14), (!((!evidence$14.d) && evidence$14.o))))) {
+          evidence$14.o = false;
+          var sepCut = evidence$14.o;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
           startIndex$1 = beforeSepIndex;
           count = nextCount;
@@ -1793,514 +1894,514 @@ $p.a0L = (function(evidence$13) {
           lastAgg = parsedAgg;
           continue;
         }
-        var x1$2 = evidence$13;
+        var x1$2 = evidence$14;
         break;
       }
     }
   }
   if (instrument) {
-    evidence$13.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, x1$2.c, x1$2.d);
+    evidence$14.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, x1$2.c, x1$2.d);
   }
   if (x1$2.C) {
-    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B)));
+    var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B)));
     var forceAggregate = (startIndex < x1$2.S);
-    x1$2.K(newshortMsg, x1$2.v, forceAggregate);
+    x1$2.K(newshortMsg, x1$2.r, forceAggregate);
     if ((!x1$2.d)) {
-      x1$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, startIndex), x1$2.Y);
+      x1$2.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dto").B, startIndex), x1$2.a0);
     }
   }
   return x1$2;
 });
-$p.agb = (function(evidence$14) {
-  var startIndex = evidence$14.c;
-  var instrument = (evidence$14.M !== null);
+$p.agO = (function(evidence$15) {
+  var startIndex = evidence$15.c;
+  var instrument = (evidence$15.M !== null);
   if (instrument) {
-    evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
+    evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
   }
-  var this$1 = this.sq;
-  var startIndex$1 = evidence$14.c;
-  var instrument$1 = (evidence$14.M !== null);
+  var this$1 = this.sF;
+  var startIndex$1 = evidence$15.c;
+  var instrument$1 = (evidence$15.M !== null);
   if (instrument$1) {
-    evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
-  var preLhsIndex$macro$17 = evidence$14.c;
-  var input$macro$26 = evidence$14.T;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().fB;
+  var preLhsIndex$macro$17 = evidence$15.c;
+  var input$macro$26 = evidence$15.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-  var preLhsIndex$macro$2 = evidence$14.c;
-  var input$macro$11 = evidence$14.T;
-  $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$14);
-  if ((!evidence$14.d)) {
+  var preLhsIndex$macro$2 = evidence$15.c;
+  var input$macro$11 = evidence$15.T;
+  $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$15);
+  if ((!evidence$15.d)) {
   } else {
-    var postLhsIndex$macro$3 = evidence$14.c;
-    var lhsAggregate$macro$6 = evidence$14.v;
-    var lhsMsg$macro$9 = evidence$14.F;
+    var postLhsIndex$macro$3 = evidence$15.c;
+    var lhsAggregate$macro$6 = evidence$15.r;
+    var lhsMsg$macro$9 = evidence$15.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$14.P();
+      evidence$15.P();
     }
-    var lhsValue$macro$12 = evidence$14.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-    if (evidence$14.d) {
-      if (((!evidence$14.d) && evidence$14.p)) {
+    var lhsValue$macro$12 = evidence$15.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+    if (evidence$15.d) {
+      if (((!evidence$15.d) && evidence$15.o)) {
       } else {
-        var preRhsIndex$macro$4 = evidence$14.c;
-        var startIndex$2 = evidence$14.c;
-        var instrument$2 = (evidence$14.M !== null);
+        var preRhsIndex$macro$4 = evidence$15.c;
+        var startIndex$2 = evidence$15.c;
+        var instrument$2 = (evidence$15.M !== null);
         if (instrument$2) {
-          evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-        var preLhsIndex$macro$2$1 = evidence$14.c;
-        var input$macro$11$1 = evidence$14.T;
-        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__data__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), evidence$14);
-        if ((!evidence$14.d)) {
-          var x1$4$1 = evidence$14;
+        var preLhsIndex$macro$2$1 = evidence$15.c;
+        var input$macro$11$1 = evidence$15.T;
+        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__data__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), evidence$15);
+        if ((!evidence$15.d)) {
+          var x1$4$1 = evidence$15;
         } else {
-          var postLhsIndex$macro$3$1 = evidence$14.c;
-          var lhsAggregate$macro$6$1 = evidence$14.v;
-          var lhsMsg$macro$9$1 = evidence$14.F;
-          evidence$14.p = true;
+          var postLhsIndex$macro$3$1 = evidence$15.c;
+          var lhsAggregate$macro$6$1 = evidence$15.r;
+          var lhsMsg$macro$9$1 = evidence$15.F;
+          evidence$15.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$14.P();
+            evidence$15.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-          if (evidence$14.d) {
-            if (((!evidence$14.d) && evidence$14.p)) {
-              var x1$4$1 = evidence$14;
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+          if (evidence$15.d) {
+            if (((!evidence$15.d) && evidence$15.o)) {
+              var x1$4$1 = evidence$15;
             } else {
-              var preRhsIndex$macro$4$1 = evidence$14.c;
+              var preRhsIndex$macro$4$1 = evidence$15.c;
               var x1$2$1 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
-              var preLhsIndex$macro$2$2 = evidence$14.c;
-              var input$macro$11$2 = evidence$14.T;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$14);
-              if (evidence$14.d) {
-                var postLhsIndex$macro$3$2 = evidence$14.c;
-                var lhsAggregate$macro$6$2 = evidence$14.v;
-                var lhsMsg$macro$9$2 = evidence$14.F;
+              var preLhsIndex$macro$2$2 = evidence$15.c;
+              var input$macro$11$2 = evidence$15.T;
+              $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$15);
+              if (evidence$15.d) {
+                var postLhsIndex$macro$3$2 = evidence$15.c;
+                var lhsAggregate$macro$6$2 = evidence$15.r;
+                var lhsMsg$macro$9$2 = evidence$15.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-                  evidence$14.P();
+                  evidence$15.P();
                 }
-                var lhsValue$macro$12$2 = evidence$14.D;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                if (evidence$14.d) {
-                  if ((!((!evidence$14.d) && evidence$14.p))) {
-                    var preRhsIndex$macro$4$2 = evidence$14.c;
+                var lhsValue$macro$12$2 = evidence$15.D;
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                if (evidence$15.d) {
+                  if ((!((!evidence$15.d) && evidence$15.o))) {
+                    var preRhsIndex$macro$4$2 = evidence$15.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.sq.a0I(evidence$14);
-                    if (evidence$14.d) {
-                      var postLhsIndex$macro$3$3 = evidence$14.c;
-                      var lhsAggregate$macro$6$3 = evidence$14.v;
-                      var lhsMsg$macro$9$3 = evidence$14.F;
+                    var preLhsIndex$macro$2$3 = evidence$15.c;
+                    var input$macro$11$3 = evidence$15.T;
+                    this.sF.a1j(evidence$15);
+                    if (evidence$15.d) {
+                      var postLhsIndex$macro$3$3 = evidence$15.c;
+                      var lhsAggregate$macro$6$3 = evidence$15.r;
+                      var lhsMsg$macro$9$3 = evidence$15.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$14.P();
+                        evidence$15.P();
                       }
-                      var lhsValue$macro$12$3 = evidence$14.D;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                      if (evidence$14.d) {
-                        if ((!((!evidence$14.d) && evidence$14.p))) {
-                          var preRhsIndex$macro$4$3 = evidence$14.c;
-                          var f = (() => this.a0L(evidence$14));
-                          var startIndex$3 = evidence$14.c;
-                          var instrument$3 = (evidence$14.M !== null);
+                      var lhsValue$macro$12$3 = evidence$15.D;
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                      if (evidence$15.d) {
+                        if ((!((!evidence$15.d) && evidence$15.o))) {
+                          var preRhsIndex$macro$4$3 = evidence$15.c;
+                          var f = (() => this.a1m(evidence$15));
+                          var startIndex$3 = evidence$15.c;
+                          var instrument$3 = (evidence$15.M !== null);
                           if (instrument$3) {
-                            evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
+                            evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                           }
-                          var oldCut = evidence$14.p;
-                          evidence$14.p = false;
-                          var startPos = evidence$14.c;
-                          var startIndex$4 = evidence$14.c;
-                          var instrument$4 = (evidence$14.M !== null);
+                          var oldCut = evidence$15.o;
+                          evidence$15.o = false;
+                          var startPos = evidence$15.c;
+                          var startIndex$4 = evidence$15.c;
+                          var instrument$4 = (evidence$15.M !== null);
                           if (instrument$4) {
-                            evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
+                            evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                           }
-                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
-                          var preLhsIndex$macro$17$1 = evidence$14.c;
-                          var input$macro$26$1 = evidence$14.T;
+                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
+                          var preLhsIndex$macro$17$1 = evidence$15.c;
+                          var input$macro$26$1 = evidence$15.T;
                           $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-                          var preLhsIndex$macro$2$4 = evidence$14.c;
-                          var input$macro$11$4 = evidence$14.T;
-                          var input = evidence$14.T;
-                          var index = evidence$14.c;
+                          var preLhsIndex$macro$2$4 = evidence$15.c;
+                          var input$macro$11$4 = evidence$15.T;
+                          var input = evidence$15.T;
+                          var index = evidence$15.c;
                           if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
-                            evidence$14.aJ(((1 + index) | 0));
+                            evidence$15.aJ(((1 + index) | 0));
                           } else {
-                            evidence$14.aH();
+                            evidence$15.aE();
                           }
-                          if (evidence$14.C) {
-                            evidence$14.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
+                          if (evidence$15.C) {
+                            evidence$15.at(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                           }
-                          if ((!evidence$14.d)) {
+                          if ((!evidence$15.d)) {
                           } else {
-                            var postLhsIndex$macro$3$4 = evidence$14.c;
-                            var lhsAggregate$macro$6$4 = evidence$14.v;
-                            var lhsMsg$macro$9$4 = evidence$14.F;
+                            var postLhsIndex$macro$3$4 = evidence$15.c;
+                            var lhsAggregate$macro$6$4 = evidence$15.r;
+                            var lhsMsg$macro$9$4 = evidence$15.F;
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                              evidence$14.P();
+                              evidence$15.P();
                             }
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                            if (evidence$14.d) {
-                              if (((!evidence$14.d) && evidence$14.p)) {
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                            if (evidence$15.d) {
+                              if (((!evidence$15.d) && evidence$15.o)) {
                               } else {
-                                var preRhsIndex$macro$4$4 = evidence$14.c;
+                                var preRhsIndex$macro$4$4 = evidence$15.c;
                                 f();
-                                var rhsAggregate$macro$7 = evidence$14.v;
-                                var rhsMsg$macro$8 = evidence$14.F;
-                                if ((!evidence$14.d)) {
-                                  var res$macro$14 = evidence$14;
+                                var rhsAggregate$macro$7 = evidence$15.r;
+                                var rhsMsg$macro$8 = evidence$15.F;
+                                if ((!evidence$15.d)) {
+                                  var res$macro$14 = evidence$15;
                                 } else {
-                                  var postRhsIndex$macro$5 = evidence$14.c;
+                                  var postRhsIndex$macro$5 = evidence$15.c;
                                   var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$4);
                                   var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
                                   if (rhsMadeProgress$macro$10) {
-                                    evidence$14.P();
+                                    evidence$15.P();
                                   }
-                                  var res$macro$14 = evidence$14.ab(evidence$14.D, nextIndex$macro$13);
+                                  var res$macro$14 = evidence$15.a8(evidence$15.D, nextIndex$macro$13);
                                 }
-                                if (evidence$14.C) {
-                                  evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$14.S));
+                                if (evidence$15.C) {
+                                  evidence$15.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$15.S));
                                 }
                               }
                             }
                           }
-                          if ((!evidence$14.d)) {
-                            var x1$8 = evidence$14;
+                          if ((!evidence$15.d)) {
+                            var x1$8 = evidence$15;
                           } else {
-                            var postLhsIndex$macro$18 = evidence$14.c;
-                            var lhsAggregate$macro$21 = evidence$14.v;
-                            var lhsMsg$macro$24 = evidence$14.F;
+                            var postLhsIndex$macro$18 = evidence$15.c;
+                            var lhsAggregate$macro$21 = evidence$15.r;
+                            var lhsMsg$macro$24 = evidence$15.F;
                             if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-                              evidence$14.P();
+                              evidence$15.P();
                             }
-                            var lhsValue$macro$27 = evidence$14.D;
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                            if (evidence$14.d) {
-                              if (((!evidence$14.d) && evidence$14.p)) {
-                                var x1$8 = evidence$14;
+                            var lhsValue$macro$27 = evidence$15.D;
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                            if (evidence$15.d) {
+                              if (((!evidence$15.d) && evidence$15.o)) {
+                                var x1$8 = evidence$15;
                               } else {
-                                var preRhsIndex$macro$19 = evidence$14.c;
-                                var input$2 = evidence$14.T;
-                                var index$2 = evidence$14.c;
+                                var preRhsIndex$macro$19 = evidence$15.c;
+                                var input$2 = evidence$15.T;
+                                var index$2 = evidence$15.c;
                                 if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                                  evidence$14.aJ(((1 + index$2) | 0));
+                                  evidence$15.aJ(((1 + index$2) | 0));
                                 } else {
-                                  evidence$14.aH();
+                                  evidence$15.aE();
                                 }
-                                if (evidence$14.C) {
-                                  evidence$14.av(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
+                                if (evidence$15.C) {
+                                  evidence$15.at(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                                 }
-                                var rhsAggregate$macro$22 = evidence$14.v;
-                                var rhsMsg$macro$23 = evidence$14.F;
-                                if ((!evidence$14.d)) {
-                                  var res$macro$29 = evidence$14;
+                                var rhsAggregate$macro$22 = evidence$15.r;
+                                var rhsMsg$macro$23 = evidence$15.F;
+                                if ((!evidence$15.d)) {
+                                  var res$macro$29 = evidence$15;
                                 } else {
-                                  var postRhsIndex$macro$20 = evidence$14.c;
+                                  var postRhsIndex$macro$20 = evidence$15.c;
                                   var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
                                   var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                                   if (rhsMadeProgress$macro$25) {
-                                    evidence$14.P();
+                                    evidence$15.P();
                                   }
-                                  var res$macro$29 = evidence$14.ab(lhsValue$macro$27, nextIndex$macro$28);
+                                  var res$macro$29 = evidence$15.a8(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$15.C) {
+                                  evidence$15.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$15.S));
                                 }
                                 var x1$8 = res$macro$29;
                               }
                             } else {
-                              var x1$8 = evidence$14;
+                              var x1$8 = evidence$15;
                             }
                           }
                           if (instrument$4) {
-                            evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
+                            evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                           }
                           if (x1$8.C) {
-                            var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
+                            var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                             var forceAggregate = (startIndex$4 < x1$8.S);
-                            x1$8.K(newshortMsg, x1$8.v, forceAggregate);
+                            x1$8.K(newshortMsg, x1$8.r, forceAggregate);
                             if ((!x1$8.d)) {
-                              x1$8.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.Y);
+                              x1$8.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.a0);
                             }
                           }
-                          var lhsMsg = evidence$14.F;
-                          var lhsAggregate = evidence$14.v;
-                          if (evidence$14.d) {
-                            evidence$14.p = (!(!(evidence$14.p | oldCut)));
-                            var x1$3$3 = evidence$14;
-                          } else if (evidence$14.p) {
-                            var x1$3$3 = evidence$14;
+                          var lhsMsg = evidence$15.F;
+                          var lhsAggregate = evidence$15.r;
+                          if (evidence$15.d) {
+                            evidence$15.o = (!(!(evidence$15.o | oldCut)));
+                            var x1$3$3 = evidence$15;
+                          } else if (evidence$15.o) {
+                            var x1$3$3 = evidence$15;
                           } else {
-                            var verboseFailures = evidence$14.C;
-                            evidence$14.c = startPos;
+                            var verboseFailures = evidence$15.C;
+                            evidence$15.c = startPos;
                             if (verboseFailures) {
-                              evidence$14.K(lhsMsg, evidence$14.v, false);
+                              evidence$15.K(lhsMsg, evidence$15.r, false);
                             }
-                            evidence$14.p = false;
-                            var startIndex$5 = evidence$14.c;
-                            var instrument$5 = (evidence$14.M !== null);
+                            evidence$15.o = false;
+                            var startIndex$5 = evidence$15.c;
+                            var instrument$5 = (evidence$15.M !== null);
                             if (instrument$5) {
-                              evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
+                              evidence$15.M.ay(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                             }
-                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
-                            var preLhsIndex$macro$17$2 = evidence$14.c;
-                            var input$macro$26$2 = evidence$14.T;
+                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().em();
+                            var preLhsIndex$macro$17$2 = evidence$15.c;
+                            var input$macro$26$2 = evidence$15.T;
                             $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-                            var preLhsIndex$macro$2$5 = evidence$14.c;
-                            var input$macro$11$5 = evidence$14.T;
-                            var input$1 = evidence$14.T;
-                            var index$1 = evidence$14.c;
+                            var preLhsIndex$macro$2$5 = evidence$15.c;
+                            var input$macro$11$5 = evidence$15.T;
+                            var input$1 = evidence$15.T;
+                            var index$1 = evidence$15.c;
                             if ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                              evidence$14.aJ(((1 + index$1) | 0));
+                              evidence$15.aJ(((1 + index$1) | 0));
                             } else {
-                              evidence$14.aH();
+                              evidence$15.aE();
                             }
-                            if (evidence$14.C) {
-                              evidence$14.av(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
+                            if (evidence$15.C) {
+                              evidence$15.at(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                             }
-                            if ((!evidence$14.d)) {
+                            if ((!evidence$15.d)) {
                             } else {
-                              var postLhsIndex$macro$3$5 = evidence$14.c;
-                              var lhsAggregate$macro$6$5 = evidence$14.v;
-                              var lhsMsg$macro$9$5 = evidence$14.F;
+                              var postLhsIndex$macro$3$5 = evidence$15.c;
+                              var lhsAggregate$macro$6$5 = evidence$15.r;
+                              var lhsMsg$macro$9$5 = evidence$15.F;
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
-                                evidence$14.P();
+                                evidence$15.P();
                               }
-                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                              if (evidence$14.d) {
-                                if (((!evidence$14.d) && evidence$14.p)) {
+                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                              if (evidence$15.d) {
+                                if (((!evidence$15.d) && evidence$15.o)) {
                                 } else {
-                                  var preRhsIndex$macro$4$5 = evidence$14.c;
+                                  var preRhsIndex$macro$4$5 = evidence$15.c;
                                   f();
-                                  var rhsAggregate$macro$7$1 = evidence$14.v;
-                                  var rhsMsg$macro$8$1 = evidence$14.F;
-                                  if ((!evidence$14.d)) {
-                                    var res$macro$14$1 = evidence$14;
+                                  var rhsAggregate$macro$7$1 = evidence$15.r;
+                                  var rhsMsg$macro$8$1 = evidence$15.F;
+                                  if ((!evidence$15.d)) {
+                                    var res$macro$14$1 = evidence$15;
                                   } else {
-                                    var postRhsIndex$macro$5$1 = evidence$14.c;
+                                    var postRhsIndex$macro$5$1 = evidence$15.c;
                                     var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$5);
                                     var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
                                     if (rhsMadeProgress$macro$10$1) {
-                                      evidence$14.P();
+                                      evidence$15.P();
                                     }
-                                    var res$macro$14$1 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$1);
+                                    var res$macro$14$1 = evidence$15.a8(evidence$15.D, nextIndex$macro$13$1);
                                   }
-                                  if (evidence$14.C) {
-                                    evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$14.S));
+                                  if (evidence$15.C) {
+                                    evidence$15.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$15.S));
                                   }
                                 }
                               }
                             }
-                            if ((!evidence$14.d)) {
-                              var x1$8$1 = evidence$14;
+                            if ((!evidence$15.d)) {
+                              var x1$8$1 = evidence$15;
                             } else {
-                              var postLhsIndex$macro$18$1 = evidence$14.c;
-                              var lhsAggregate$macro$21$1 = evidence$14.v;
-                              var lhsMsg$macro$24$1 = evidence$14.F;
+                              var postLhsIndex$macro$18$1 = evidence$15.c;
+                              var lhsAggregate$macro$21$1 = evidence$15.r;
+                              var lhsMsg$macro$24$1 = evidence$15.F;
                               if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                                evidence$14.P();
+                                evidence$15.P();
                               }
-                              var lhsValue$macro$27$1 = evidence$14.D;
-                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-                              if (evidence$14.d) {
-                                if (((!evidence$14.d) && evidence$14.p)) {
-                                  var x1$8$1 = evidence$14;
+                              var lhsValue$macro$27$1 = evidence$15.D;
+                              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+                              if (evidence$15.d) {
+                                if (((!evidence$15.d) && evidence$15.o)) {
+                                  var x1$8$1 = evidence$15;
                                 } else {
-                                  var preRhsIndex$macro$19$1 = evidence$14.c;
-                                  var input$2$1 = evidence$14.T;
-                                  var index$2$1 = evidence$14.c;
+                                  var preRhsIndex$macro$19$1 = evidence$15.c;
+                                  var input$2$1 = evidence$15.T;
+                                  var index$2$1 = evidence$15.c;
                                   if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                                    evidence$14.aJ(((1 + index$2$1) | 0));
+                                    evidence$15.aJ(((1 + index$2$1) | 0));
                                   } else {
-                                    evidence$14.aH();
+                                    evidence$15.aE();
                                   }
-                                  if (evidence$14.C) {
-                                    evidence$14.av(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
+                                  if (evidence$15.C) {
+                                    evidence$15.at(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                                   }
-                                  var rhsAggregate$macro$22$1 = evidence$14.v;
-                                  var rhsMsg$macro$23$1 = evidence$14.F;
-                                  if ((!evidence$14.d)) {
-                                    var res$macro$29$1 = evidence$14;
+                                  var rhsAggregate$macro$22$1 = evidence$15.r;
+                                  var rhsMsg$macro$23$1 = evidence$15.F;
+                                  if ((!evidence$15.d)) {
+                                    var res$macro$29$1 = evidence$15;
                                   } else {
-                                    var postRhsIndex$macro$20$1 = evidence$14.c;
+                                    var postRhsIndex$macro$20$1 = evidence$15.c;
                                     var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
                                     var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.V(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                                     if (rhsMadeProgress$macro$25$1) {
-                                      evidence$14.P();
+                                      evidence$15.P();
                                     }
-                                    var res$macro$29$1 = evidence$14.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                                    var res$macro$29$1 = evidence$15.a8(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$15.C) {
+                                    evidence$15.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$15.S));
                                   }
                                   var x1$8$1 = res$macro$29$1;
                                 }
                               } else {
-                                var x1$8$1 = evidence$14;
+                                var x1$8$1 = evidence$15;
                               }
                             }
                             if (instrument$5) {
-                              evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
+                              evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                             }
                             if (x1$8$1.C) {
-                              var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
+                              var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                               var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
-                              x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
+                              x1$8$1.K(newshortMsg$1, x1$8$1.r, forceAggregate$1);
                               if ((!x1$8$1.d)) {
-                                x1$8$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.Y);
+                                x1$8$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.a0);
                               }
                             }
-                            var rhsMsg = evidence$14.F;
-                            var rhsCut = evidence$14.p;
+                            var rhsMsg = evidence$15.F;
+                            var rhsCut = evidence$15.o;
                             var endCut = (!(!(rhsCut | oldCut)));
-                            if (((!evidence$14.d) && (!rhsCut))) {
-                              evidence$14.d1(startPos);
+                            if (((!evidence$15.d) && (!rhsCut))) {
+                              evidence$15.d2(startPos);
                             }
-                            evidence$14.p = endCut;
+                            evidence$15.o = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
-                              var rassoc$3 = evidence$14.v;
-                              evidence$14.K($x_1, lhsAggregate.W(rassoc$3), false);
+                              var rassoc$3 = evidence$15.r;
+                              evidence$15.K($x_1, lhsAggregate.W(rassoc$3), false);
                             }
-                            var x1$3$3 = evidence$14;
+                            var x1$3$3 = evidence$15;
                           }
                           if (instrument$3) {
-                            evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
+                            evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                           }
                           if (x1$3$3.C) {
-                            var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
+                            var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                             var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
-                            x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
+                            x1$3$3.K(newshortMsg$3, x1$3$3.r, forceAggregate$2);
                             if ((!x1$3$3.d)) {
-                              x1$3$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.Y);
+                              x1$3$3.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.a0);
                             }
                           }
-                          var rhsAggregate$macro$7$2 = evidence$14.v;
-                          var rhsMsg$macro$8$2 = evidence$14.F;
-                          if ((!evidence$14.d)) {
+                          var rhsAggregate$macro$7$2 = evidence$15.r;
+                          var rhsMsg$macro$8$2 = evidence$15.F;
+                          if ((!evidence$15.d)) {
                           } else {
-                            var postRhsIndex$macro$5$2 = evidence$14.c;
+                            var postRhsIndex$macro$5$2 = evidence$15.c;
                             var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.V(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
                             if (rhsMadeProgress$macro$10$2) {
-                              evidence$14.P();
+                              evidence$15.P();
                             }
-                            evidence$14.ab(x1$2$2.aG(lhsValue$macro$12$3, evidence$14.D), nextIndex$macro$13$2);
+                            evidence$15.a8(x1$2$2.aG(lhsValue$macro$12$3, evidence$15.D), nextIndex$macro$13$2);
                           }
-                          if (evidence$14.C) {
-                            evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$14.S));
+                          if (evidence$15.C) {
+                            evidence$15.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$15.S));
                           }
                         }
                       }
                     }
-                    var rhsAggregate$macro$7$3 = evidence$14.v;
-                    var rhsMsg$macro$8$3 = evidence$14.F;
-                    if ((!evidence$14.d)) {
+                    var rhsAggregate$macro$7$3 = evidence$15.r;
+                    var rhsMsg$macro$8$3 = evidence$15.F;
+                    if ((!evidence$15.d)) {
                     } else {
-                      var postRhsIndex$macro$5$3 = evidence$14.c;
+                      var postRhsIndex$macro$5$3 = evidence$15.c;
                       var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$2);
                       var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.V(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
                       if (rhsMadeProgress$macro$10$3) {
-                        evidence$14.P();
+                        evidence$15.P();
                       }
-                      evidence$14.ab(x1$2$1.aG(lhsValue$macro$12$2, evidence$14.D), nextIndex$macro$13$3);
+                      evidence$15.a8(x1$2$1.aG(lhsValue$macro$12$2, evidence$15.D), nextIndex$macro$13$3);
                     }
-                    if (evidence$14.C) {
-                      evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$14.S));
+                    if (evidence$15.C) {
+                      evidence$15.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$15.S));
                     }
                   }
                 }
               }
-              var rhsAggregate$macro$7$4 = evidence$14.v;
-              var rhsMsg$macro$8$4 = evidence$14.F;
-              if ((!evidence$14.d)) {
-                evidence$14.p = true;
-                var res$macro$14$4 = evidence$14;
+              var rhsAggregate$macro$7$4 = evidence$15.r;
+              var rhsMsg$macro$8$4 = evidence$15.F;
+              if ((!evidence$15.d)) {
+                evidence$15.o = true;
+                var res$macro$14$4 = evidence$15;
               } else {
-                var postRhsIndex$macro$5$4 = evidence$14.c;
+                var postRhsIndex$macro$5$4 = evidence$15.c;
                 var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.V(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
                 if (rhsMadeProgress$macro$10$4) {
-                  evidence$14.P();
+                  evidence$15.P();
                 }
-                var res$macro$14$4 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$4);
+                var res$macro$14$4 = evidence$15.a8(evidence$15.D, nextIndex$macro$13$4);
               }
-              if (evidence$14.C) {
-                evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$14.S));
+              if (evidence$15.C) {
+                evidence$15.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$15.S));
               }
               var x1$4$1 = res$macro$14$4;
             }
           } else {
-            var x1$4$1 = evidence$14;
+            var x1$4$1 = evidence$15;
           }
         }
         if (instrument$2) {
-          evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
+          evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
-          var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
+          var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.r, forceAggregate$3);
           if ((!x1$4$1.d)) {
-            x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
+            x1$4$1.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.a0);
           }
         }
-        var rhsAggregate$macro$7$5 = evidence$14.v;
-        var rhsMsg$macro$8$5 = evidence$14.F;
-        if ((!evidence$14.d)) {
-          var res$macro$14$5 = evidence$14;
+        var rhsAggregate$macro$7$5 = evidence$15.r;
+        var rhsMsg$macro$8$5 = evidence$15.F;
+        if ((!evidence$15.d)) {
+          var res$macro$14$5 = evidence$15;
         } else {
-          var postRhsIndex$macro$5$5 = evidence$14.c;
+          var postRhsIndex$macro$5$5 = evidence$15.c;
           var rhsMadeProgress$macro$10$5 = (postRhsIndex$macro$5$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.V(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
           if (rhsMadeProgress$macro$10$5) {
-            evidence$14.P();
+            evidence$15.P();
           }
-          var res$macro$14$5 = evidence$14.ab(x1$4.aG((lhsValue$macro$12 | 0), evidence$14.D), nextIndex$macro$13$5);
+          var res$macro$14$5 = evidence$15.a8(x1$4.aG((lhsValue$macro$12 | 0), evidence$15.D), nextIndex$macro$13$5);
         }
-        if (evidence$14.C) {
-          evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$14.S));
+        if (evidence$15.C) {
+          evidence$15.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$15.S));
         }
       }
     }
   }
-  if ((!evidence$14.d)) {
-    var parse0$7 = evidence$14;
+  if ((!evidence$15.d)) {
+    var parse0$7 = evidence$15;
   } else {
-    var postLhsIndex$macro$18$2 = evidence$14.c;
-    var lhsAggregate$macro$21$2 = evidence$14.v;
-    var lhsMsg$macro$24$2 = evidence$14.F;
+    var postLhsIndex$macro$18$2 = evidence$15.c;
+    var lhsAggregate$macro$21$2 = evidence$15.r;
+    var lhsMsg$macro$24$2 = evidence$15.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
-      evidence$14.P();
+      evidence$15.P();
     }
-    var lhsValue$macro$27$2 = evidence$14.D;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$14);
-    if (evidence$14.d) {
-      if (((!evidence$14.d) && evidence$14.p)) {
-        var parse0$7 = evidence$14;
+    var lhsValue$macro$27$2 = evidence$15.D;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ab($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$15);
+    if (evidence$15.d) {
+      if (((!evidence$15.d) && evidence$15.o)) {
+        var parse0$7 = evidence$15;
       } else {
-        var preRhsIndex$macro$19$2 = evidence$14.c;
-        $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$14);
-        var rhsAggregate$macro$22$2 = evidence$14.v;
-        var rhsMsg$macro$23$2 = evidence$14.F;
-        if ((!evidence$14.d)) {
-          var res$macro$29$2 = evidence$14;
+        var preRhsIndex$macro$19$2 = evidence$15.c;
+        $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$15);
+        var rhsAggregate$macro$22$2 = evidence$15.r;
+        var rhsMsg$macro$23$2 = evidence$15.F;
+        if ((!evidence$15.d)) {
+          var res$macro$29$2 = evidence$15;
         } else {
-          var postRhsIndex$macro$20$2 = evidence$14.c;
+          var postRhsIndex$macro$20$2 = evidence$15.c;
           var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
           var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.V(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
           if (rhsMadeProgress$macro$25$2) {
-            evidence$14.P();
+            evidence$15.P();
           }
-          var res$macro$29$2 = evidence$14.ab(x1$2.aG(lhsValue$macro$27$2, (evidence$14.D | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$15.a8(x1$2.aG(lhsValue$macro$27$2, (evidence$15.D | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$14.C) {
-          evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$14.S));
+        if (evidence$15.C) {
+          evidence$15.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$15.S));
         }
         var parse0$7 = res$macro$29$2;
       }
     } else {
-      var parse0$7 = evidence$14;
+      var parse0$7 = evidence$15;
     }
   }
   if ((!parse0$7.d)) {
@@ -2310,23 +2411,23 @@ $p.agb = (function(evidence$14) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aX | 0);
-    var value = x0.bj;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    var start = (x0.aS | 0);
+    var value = x0.b5;
+    var stop = (x0.bd | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cK(this$1.br.c9, stop);
+    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fC, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
-    evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+    evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
   }
   if (x1$2$3.C) {
-    var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
+    var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$4 = (startIndex$1 < x1$2$3.S);
-    x1$2$3.K(newshortMsg$5, x1$2$3.v, forceAggregate$4);
+    x1$2$3.K(newshortMsg$5, x1$2$3.r, forceAggregate$4);
     if ((!x1$2$3.d)) {
-      x1$2$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$3.Y);
+      x1$2$3.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$3.a0);
     }
   }
   if ((!x1$2$3.d)) {
@@ -2359,14 +2460,14 @@ $p.agb = (function(evidence$14) {
     var x1$2$4 = parse0$8;
   }
   if (instrument) {
-    evidence$14.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, x1$2$4.c, x1$2$4.d);
+    evidence$15.M.aw(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, x1$2$4.c, x1$2$4.d);
   }
   if (x1$2$4.C) {
-    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B)));
+    var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().Y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B)));
     var forceAggregate$5 = (startIndex < x1$2$4.S);
-    x1$2$4.K(newshortMsg$6, x1$2$4.v, forceAggregate$5);
+    x1$2$4.K(newshortMsg$6, x1$2$4.r, forceAggregate$5);
     if ((!x1$2$4.d)) {
-      x1$2$4.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex), x1$2$4.Y);
+      x1$2$4.a0 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex), x1$2$4.a0);
     }
   }
   if ((!x1$2$4.d)) {
@@ -2376,9 +2477,9 @@ $p.agb = (function(evidence$14) {
     matchEnd4$2: {
       var $x_3;
       if ((x0$3 !== null)) {
-        var meta = x0$3.aX;
-        var name = x0$3.bj;
-        var p2$1 = x0$3.br;
+        var meta = x0$3.aS;
+        var name = x0$3.b5;
+        var p2$1 = x0$3.bd;
         if ((p2$1 !== null)) {
           var derived = p2$1.E();
           var $x_3 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), p2$1.z(), derived, meta);
@@ -2392,7 +2493,7 @@ $p.agb = (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", ({
-  vz: 1
+  vH: 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