@7mind.io/baboon 0.0.167 → 0.0.168

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

@@ -38,8 +38,8 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefDto(context, meta) {
-  this.sq = null;
-  this.sq = meta;
+  this.sr = null;
+  this.sr = meta;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefDto as $c_Lio_septimalmind_baboon_parser_defns_DefDto };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -49,7 +49,7 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefDto() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefDto as $h_Lio_septimalmind_baboon_parser_defns_DefDto };
 $h_Lio_septimalmind_baboon_parser_defns_DefDto.prototype = $p;
-$p.aQe = (function(evidence$1) {
+$p.aQ7 = (function(evidence$1) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
@@ -76,7 +76,7 @@ $p.aQe = (function(evidence$1) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      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();
@@ -86,15 +86,15 @@ $p.aQe = (function(evidence$1) {
         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.aiL(evidence$1);
           var parsedMsg = evidence$1.F;
           var parsedAgg = evidence$1.v;
-          var postCut = evidence$1.p;
+          var postCut = evidence$1.o;
           var verboseFailures = evidence$1.C;
           if ((!evidence$1.d)) {
             if (postCut) {
@@ -111,15 +111,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$().ac(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());
               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((() => "\",\""))));
               }
-              var sepCut = evidence$1.p;
+              var sepCut = evidence$1.o;
               var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
               if ((res$2 === null)) {
                 startIndex = beforeSepIndex;
@@ -130,7 +130,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$().ac(whitespace, evidence$1), (!((!evidence$1.d) && (sepCut || evidence$1.o)))))) {
                   startIndex = beforeSepIndex;
                   count = nextCount;
                   precut = sepCut;
@@ -142,7 +142,7 @@ $p.aQe = (function(evidence$1) {
                 }
               } else {
                 if (sepCut) {
-                  evidence$1.Bh(beforeSepIndex, endCut);
+                  evidence$1.Bg(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);
                 }
@@ -169,7 +169,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.aa(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));
@@ -189,7 +189,7 @@ $p.aQe = (function(evidence$1) {
     var lhsValue$macro$27 = evidence$1.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
         var parse0$1 = evidence$1;
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
@@ -214,7 +214,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.aa(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));
@@ -235,7 +235,7 @@ $p.aQe = (function(evidence$1) {
     return parse0$1;
   }
 });
-$p.TV = (function(evidence$2) {
+$p.TS = (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;
@@ -247,11 +247,11 @@ $p.TV = (function(evidence$2) {
     return parse0;
   }
 });
-$p.aiO = (function(evidence$3) {
+$p.aiL = (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.TS(evidence$3);
   if ((!evidence$3.d)) {
     var parse0$2 = evidence$3;
   } else {
@@ -264,24 +264,24 @@ $p.aiO = (function(evidence$3) {
     var lhsValue$macro$12 = evidence$3.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
-      if (((!evidence$3.d) && evidence$3.p)) {
+      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$().AV();
         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.aQ7(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) {
+          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.aa($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;
@@ -300,7 +300,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.aa(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,8 +320,8 @@ $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.qS.bg().gG;
+    var prefix = ref.qS.fc();
     if ((params instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
       var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Constructor(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), params.af.ay, prefix);
     } else {
@@ -334,7 +334,7 @@ $p.aiO = (function(evidence$3) {
     return parse0$2;
   }
 });
-$p.aIn = (function(evidence$4) {
+$p.aIg = (function(evidence$4) {
   var parse0 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$4);
   if ((!parse0.d)) {
     return parse0;
@@ -343,7 +343,7 @@ $p.aIn = (function(evidence$4) {
     return parse0;
   }
 });
-$p.aGW = (function(evidence$5) {
+$p.aGP = (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;
@@ -379,11 +379,11 @@ $p.aGW = (function(evidence$5) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
-      if (((!evidence$5.d) && evidence$5.p)) {
+      if (((!evidence$5.d) && evidence$5.o)) {
         var parse0 = evidence$5;
       } else {
         var preRhsIndex$macro$6 = evidence$5.c;
-        this.TV(evidence$5);
+        this.TS(evidence$5);
         var rhsAggregate$macro$9 = evidence$5.v;
         var rhsMsg$macro$10 = evidence$5.F;
         if ((!evidence$5.d)) {
@@ -395,7 +395,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.aa(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,8 +413,8 @@ $p.aGW = (function(evidence$5) {
     return parse0;
   }
 });
-$p.axH = (function(evidence$6) {
-  var this$1 = this.sq;
+$p.axA = (function(evidence$6) {
+  var this$1 = this.sr;
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.M !== null);
   if (instrument) {
@@ -438,10 +438,10 @@ $p.axH = (function(evidence$6) {
     var lhsValue$macro$12 = evidence$6.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
-      if (((!evidence$6.d) && evidence$6.p)) {
+      if (((!evidence$6.d) && evidence$6.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$6.c;
-        this.aGW(evidence$6);
+        this.aGP(evidence$6);
         var rhsAggregate$macro$7 = evidence$6.v;
         var rhsMsg$macro$8 = evidence$6.F;
         if ((!evidence$6.d)) {
@@ -453,7 +453,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.aa(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));
@@ -473,7 +473,7 @@ $p.axH = (function(evidence$6) {
     var lhsValue$macro$27 = evidence$6.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
-      if (((!evidence$6.d) && evidence$6.p)) {
+      if (((!evidence$6.d) && evidence$6.o)) {
         var parse0$2 = evidence$6;
       } else {
         var preRhsIndex$macro$19 = evidence$6.c;
@@ -489,7 +489,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.aa(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));
@@ -508,11 +508,11 @@ $p.axH = (function(evidence$6) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aX | 0);
-    var value = x0.bj;
+    var value = x0.bk;
     var stop = (x0.br | 0);
     var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
     var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$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);
+    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.fz, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument) {
@@ -548,14 +548,14 @@ $p.axH = (function(evidence$6) {
     return parse0$3;
   }
 });
-$p.axO = (function(evidence$7) {
+$p.axH = (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);
+  this.aIg(evidence$7);
   if ((!evidence$7.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$7.c;
@@ -567,7 +567,7 @@ $p.axO = (function(evidence$7) {
     var lhsValue$macro$12 = evidence$7.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+      if (((!evidence$7.d) && evidence$7.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$7.c;
         var input = evidence$7.T;
@@ -591,7 +591,7 @@ $p.axO = (function(evidence$7) {
           if (rhsMadeProgress$macro$10) {
             evidence$7.P();
           }
-          var res$macro$14 = evidence$7.ab(lhsValue$macro$12, nextIndex$macro$13);
+          var res$macro$14 = evidence$7.aa(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));
@@ -611,11 +611,11 @@ $p.axO = (function(evidence$7) {
     var lhsValue$macro$27 = evidence$7.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
-      if (((!evidence$7.d) && evidence$7.p)) {
+      if (((!evidence$7.d) && evidence$7.o)) {
         var parse0$2 = evidence$7;
       } else {
         var preRhsIndex$macro$19 = evidence$7.c;
-        this.aiO(evidence$7);
+        this.aiL(evidence$7);
         var rhsAggregate$macro$22 = evidence$7.v;
         var rhsMsg$macro$23 = evidence$7.F;
         if ((!evidence$7.d)) {
@@ -627,7 +627,7 @@ $p.axO = (function(evidence$7) {
           if (rhsMadeProgress$macro$25) {
             evidence$7.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$7.aa(x1$2.aG(lhsValue$macro$27, evidence$7.D), nextIndex$macro$28);
         }
         if (evidence$7.C) {
           evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$7.S));
@@ -649,7 +649,7 @@ $p.axO = (function(evidence$7) {
     return parse0$2;
   }
 });
-$p.aN4 = (function(evidence$8) {
+$p.aMX = (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;
@@ -674,11 +674,11 @@ $p.aN4 = (function(evidence$8) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
-      if (((!evidence$8.d) && evidence$8.p)) {
+      if (((!evidence$8.d) && evidence$8.o)) {
         return evidence$8;
       } else {
         var preRhsIndex$macro$4 = evidence$8.c;
-        this.TV(evidence$8);
+        this.TS(evidence$8);
         var rhsAggregate$macro$7 = evidence$8.v;
         var rhsMsg$macro$8 = evidence$8.F;
         if ((!evidence$8.d)) {
@@ -690,7 +690,7 @@ $p.aN4 = (function(evidence$8) {
           if (rhsMadeProgress$macro$10) {
             evidence$8.P();
           }
-          var res$macro$14 = evidence$8.ab(evidence$8.D, nextIndex$macro$13);
+          var res$macro$14 = evidence$8.aa(evidence$8.D, nextIndex$macro$13);
         }
         if (evidence$8.C) {
           evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
@@ -702,7 +702,7 @@ $p.aN4 = (function(evidence$8) {
     }
   }
 });
-$p.aQm = (function(evidence$9) {
+$p.aQf = (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;
@@ -727,11 +727,11 @@ $p.aQm = (function(evidence$9) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
-      if (((!evidence$9.d) && evidence$9.p)) {
+      if (((!evidence$9.d) && evidence$9.o)) {
         return evidence$9;
       } else {
         var preRhsIndex$macro$4 = evidence$9.c;
-        this.TV(evidence$9);
+        this.TS(evidence$9);
         var rhsAggregate$macro$7 = evidence$9.v;
         var rhsMsg$macro$8 = evidence$9.F;
         if ((!evidence$9.d)) {
@@ -743,7 +743,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.aa(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,7 +755,7 @@ $p.aQm = (function(evidence$9) {
     }
   }
 });
-$p.aKj = (function(evidence$10) {
+$p.aKc = (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;
@@ -780,11 +780,11 @@ $p.aKj = (function(evidence$10) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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);
+        this.TS(evidence$10);
         var rhsAggregate$macro$7 = evidence$10.v;
         var rhsMsg$macro$8 = evidence$10.F;
         if ((!evidence$10.d)) {
@@ -796,7 +796,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.aa(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,7 +808,7 @@ $p.aKj = (function(evidence$10) {
     }
   }
 });
-$p.aQi = (function(evidence$11) {
+$p.aQb = (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;
@@ -833,11 +833,11 @@ $p.aQi = (function(evidence$11) {
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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);
+        this.axH(evidence$11);
         var rhsAggregate$macro$7 = evidence$11.v;
         var rhsMsg$macro$8 = evidence$11.F;
         if ((!evidence$11.d)) {
@@ -849,7 +849,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.aa(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,28 +861,28 @@ $p.aQi = (function(evidence$11) {
     }
   }
 });
-$p.aHH = (function(evidence$12) {
-  var oldCut = evidence$12.p;
-  evidence$12.p = false;
+$p.aHA = (function(evidence$12) {
+  var oldCut = evidence$12.o;
+  evidence$12.o = false;
   var startPos = evidence$12.c;
-  var oldCut$2 = evidence$12.p;
-  evidence$12.p = false;
+  var oldCut$2 = evidence$12.o;
+  evidence$12.o = false;
   var startPos$2 = evidence$12.c;
-  var oldCut$3 = evidence$12.p;
-  evidence$12.p = false;
+  var oldCut$3 = evidence$12.o;
+  evidence$12.o = false;
   var startPos$3 = evidence$12.c;
-  var oldCut$4 = evidence$12.p;
-  evidence$12.p = false;
+  var oldCut$4 = evidence$12.o;
+  evidence$12.o = false;
   var startPos$4 = evidence$12.c;
-  var oldCut$5 = evidence$12.p;
-  evidence$12.p = false;
+  var oldCut$5 = evidence$12.o;
+  evidence$12.o = 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 this$1 = this.sr;
   var startIndex$1 = evidence$12.c;
   var instrument$1 = (evidence$12.M !== null);
   if (instrument$1) {
@@ -906,10 +906,10 @@ $p.aHH = (function(evidence$12) {
     var lhsValue$macro$12 = evidence$12.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$12);
     if (evidence$12.d) {
-      if (((!evidence$12.d) && evidence$12.p)) {
+      if (((!evidence$12.d) && evidence$12.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$12.c;
-        this.axO(evidence$12);
+        this.axH(evidence$12);
         var rhsAggregate$macro$7 = evidence$12.v;
         var rhsMsg$macro$8 = evidence$12.F;
         if ((!evidence$12.d)) {
@@ -921,7 +921,7 @@ $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.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$12.D), nextIndex$macro$13);
         }
         if (evidence$12.C) {
           evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$12.S));
@@ -941,7 +941,7 @@ $p.aHH = (function(evidence$12) {
     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)) {
+      if (((!evidence$12.d) && evidence$12.o)) {
         var parse0$2 = evidence$12;
       } else {
         var preRhsIndex$macro$19 = evidence$12.c;
@@ -957,7 +957,7 @@ $p.aHH = (function(evidence$12) {
           if (rhsMadeProgress$macro$25) {
             evidence$12.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$12.aa(x1$2.aG(lhsValue$macro$27, (evidence$12.D | 0)), nextIndex$macro$28);
         }
         if (evidence$12.C) {
           evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$12.S));
@@ -976,11 +976,11 @@ $p.aHH = (function(evidence$12) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aX | 0);
-    var value = x0.bj;
+    var value = x0.bk;
     var stop = (x0.br | 0);
     var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
     var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$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);
+    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.fz, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument$1) {
@@ -1027,21 +1027,21 @@ $p.aHH = (function(evidence$12) {
   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) {
+    evidence$12.o = (!(!(evidence$12.o | oldCut$5)));
+  } else if (evidence$12.o) {
   } else {
     var verboseFailures = evidence$12.C;
     evidence$12.c = startPos$5;
     if (verboseFailures) {
       evidence$12.K(lhsMsg, evidence$12.v, false);
     }
-    evidence$12.p = false;
+    evidence$12.o = false;
     var startIndex$2 = evidence$12.c;
     var instrument$2 = (evidence$12.M !== null);
     if (instrument$2) {
       evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$2);
     }
-    var this$18 = this.sq;
+    var this$18 = this.sr;
     var startIndex$3 = evidence$12.c;
     var instrument$3 = (evidence$12.M !== null);
     if (instrument$3) {
@@ -1065,10 +1065,10 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
         } else {
           var preRhsIndex$macro$4$1 = evidence$12.c;
-          this.aN4(evidence$12);
+          this.aMX(evidence$12);
           var rhsAggregate$macro$7$1 = evidence$12.v;
           var rhsMsg$macro$8$1 = evidence$12.F;
           if ((!evidence$12.d)) {
@@ -1080,7 +1080,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$1) {
               evidence$12.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$12.aa(x1$4$1.aG((lhsValue$macro$12$1 | 0), evidence$12.D), nextIndex$macro$13$1);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$1), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$1 === evidence$12.S));
@@ -1100,7 +1100,7 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
           var parse0$6 = evidence$12;
         } else {
           var preRhsIndex$macro$19$1 = evidence$12.c;
@@ -1116,7 +1116,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$1) {
               evidence$12.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$12.aa(x1$2$2.aG(lhsValue$macro$27$1, (evidence$12.D | 0)), nextIndex$macro$28$1);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$12.S));
@@ -1135,11 +1135,11 @@ $p.aHH = (function(evidence$12) {
         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 value$1 = x0$3.bk;
       var stop$1 = (x0$3.br | 0);
       var begin$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().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);
+      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.fz, begin$1, end$1), value$1);
       var x1$2$3 = parse0$6;
     }
     if (instrument$3) {
@@ -1183,12 +1183,12 @@ $p.aHH = (function(evidence$12) {
       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 rhsCut = evidence$12.o;
     var endCut = (!(!(rhsCut | oldCut$5)));
     if (((!evidence$12.d) && (!rhsCut))) {
       evidence$12.d1(startPos$5);
     }
-    evidence$12.p = endCut;
+    evidence$12.o = endCut;
     if (verboseFailures) {
       var $x_1 = lhsMsg.W(rhsMsg);
       var rassoc$3 = evidence$12.v;
@@ -1198,21 +1198,21 @@ $p.aHH = (function(evidence$12) {
   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) {
+    evidence$12.o = (!(!(evidence$12.o | oldCut$4)));
+  } else if (evidence$12.o) {
   } else {
     var verboseFailures$2 = evidence$12.C;
     evidence$12.c = startPos$4;
     if (verboseFailures$2) {
       evidence$12.K(lhsMsg$2, evidence$12.v, false);
     }
-    evidence$12.p = false;
+    evidence$12.o = false;
     var startIndex$3$1 = evidence$12.c;
     var instrument$3$1 = (evidence$12.M !== null);
     if (instrument$3$1) {
       evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$3$1);
     }
-    var this$35 = this.sq;
+    var this$35 = this.sr;
     var startIndex$4 = evidence$12.c;
     var instrument$4 = (evidence$12.M !== null);
     if (instrument$4) {
@@ -1236,10 +1236,10 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
         } else {
           var preRhsIndex$macro$4$2 = evidence$12.c;
-          this.aQi(evidence$12);
+          this.aQb(evidence$12);
           var rhsAggregate$macro$7$2 = evidence$12.v;
           var rhsMsg$macro$8$2 = evidence$12.F;
           if ((!evidence$12.d)) {
@@ -1251,7 +1251,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$2) {
               evidence$12.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$12.aa(x1$4$2.aG((lhsValue$macro$12$2 | 0), evidence$12.D), nextIndex$macro$13$2);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$12.S));
@@ -1271,7 +1271,7 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
           var parse0$10 = evidence$12;
         } else {
           var preRhsIndex$macro$19$2 = evidence$12.c;
@@ -1287,7 +1287,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$2) {
               evidence$12.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$12.aa(x1$2$4.aG(lhsValue$macro$27$2, (evidence$12.D | 0)), nextIndex$macro$28$2);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$12.S));
@@ -1306,11 +1306,11 @@ $p.aHH = (function(evidence$12) {
         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 value$2 = x0$6.bk;
       var stop$2 = (x0$6.br | 0);
       var begin$2 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().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);
+      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.fz, begin$2, end$2), value$2);
       var x1$2$5 = parse0$10;
     }
     if (instrument$4) {
@@ -1354,12 +1354,12 @@ $p.aHH = (function(evidence$12) {
       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 rhsCut$2 = evidence$12.o;
     var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
     if (((!evidence$12.d) && (!rhsCut$2))) {
       evidence$12.d1(startPos$4);
     }
-    evidence$12.p = endCut$2;
+    evidence$12.o = endCut$2;
     if (verboseFailures$2) {
       var $x_2 = lhsMsg$2.W(rhsMsg$2);
       var rassoc$3$2 = evidence$12.v;
@@ -1369,21 +1369,21 @@ $p.aHH = (function(evidence$12) {
   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) {
+    evidence$12.o = (!(!(evidence$12.o | oldCut$3)));
+  } else if (evidence$12.o) {
   } else {
     var verboseFailures$3 = evidence$12.C;
     evidence$12.c = startPos$3;
     if (verboseFailures$3) {
       evidence$12.K(lhsMsg$3, evidence$12.v, false);
     }
-    evidence$12.p = false;
+    evidence$12.o = false;
     var startIndex$4$1 = evidence$12.c;
     var instrument$4$1 = (evidence$12.M !== null);
     if (instrument$4$1) {
       evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$4$1);
     }
-    var this$52 = this.sq;
+    var this$52 = this.sr;
     var startIndex$5 = evidence$12.c;
     var instrument$5 = (evidence$12.M !== null);
     if (instrument$5) {
@@ -1407,10 +1407,10 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
         } else {
           var preRhsIndex$macro$4$3 = evidence$12.c;
-          this.aQm(evidence$12);
+          this.aQf(evidence$12);
           var rhsAggregate$macro$7$3 = evidence$12.v;
           var rhsMsg$macro$8$3 = evidence$12.F;
           if ((!evidence$12.d)) {
@@ -1422,7 +1422,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$3) {
               evidence$12.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$12.aa(x1$4$3.aG((lhsValue$macro$12$3 | 0), evidence$12.D), nextIndex$macro$13$3);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$3), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$3 === evidence$12.S));
@@ -1442,7 +1442,7 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
           var parse0$14 = evidence$12;
         } else {
           var preRhsIndex$macro$19$3 = evidence$12.c;
@@ -1458,7 +1458,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$3) {
               evidence$12.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$12.aa(x1$2$6.aG(lhsValue$macro$27$3, (evidence$12.D | 0)), nextIndex$macro$28$3);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$12.S));
@@ -1477,11 +1477,11 @@ $p.aHH = (function(evidence$12) {
         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 value$3 = x0$9.bk;
       var stop$3 = (x0$9.br | 0);
       var begin$3 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().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);
+      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.fz, begin$3, end$3), value$3);
       var x1$2$7 = parse0$14;
     }
     if (instrument$5) {
@@ -1525,12 +1525,12 @@ $p.aHH = (function(evidence$12) {
       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 rhsCut$3 = evidence$12.o;
     var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
     if (((!evidence$12.d) && (!rhsCut$3))) {
       evidence$12.d1(startPos$3);
     }
-    evidence$12.p = endCut$3;
+    evidence$12.o = endCut$3;
     if (verboseFailures$3) {
       var $x_3 = lhsMsg$3.W(rhsMsg$3);
       var rassoc$3$3 = evidence$12.v;
@@ -1540,21 +1540,21 @@ $p.aHH = (function(evidence$12) {
   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) {
+    evidence$12.o = (!(!(evidence$12.o | oldCut$2)));
+  } else if (evidence$12.o) {
   } else {
     var verboseFailures$4 = evidence$12.C;
     evidence$12.c = startPos$2;
     if (verboseFailures$4) {
       evidence$12.K(lhsMsg$4, evidence$12.v, false);
     }
-    evidence$12.p = false;
+    evidence$12.o = false;
     var startIndex$5$1 = evidence$12.c;
     var instrument$5$1 = (evidence$12.M !== null);
     if (instrument$5$1) {
       evidence$12.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoMember").B, startIndex$5$1);
     }
-    var this$69 = this.sq;
+    var this$69 = this.sr;
     var startIndex$6 = evidence$12.c;
     var instrument$6 = (evidence$12.M !== null);
     if (instrument$6) {
@@ -1578,10 +1578,10 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
         } else {
           var preRhsIndex$macro$4$4 = evidence$12.c;
-          this.aKj(evidence$12);
+          this.aKc(evidence$12);
           var rhsAggregate$macro$7$4 = evidence$12.v;
           var rhsMsg$macro$8$4 = evidence$12.F;
           if ((!evidence$12.d)) {
@@ -1593,7 +1593,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$10$4) {
               evidence$12.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$12.aa(x1$4$4.aG((lhsValue$macro$12$4 | 0), evidence$12.D), nextIndex$macro$13$4);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$4), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$4 === evidence$12.S));
@@ -1613,7 +1613,7 @@ $p.aHH = (function(evidence$12) {
       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)) {
+        if (((!evidence$12.d) && evidence$12.o)) {
           var parse0$18 = evidence$12;
         } else {
           var preRhsIndex$macro$19$4 = evidence$12.c;
@@ -1629,7 +1629,7 @@ $p.aHH = (function(evidence$12) {
             if (rhsMadeProgress$macro$25$4) {
               evidence$12.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$12.aa(x1$2$8.aG(lhsValue$macro$27$4, (evidence$12.D | 0)), nextIndex$macro$28$4);
           }
           if (evidence$12.C) {
             evidence$12.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$4, rhsMsg$macro$23$4), lhsAggregate$macro$21$4.W(rhsAggregate$macro$22$4), (preRhsIndex$macro$19$4 === evidence$12.S));
@@ -1648,11 +1648,11 @@ $p.aHH = (function(evidence$12) {
         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 value$4 = x0$12.bk;
       var stop$4 = (x0$12.br | 0);
       var begin$4 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().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);
+      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.fz, begin$4, end$4), value$4);
       var x1$2$9 = parse0$18;
     }
     if (instrument$6) {
@@ -1696,12 +1696,12 @@ $p.aHH = (function(evidence$12) {
       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 rhsCut$4 = evidence$12.o;
     var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
     if (((!evidence$12.d) && (!rhsCut$4))) {
       evidence$12.d1(startPos$2);
     }
-    evidence$12.p = endCut$4;
+    evidence$12.o = endCut$4;
     if (verboseFailures$4) {
       var $x_4 = lhsMsg$4.W(rhsMsg$4);
       var rassoc$3$4 = evidence$12.v;
@@ -1711,9 +1711,9 @@ $p.aHH = (function(evidence$12) {
   var lhsMsg$5 = evidence$12.F;
   var lhsAggregate$5 = evidence$12.v;
   if (evidence$12.d) {
-    evidence$12.p = (!(!(evidence$12.p | oldCut)));
+    evidence$12.o = (!(!(evidence$12.o | oldCut)));
     return evidence$12;
-  } else if (evidence$12.p) {
+  } else if (evidence$12.o) {
     return evidence$12;
   } else {
     var verboseFailures$5 = evidence$12.C;
@@ -1721,15 +1721,15 @@ $p.aHH = (function(evidence$12) {
     if (verboseFailures$5) {
       evidence$12.K(lhsMsg$5, evidence$12.v, false);
     }
-    evidence$12.p = false;
-    this.axH(evidence$12);
+    evidence$12.o = false;
+    this.axA(evidence$12);
     var rhsMsg$5 = evidence$12.F;
-    var rhsCut$5 = evidence$12.p;
+    var rhsCut$5 = evidence$12.o;
     var endCut$5 = (!(!(rhsCut$5 | oldCut)));
     if (((!evidence$12.d) && (!rhsCut$5))) {
       evidence$12.d1(startPos);
     }
-    evidence$12.p = endCut$5;
+    evidence$12.o = endCut$5;
     if (verboseFailures$5) {
       var $x_5 = lhsMsg$5.W(rhsMsg$5);
       var rassoc$3$5 = evidence$12.v;
@@ -1738,7 +1738,7 @@ $p.aHH = (function(evidence$12) {
     return evidence$12;
   }
 });
-$p.a0L = (function(evidence$13) {
+$p.a0J = (function(evidence$13) {
   var startIndex = evidence$13.c;
   var instrument = (evidence$13.M !== null);
   if (instrument) {
@@ -1751,16 +1751,16 @@ $p.a0L = (function(evidence$13) {
   var startIndex$1 = evidence$13.c;
   var count = 0;
   var precut = false;
-  var outerCut = evidence$13.p;
+  var outerCut = evidence$13.o;
   var sepMsg = null;
   var lastAgg = null;
   var x1$2;
   while (true) {
-    evidence$13.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aHH(evidence$13);
+    evidence$13.o = (!(!(precut | ((count < 0) && outerCut))));
+    this.aHA(evidence$13);
     var parsedMsg = evidence$13.F;
     var parsedAgg = evidence$13.v;
-    var postCut = evidence$13.p;
+    var postCut = evidence$13.o;
     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));
@@ -1781,9 +1781,9 @@ $p.a0L = (function(evidence$13) {
         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$().ac(whitespace, evidence$13), (!((!evidence$13.d) && evidence$13.o))))) {
+          evidence$13.o = false;
+          var sepCut = evidence$13.o;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
           startIndex$1 = beforeSepIndex;
           count = nextCount;
@@ -1811,13 +1811,13 @@ $p.a0L = (function(evidence$13) {
   }
   return x1$2;
 });
-$p.agb = (function(evidence$14) {
+$p.ag8 = (function(evidence$14) {
   var startIndex = evidence$14.c;
   var instrument = (evidence$14.M !== null);
   if (instrument) {
     evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("dtoEnclosed").B, startIndex);
   }
-  var this$1 = this.sq;
+  var this$1 = this.sr;
   var startIndex$1 = evidence$14.c;
   var instrument$1 = (evidence$14.M !== null);
   if (instrument$1) {
@@ -1841,7 +1841,7 @@ $p.agb = (function(evidence$14) {
     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)) {
+      if (((!evidence$14.d) && evidence$14.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$14.c;
         var startIndex$2 = evidence$14.c;
@@ -1859,13 +1859,13 @@ $p.agb = (function(evidence$14) {
           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;
+          evidence$14.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$14.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)) {
+            if (((!evidence$14.d) && evidence$14.o)) {
               var x1$4$1 = evidence$14;
             } else {
               var preRhsIndex$macro$4$1 = evidence$14.c;
@@ -1883,12 +1883,12 @@ $p.agb = (function(evidence$14) {
                 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))) {
+                  if ((!((!evidence$14.d) && evidence$14.o))) {
                     var preRhsIndex$macro$4$2 = evidence$14.c;
                     var x1$2$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
                     var preLhsIndex$macro$2$3 = evidence$14.c;
                     var input$macro$11$3 = evidence$14.T;
-                    this.sq.a0I(evidence$14);
+                    this.sr.a0G(evidence$14);
                     if (evidence$14.d) {
                       var postLhsIndex$macro$3$3 = evidence$14.c;
                       var lhsAggregate$macro$6$3 = evidence$14.v;
@@ -1899,16 +1899,16 @@ $p.agb = (function(evidence$14) {
                       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))) {
+                        if ((!((!evidence$14.d) && evidence$14.o))) {
                           var preRhsIndex$macro$4$3 = evidence$14.c;
-                          var f = (() => this.a0L(evidence$14));
+                          var f = (() => this.a0J(evidence$14));
                           var startIndex$3 = evidence$14.c;
                           var instrument$3 = (evidence$14.M !== null);
                           if (instrument$3) {
                             evidence$14.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                           }
-                          var oldCut = evidence$14.p;
-                          evidence$14.p = false;
+                          var oldCut = evidence$14.o;
+                          evidence$14.o = false;
                           var startPos = evidence$14.c;
                           var startIndex$4 = evidence$14.c;
                           var instrument$4 = (evidence$14.M !== null);
@@ -1941,7 +1941,7 @@ $p.agb = (function(evidence$14) {
                             }
                             $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)) {
+                              if (((!evidence$14.d) && evidence$14.o)) {
                               } else {
                                 var preRhsIndex$macro$4$4 = evidence$14.c;
                                 f();
@@ -1956,7 +1956,7 @@ $p.agb = (function(evidence$14) {
                                   if (rhsMadeProgress$macro$10) {
                                     evidence$14.P();
                                   }
-                                  var res$macro$14 = evidence$14.ab(evidence$14.D, nextIndex$macro$13);
+                                  var res$macro$14 = evidence$14.aa(evidence$14.D, nextIndex$macro$13);
                                 }
                                 if (evidence$14.C) {
                                   evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$14.S));
@@ -1976,7 +1976,7 @@ $p.agb = (function(evidence$14) {
                             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)) {
+                              if (((!evidence$14.d) && evidence$14.o)) {
                                 var x1$8 = evidence$14;
                               } else {
                                 var preRhsIndex$macro$19 = evidence$14.c;
@@ -2001,7 +2001,7 @@ $p.agb = (function(evidence$14) {
                                   if (rhsMadeProgress$macro$25) {
                                     evidence$14.P();
                                   }
-                                  var res$macro$29 = evidence$14.ab(lhsValue$macro$27, nextIndex$macro$28);
+                                  var res$macro$29 = evidence$14.aa(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));
@@ -2026,9 +2026,9 @@ $p.agb = (function(evidence$14) {
                           var lhsMsg = evidence$14.F;
                           var lhsAggregate = evidence$14.v;
                           if (evidence$14.d) {
-                            evidence$14.p = (!(!(evidence$14.p | oldCut)));
+                            evidence$14.o = (!(!(evidence$14.o | oldCut)));
                             var x1$3$3 = evidence$14;
-                          } else if (evidence$14.p) {
+                          } else if (evidence$14.o) {
                             var x1$3$3 = evidence$14;
                           } else {
                             var verboseFailures = evidence$14.C;
@@ -2036,7 +2036,7 @@ $p.agb = (function(evidence$14) {
                             if (verboseFailures) {
                               evidence$14.K(lhsMsg, evidence$14.v, false);
                             }
-                            evidence$14.p = false;
+                            evidence$14.o = false;
                             var startIndex$5 = evidence$14.c;
                             var instrument$5 = (evidence$14.M !== null);
                             if (instrument$5) {
@@ -2068,7 +2068,7 @@ $p.agb = (function(evidence$14) {
                               }
                               $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)) {
+                                if (((!evidence$14.d) && evidence$14.o)) {
                                 } else {
                                   var preRhsIndex$macro$4$5 = evidence$14.c;
                                   f();
@@ -2083,7 +2083,7 @@ $p.agb = (function(evidence$14) {
                                     if (rhsMadeProgress$macro$10$1) {
                                       evidence$14.P();
                                     }
-                                    var res$macro$14$1 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$1);
+                                    var res$macro$14$1 = evidence$14.aa(evidence$14.D, nextIndex$macro$13$1);
                                   }
                                   if (evidence$14.C) {
                                     evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$14.S));
@@ -2103,7 +2103,7 @@ $p.agb = (function(evidence$14) {
                               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)) {
+                                if (((!evidence$14.d) && evidence$14.o)) {
                                   var x1$8$1 = evidence$14;
                                 } else {
                                   var preRhsIndex$macro$19$1 = evidence$14.c;
@@ -2128,7 +2128,7 @@ $p.agb = (function(evidence$14) {
                                     if (rhsMadeProgress$macro$25$1) {
                                       evidence$14.P();
                                     }
-                                    var res$macro$29$1 = evidence$14.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                                    var res$macro$29$1 = evidence$14.aa(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));
@@ -2151,12 +2151,12 @@ $p.agb = (function(evidence$14) {
                               }
                             }
                             var rhsMsg = evidence$14.F;
-                            var rhsCut = evidence$14.p;
+                            var rhsCut = evidence$14.o;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$14.d) && (!rhsCut))) {
                               evidence$14.d1(startPos);
                             }
-                            evidence$14.p = endCut;
+                            evidence$14.o = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
                               var rassoc$3 = evidence$14.v;
@@ -2185,7 +2185,7 @@ $p.agb = (function(evidence$14) {
                             if (rhsMadeProgress$macro$10$2) {
                               evidence$14.P();
                             }
-                            evidence$14.ab(x1$2$2.aG(lhsValue$macro$12$3, evidence$14.D), nextIndex$macro$13$2);
+                            evidence$14.aa(x1$2$2.aG(lhsValue$macro$12$3, evidence$14.D), nextIndex$macro$13$2);
                           }
                           if (evidence$14.C) {
                             evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$14.S));
@@ -2203,7 +2203,7 @@ $p.agb = (function(evidence$14) {
                       if (rhsMadeProgress$macro$10$3) {
                         evidence$14.P();
                       }
-                      evidence$14.ab(x1$2$1.aG(lhsValue$macro$12$2, evidence$14.D), nextIndex$macro$13$3);
+                      evidence$14.aa(x1$2$1.aG(lhsValue$macro$12$2, evidence$14.D), nextIndex$macro$13$3);
                     }
                     if (evidence$14.C) {
                       evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$14.S));
@@ -2214,7 +2214,7 @@ $p.agb = (function(evidence$14) {
               var rhsAggregate$macro$7$4 = evidence$14.v;
               var rhsMsg$macro$8$4 = evidence$14.F;
               if ((!evidence$14.d)) {
-                evidence$14.p = true;
+                evidence$14.o = true;
                 var res$macro$14$4 = evidence$14;
               } else {
                 var postRhsIndex$macro$5$4 = evidence$14.c;
@@ -2223,7 +2223,7 @@ $p.agb = (function(evidence$14) {
                 if (rhsMadeProgress$macro$10$4) {
                   evidence$14.P();
                 }
-                var res$macro$14$4 = evidence$14.ab(evidence$14.D, nextIndex$macro$13$4);
+                var res$macro$14$4 = evidence$14.aa(evidence$14.D, nextIndex$macro$13$4);
               }
               if (evidence$14.C) {
                 evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$14.S));
@@ -2256,7 +2256,7 @@ $p.agb = (function(evidence$14) {
           if (rhsMadeProgress$macro$10$5) {
             evidence$14.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$14.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$14.D), nextIndex$macro$13$5);
         }
         if (evidence$14.C) {
           evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$14.S));
@@ -2276,7 +2276,7 @@ $p.agb = (function(evidence$14) {
     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)) {
+      if (((!evidence$14.d) && evidence$14.o)) {
         var parse0$7 = evidence$14;
       } else {
         var preRhsIndex$macro$19$2 = evidence$14.c;
@@ -2292,7 +2292,7 @@ $p.agb = (function(evidence$14) {
           if (rhsMadeProgress$macro$25$2) {
             evidence$14.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$14.aa(x1$2.aG(lhsValue$macro$27$2, (evidence$14.D | 0)), nextIndex$macro$28$2);
         }
         if (evidence$14.C) {
           evidence$14.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$14.S));
@@ -2311,11 +2311,11 @@ $p.agb = (function(evidence$14) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aX | 0);
-    var value = x0.bj;
+    var value = x0.bk;
     var stop = (x0.br | 0);
     var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
     var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
-    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fy, begin, end), value);
+    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
@@ -2377,7 +2377,7 @@ $p.agb = (function(evidence$14) {
       var $x_3;
       if ((x0$3 !== null)) {
         var meta = x0$3.aX;
-        var name = x0$3.bj;
+        var name = x0$3.bk;
         var p2$1 = x0$3.br;
         if ((p2$1 !== null)) {
           var derived = p2$1.E();