@7mind.io/baboon 0.0.160 → 0.0.164

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

@@ -40,20 +40,20 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefModel(context, meta, defEnum, defDto, defAdt, defForeign, defContract, defService) {
-  this.CJ = null;
-  this.aje = null;
-  this.ajd = null;
-  this.ajb = null;
-  this.ajf = null;
-  this.ajc = null;
-  this.ajg = null;
-  this.CJ = meta;
-  this.aje = defEnum;
-  this.ajd = defDto;
-  this.ajb = defAdt;
-  this.ajf = defForeign;
-  this.ajc = defContract;
-  this.ajg = defService;
+  this.CX = null;
+  this.ajm = null;
+  this.ajl = null;
+  this.ajj = null;
+  this.ajn = null;
+  this.ajk = null;
+  this.ajo = null;
+  this.CX = meta;
+  this.ajm = defEnum;
+  this.ajl = defDto;
+  this.ajj = defAdt;
+  this.ajn = defForeign;
+  this.ajk = defContract;
+  this.ajo = defService;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefModel as $c_Lio_septimalmind_baboon_parser_defns_DefModel };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefModel.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -63,7 +63,7 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefModel() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefModel as $h_Lio_septimalmind_baboon_parser_defns_DefModel };
 $h_Lio_septimalmind_baboon_parser_defns_DefModel.prototype = $p;
-$p.aKu = (function(evidence$1) {
+$p.aKG = (function(evidence$1) {
   var startIndex = evidence$1.c;
   var instrument = (evidence$1.L !== null);
   if (instrument) {
@@ -72,7 +72,7 @@ $p.aKu = (function(evidence$1) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
   var preLhsIndex$macro$62 = evidence$1.c;
   var input$macro$71 = evidence$1.T;
-  var x1$5 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().aie;
+  var x1$5 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().aik;
   var preLhsIndex$macro$47 = evidence$1.c;
   var input$macro$56 = evidence$1.T;
   var x1$7 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g4;
@@ -93,12 +93,12 @@ $p.aKu = (function(evidence$1) {
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.Q();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        this.aIj(evidence$1);
+        this.aIu(evidence$1);
         var rhsAggregate$macro$7 = evidence$1.v;
         var rhsMsg$macro$8 = evidence$1.G;
         if ((!evidence$1.d)) {
@@ -112,8 +112,8 @@ $p.aKu = (function(evidence$1) {
           }
           var res$macro$14 = evidence$1.ab(evidence$1.E, nextIndex$macro$13);
         }
-        if (evidence$1.C) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
         }
       }
     }
@@ -127,12 +127,12 @@ $p.aKu = (function(evidence$1) {
       evidence$1.Q();
     }
     var lhsValue$macro$27 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
-        this.aPo(evidence$1);
+        this.aPw(evidence$1);
         var rhsAggregate$macro$22 = evidence$1.v;
         var rhsMsg$macro$23 = evidence$1.G;
         if ((!evidence$1.d)) {
@@ -144,10 +144,10 @@ $p.aKu = (function(evidence$1) {
           if (rhsMadeProgress$macro$25) {
             evidence$1.Q();
           }
-          var res$macro$29 = evidence$1.ab(x1$9.aD(lhsValue$macro$27, evidence$1.E), nextIndex$macro$28);
+          var res$macro$29 = evidence$1.ab(x1$9.aF(lhsValue$macro$27, evidence$1.E), nextIndex$macro$28);
         }
-        if (evidence$1.C) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
         }
       }
     }
@@ -161,16 +161,16 @@ $p.aKu = (function(evidence$1) {
       evidence$1.Q();
     }
     var lhsValue$macro$42 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$34 = evidence$1.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().Ay();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
         var startPos = evidence$1.c;
         var startCut = evidence$1.p;
         evidence$1.p = false;
-        this.aIo(evidence$1);
+        this.aIz(evidence$1);
         var postSuccess = evidence$1.d;
         if (postSuccess) {
           var res = evidence$1.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$1.E));
@@ -180,10 +180,10 @@ $p.aKu = (function(evidence$1) {
           var res$2 = evidence$1.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
           res$2.p = (!(!(res$2.p | startCut)));
         }
-        if (evidence$1.C) {
+        if (evidence$1.D) {
           var msg = evidence$1.G;
           if ((!postSuccess)) {
-            evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dB) + ".?")))), evidence$1.v, false);
+            evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dC) + ".?")))), evidence$1.v, false);
           }
         }
         var rhsAggregate$macro$37 = evidence$1.v;
@@ -197,10 +197,10 @@ $p.aKu = (function(evidence$1) {
           if (rhsMadeProgress$macro$40) {
             evidence$1.Q();
           }
-          var res$macro$44 = evidence$1.ab(x1$7.aD(lhsValue$macro$42, evidence$1.E), nextIndex$macro$43);
+          var res$macro$44 = evidence$1.ab(x1$7.aF(lhsValue$macro$42, evidence$1.E), nextIndex$macro$43);
         }
-        if (evidence$1.C) {
-          evidence$1.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$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$1.S));
         }
       }
     }
@@ -214,12 +214,12 @@ $p.aKu = (function(evidence$1) {
       evidence$1.Q();
     }
     var lhsValue$macro$57 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
       } else {
         var preRhsIndex$macro$49 = evidence$1.c;
-        this.af2(evidence$1);
+        this.afb(evidence$1);
         var rhsAggregate$macro$52 = evidence$1.v;
         var rhsMsg$macro$53 = evidence$1.G;
         if ((!evidence$1.d)) {
@@ -231,10 +231,10 @@ $p.aKu = (function(evidence$1) {
           if (rhsMadeProgress$macro$55) {
             evidence$1.Q();
           }
-          var res$macro$59 = evidence$1.ab(x1$5.aD(lhsValue$macro$57, evidence$1.E), nextIndex$macro$58);
+          var res$macro$59 = evidence$1.ab(x1$5.aF(lhsValue$macro$57, evidence$1.E), nextIndex$macro$58);
         }
-        if (evidence$1.C) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$54, rhsMsg$macro$53), lhsAggregate$macro$51.W(rhsAggregate$macro$52), (preRhsIndex$macro$49 === evidence$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$54, rhsMsg$macro$53), lhsAggregate$macro$51.W(rhsAggregate$macro$52), (preRhsIndex$macro$49 === evidence$1.S));
         }
       }
     }
@@ -249,7 +249,7 @@ $p.aKu = (function(evidence$1) {
       evidence$1.Q();
     }
     var lhsValue$macro$72 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
       if (((!evidence$1.d) && evidence$1.p)) {
         var x1$14 = evidence$1;
@@ -269,8 +269,8 @@ $p.aKu = (function(evidence$1) {
           }
           var res$macro$74 = evidence$1.ab(lhsValue$macro$72, nextIndex$macro$73);
         }
-        if (evidence$1.C) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$69, rhsMsg$macro$68), lhsAggregate$macro$66.W(rhsAggregate$macro$67), (preRhsIndex$macro$64 === evidence$1.S));
+        if (evidence$1.D) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$69, rhsMsg$macro$68), lhsAggregate$macro$66.W(rhsAggregate$macro$67), (preRhsIndex$macro$64 === evidence$1.S));
         }
         var x1$14 = res$macro$74;
       }
@@ -281,7 +281,7 @@ $p.aKu = (function(evidence$1) {
   if (instrument) {
     evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B, x1$14.c, x1$14.d);
   }
-  if (x1$14.C) {
+  if (x1$14.D) {
     var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("model").B)));
     var forceAggregate = (startIndex < x1$14.S);
     x1$14.K(newshortMsg$1, x1$14.v, forceAggregate);
@@ -296,12 +296,12 @@ $p.aKu = (function(evidence$1) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    x1$14.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wd, x0.we, x0.zS, x0.tu);
+    x1$14.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDomain.$c_Lio_septimalmind_baboon_parser_model_RawDomain(x0.wl, x0.wm, x0.A5, x0.tz);
     return x1$14;
   }
 });
-$p.aIj = (function(evidence$2) {
-  var this$1 = this.CJ;
+$p.aIu = (function(evidence$2) {
+  var this$1 = this.CX;
   var startIndex = evidence$2.c;
   var instrument = (evidence$2.L !== null);
   if (instrument) {
@@ -323,7 +323,7 @@ $p.aIj = (function(evidence$2) {
       evidence$2.Q();
     }
     var lhsValue$macro$12 = evidence$2.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
       if (((!evidence$2.d) && evidence$2.p)) {
       } else {
@@ -352,7 +352,7 @@ $p.aIj = (function(evidence$2) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$2.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
           if (evidence$2.d) {
             if (((!evidence$2.d) && evidence$2.p)) {
               var x1$4$1 = evidence$2;
@@ -373,8 +373,8 @@ $p.aIj = (function(evidence$2) {
                 }
                 var res$macro$14 = evidence$2.ab(evidence$2.E, nextIndex$macro$13);
               }
-              if (evidence$2.C) {
-                evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$2.S));
+              if (evidence$2.D) {
+                evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$2.S));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -385,7 +385,7 @@ $p.aIj = (function(evidence$2) {
         if (instrument$2) {
           evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
@@ -396,7 +396,7 @@ $p.aIj = (function(evidence$2) {
         if (instrument$1) {
           evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("header").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
           x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
@@ -415,10 +415,10 @@ $p.aIj = (function(evidence$2) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$2.Q();
           }
-          var res$macro$14$1 = evidence$2.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$2.E), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$2.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$2.E), nextIndex$macro$13$1);
         }
-        if (evidence$2.C) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$2.S));
+        if (evidence$2.D) {
+          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$2.S));
         }
       }
     }
@@ -433,7 +433,7 @@ $p.aIj = (function(evidence$2) {
       evidence$2.Q();
     }
     var lhsValue$macro$27 = evidence$2.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
       if (((!evidence$2.d) && evidence$2.p)) {
         var parse0$3 = evidence$2;
@@ -451,10 +451,10 @@ $p.aIj = (function(evidence$2) {
           if (rhsMadeProgress$macro$25) {
             evidence$2.Q();
           }
-          var res$macro$29 = evidence$2.ab(x1$2.aD(lhsValue$macro$27, (evidence$2.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$2.ab(x1$2.aF(lhsValue$macro$27, (evidence$2.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$2.C) {
-          evidence$2.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$2.S));
+        if (evidence$2.D) {
+          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$2.S));
         }
         var parse0$3 = res$macro$29;
       }
@@ -470,17 +470,17 @@ $p.aIj = (function(evidence$2) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, stop);
-    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
     x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
@@ -495,7 +495,7 @@ $p.aIj = (function(evidence$2) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -505,12 +505,12 @@ $p.aIj = (function(evidence$2) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dHeader.$c_Lio_septimalmind_baboon_parser_model_RawHeader(x0$2.D(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dHeader.$c_Lio_septimalmind_baboon_parser_model_RawHeader(x0$2.C(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aPo = (function(evidence$3) {
-  var this$1 = this.CJ;
+$p.aPw = (function(evidence$3) {
+  var this$1 = this.CX;
   var startIndex = evidence$3.c;
   var instrument = (evidence$3.L !== null);
   if (instrument) {
@@ -532,7 +532,7 @@ $p.aPo = (function(evidence$3) {
       evidence$3.Q();
     }
     var lhsValue$macro$12 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
       if (((!evidence$3.d) && evidence$3.p)) {
       } else {
@@ -561,13 +561,13 @@ $p.aPo = (function(evidence$3) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$3.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
           if (evidence$3.d) {
             if (((!evidence$3.d) && evidence$3.p)) {
               var x1$4$1 = evidence$3;
             } else {
               var preRhsIndex$macro$4$1 = evidence$3.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Hv(evidence$3);
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$3);
               var rhsAggregate$macro$7 = evidence$3.v;
               var rhsMsg$macro$8 = evidence$3.G;
               if ((!evidence$3.d)) {
@@ -582,8 +582,8 @@ $p.aPo = (function(evidence$3) {
                 }
                 var res$macro$14 = evidence$3.ab(evidence$3.E, nextIndex$macro$13);
               }
-              if (evidence$3.C) {
-                evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$3.S));
+              if (evidence$3.D) {
+                evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$3.S));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -594,7 +594,7 @@ $p.aPo = (function(evidence$3) {
         if (instrument$2) {
           evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
@@ -605,7 +605,7 @@ $p.aPo = (function(evidence$3) {
         if (instrument$1) {
           evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("version").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
           x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
@@ -624,10 +624,10 @@ $p.aPo = (function(evidence$3) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$3.Q();
           }
-          var res$macro$14$1 = evidence$3.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$3.E), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$3.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$3.E), nextIndex$macro$13$1);
         }
-        if (evidence$3.C) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$3.S));
+        if (evidence$3.D) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$3.S));
         }
       }
     }
@@ -642,7 +642,7 @@ $p.aPo = (function(evidence$3) {
       evidence$3.Q();
     }
     var lhsValue$macro$27 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
     if (evidence$3.d) {
       if (((!evidence$3.d) && evidence$3.p)) {
         var parse0$3 = evidence$3;
@@ -660,10 +660,10 @@ $p.aPo = (function(evidence$3) {
           if (rhsMadeProgress$macro$25) {
             evidence$3.Q();
           }
-          var res$macro$29 = evidence$3.ab(x1$2.aD(lhsValue$macro$27, (evidence$3.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$3.ab(x1$2.aF(lhsValue$macro$27, (evidence$3.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$3.C) {
-          evidence$3.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$3.S));
+        if (evidence$3.D) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$3.S));
         }
         var parse0$3 = res$macro$29;
       }
@@ -679,17 +679,17 @@ $p.aPo = (function(evidence$3) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, stop);
-    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
     x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
@@ -704,7 +704,7 @@ $p.aPo = (function(evidence$3) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -714,12 +714,12 @@ $p.aPo = (function(evidence$3) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dVersion.$c_Lio_septimalmind_baboon_parser_model_RawVersion(x0$2.D(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dVersion.$c_Lio_septimalmind_baboon_parser_model_RawVersion(x0$2.C(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aIo = (function(evidence$4) {
-  var this$1 = this.CJ;
+$p.aIz = (function(evidence$4) {
+  var this$1 = this.CX;
   var startIndex = evidence$4.c;
   var instrument = (evidence$4.L !== null);
   if (instrument) {
@@ -741,7 +741,7 @@ $p.aIo = (function(evidence$4) {
       evidence$4.Q();
     }
     var lhsValue$macro$12 = evidence$4.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
       if (((!evidence$4.d) && evidence$4.p)) {
       } else {
@@ -782,13 +782,13 @@ $p.aIo = (function(evidence$4) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$2)) {
             evidence$4.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
               var x1$4$1 = evidence$4;
             } else {
               var preRhsIndex$macro$4$1 = evidence$4.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Hv(evidence$4);
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$4);
               var rhsAggregate$macro$7 = evidence$4.v;
               var rhsMsg$macro$8 = evidence$4.G;
               if ((!evidence$4.d)) {
@@ -803,8 +803,8 @@ $p.aIo = (function(evidence$4) {
                 }
                 var res$macro$14 = evidence$4.ab(evidence$4.E, nextIndex$macro$13);
               }
-              if (evidence$4.C) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$4.S));
+              if (evidence$4.D) {
+                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$4.S));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -815,7 +815,7 @@ $p.aIo = (function(evidence$4) {
         if (instrument$2) {
           evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
@@ -832,7 +832,7 @@ $p.aIo = (function(evidence$4) {
             evidence$4.Q();
           }
           var lhsValue$macro$12$2 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -844,7 +844,7 @@ $p.aIo = (function(evidence$4) {
               } else {
                 evidence$4.aH();
               }
-              if (evidence$4.C) {
+              if (evidence$4.D) {
                 evidence$4.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
               }
               var rhsAggregate$macro$7$1 = evidence$4.v;
@@ -860,8 +860,8 @@ $p.aIo = (function(evidence$4) {
                 }
                 var res$macro$14$1 = evidence$4.ab(lhsValue$macro$12$2, nextIndex$macro$13$1);
               }
-              if (evidence$4.C) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$1), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$2 === evidence$4.S));
+              if (evidence$4.D) {
+                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$1), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$2 === evidence$4.S));
               }
             }
           }
@@ -875,7 +875,7 @@ $p.aIo = (function(evidence$4) {
             evidence$4.Q();
           }
           var lhsValue$macro$27 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -887,7 +887,7 @@ $p.aIo = (function(evidence$4) {
               } else {
                 evidence$4.aH();
               }
-              if (evidence$4.C) {
+              if (evidence$4.D) {
                 evidence$4.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"*\""))));
               }
               var rhsAggregate$macro$22 = evidence$4.v;
@@ -903,8 +903,8 @@ $p.aIo = (function(evidence$4) {
                 }
                 var res$macro$29 = evidence$4.ab(lhsValue$macro$27, nextIndex$macro$28);
               }
-              if (evidence$4.C) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$4.S));
+              if (evidence$4.D) {
+                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$4.S));
               }
             }
           }
@@ -918,7 +918,7 @@ $p.aIo = (function(evidence$4) {
             evidence$4.Q();
           }
           var lhsValue$macro$42 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
             } else {
@@ -930,7 +930,7 @@ $p.aIo = (function(evidence$4) {
               } else {
                 evidence$4.aH();
               }
-              if (evidence$4.C) {
+              if (evidence$4.D) {
                 evidence$4.aw(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
               }
               var rhsAggregate$macro$37 = evidence$4.v;
@@ -946,8 +946,8 @@ $p.aIo = (function(evidence$4) {
                 }
                 var res$macro$44 = evidence$4.ab(lhsValue$macro$42, nextIndex$macro$43);
               }
-              if (evidence$4.C) {
-                evidence$4.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$4.S));
+              if (evidence$4.D) {
+                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$4.S));
               }
             }
           }
@@ -962,13 +962,13 @@ $p.aIo = (function(evidence$4) {
             evidence$4.Q();
           }
           var lhsValue$macro$74 = evidence$4.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
             if (((!evidence$4.d) && evidence$4.p)) {
               var x1$18 = evidence$4;
             } else {
               var preRhsIndex$macro$66 = evidence$4.c;
-              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().Ay();
+              $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
               var startPos = evidence$4.c;
               var startCut = evidence$4.p;
               evidence$4.p = false;
@@ -1023,7 +1023,7 @@ $p.aIo = (function(evidence$4) {
               } else {
                 evidence$4.aH();
               }
-              if (evidence$4.C) {
+              if (evidence$4.D) {
                 evidence$4.aw(index$4, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"without\""))));
               }
               if ((!evidence$4.d)) {
@@ -1034,7 +1034,7 @@ $p.aIo = (function(evidence$4) {
                 if ((postLhsIndex$macro$50 > preLhsIndex$macro$49)) {
                   evidence$4.Q();
                 }
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                 if (evidence$4.d) {
                   if (((!evidence$4.d) && evidence$4.p)) {
                   } else {
@@ -1043,7 +1043,7 @@ $p.aIo = (function(evidence$4) {
                       var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
                       var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
                       var this$37 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-                      var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
+                      var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
                       var startIndex$3 = evidence$4.c;
                       var count = 0;
                       var precut = false;
@@ -1056,24 +1056,24 @@ $p.aIo = (function(evidence$4) {
                         var parsedMsg = evidence$4.G;
                         var parsedAgg = evidence$4.v;
                         var postCut = evidence$4.p;
-                        var verboseFailures = evidence$4.C;
+                        var verboseFailures = evidence$4.D;
                         if ((!evidence$4.d)) {
                           var res$1 = (postCut ? evidence$4 : $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$37, startIndex$3, startIndex$3, count, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc));
                           if (verboseFailures) {
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ir(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$3, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
                           }
                           return res$1;
                         } else {
                           var beforeSepIndex = evidence$4.c;
-                          acc.am(evidence$4.E);
+                          acc.al(evidence$4.E);
                           var nextCount = ((1 + count) | 0);
                           if ((nextCount === 2147483647)) {
                             var res$2$1 = $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$37, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc);
                             if (verboseFailures) {
-                              evidence$4.aw(startIndex$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dB) + ".rep")))(parsedMsg))));
+                              evidence$4.aw(startIndex$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
                             }
                             return res$2$1;
-                          } 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$4), (!((!evidence$4.d) && evidence$4.p)))))) {
+                          } 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$().ad(whitespace, evidence$4), (!((!evidence$4.d) && evidence$4.p)))))) {
                             return evidence$4;
                           } else {
                             evidence$4.p = false;
@@ -1115,7 +1115,7 @@ $p.aIo = (function(evidence$4) {
                     } else {
                       evidence$4.aH();
                     }
-                    if (evidence$4.C) {
+                    if (evidence$4.D) {
                       evidence$4.aw(index$10, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$4.d)) {
@@ -1126,7 +1126,7 @@ $p.aIo = (function(evidence$4) {
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$4.Q();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
                         if (((!evidence$4.d) && evidence$4.p)) {
                         } else {
@@ -1145,8 +1145,8 @@ $p.aIo = (function(evidence$4) {
                             }
                             var res$macro$14$2 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$2);
                           }
-                          if (evidence$4.C) {
-                            evidence$4.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$4.S));
+                          if (evidence$4.D) {
+                            evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$4.S));
                           }
                         }
                       }
@@ -1161,7 +1161,7 @@ $p.aIo = (function(evidence$4) {
                         evidence$4.Q();
                       }
                       var lhsValue$macro$27$1 = evidence$4.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
                         if (((!evidence$4.d) && evidence$4.p)) {
                           var x1$8 = evidence$4;
@@ -1174,7 +1174,7 @@ $p.aIo = (function(evidence$4) {
                           } else {
                             evidence$4.aH();
                           }
-                          if (evidence$4.C) {
+                          if (evidence$4.D) {
                             evidence$4.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
                           var rhsAggregate$macro$22$1 = evidence$4.v;
@@ -1190,8 +1190,8 @@ $p.aIo = (function(evidence$4) {
                             }
                             var res$macro$29$1 = evidence$4.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                           }
-                          if (evidence$4.C) {
-                            evidence$4.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$4.S));
+                          if (evidence$4.D) {
+                            evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$4.S));
                           }
                           var x1$8 = res$macro$29$1;
                         }
@@ -1202,7 +1202,7 @@ $p.aIo = (function(evidence$4) {
                     if (instrument$4) {
                       evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (x1$8.C) {
+                    if (x1$8.D) {
                       var newshortMsg$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("inCurlyBraces").B)));
                       var forceAggregate$1 = (startIndex$5 < x1$8.S);
                       x1$8.K(newshortMsg$1, x1$8.v, forceAggregate$1);
@@ -1218,7 +1218,7 @@ $p.aIo = (function(evidence$4) {
                     } else if (evidence$4.p) {
                       var x1$3$4 = evidence$4;
                     } else {
-                      var verboseFailures$1 = evidence$4.C;
+                      var verboseFailures$1 = evidence$4.D;
                       evidence$4.c = startPos$1;
                       if (verboseFailures$1) {
                         evidence$4.K(lhsMsg, evidence$4.v, false);
@@ -1242,7 +1242,7 @@ $p.aIo = (function(evidence$4) {
                       } else {
                         evidence$4.aH();
                       }
-                      if (evidence$4.C) {
+                      if (evidence$4.D) {
                         evidence$4.aw(index$11, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$4.d)) {
@@ -1253,7 +1253,7 @@ $p.aIo = (function(evidence$4) {
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                           evidence$4.Q();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
                           if (((!evidence$4.d) && evidence$4.p)) {
                           } else {
@@ -1272,8 +1272,8 @@ $p.aIo = (function(evidence$4) {
                               }
                               var res$macro$14$3 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$3);
                             }
-                            if (evidence$4.C) {
-                              evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$3), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$4 === evidence$4.S));
+                            if (evidence$4.D) {
+                              evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8$3), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$4 === evidence$4.S));
                             }
                           }
                         }
@@ -1288,7 +1288,7 @@ $p.aIo = (function(evidence$4) {
                           evidence$4.Q();
                         }
                         var lhsValue$macro$27$2 = evidence$4.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                         if (evidence$4.d) {
                           if (((!evidence$4.d) && evidence$4.p)) {
                             var x1$8$1 = evidence$4;
@@ -1301,7 +1301,7 @@ $p.aIo = (function(evidence$4) {
                             } else {
                               evidence$4.aH();
                             }
-                            if (evidence$4.C) {
+                            if (evidence$4.D) {
                               evidence$4.aw(index$2$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
                             var rhsAggregate$macro$22$2 = evidence$4.v;
@@ -1317,8 +1317,8 @@ $p.aIo = (function(evidence$4) {
                               }
                               var res$macro$29$2 = evidence$4.ab(lhsValue$macro$27$2, nextIndex$macro$28$2);
                             }
-                            if (evidence$4.C) {
-                              evidence$4.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$4.S));
+                            if (evidence$4.D) {
+                              evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$4.S));
                             }
                             var x1$8$1 = res$macro$29$2;
                           }
@@ -1329,7 +1329,7 @@ $p.aIo = (function(evidence$4) {
                       if (instrument$5) {
                         evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (x1$8$1.C) {
+                      if (x1$8$1.D) {
                         var newshortMsg$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("inBraces").B)));
                         var forceAggregate$2 = (startIndex$6 < x1$8$1.S);
                         x1$8$1.K(newshortMsg$2, x1$8$1.v, forceAggregate$2);
@@ -1341,7 +1341,7 @@ $p.aIo = (function(evidence$4) {
                       var rhsCut = evidence$4.p;
                       var endCut$1 = (!(!(rhsCut | oldCut)));
                       if (((!evidence$4.d) && (!rhsCut))) {
-                        evidence$4.d2(startPos$1);
+                        evidence$4.d3(startPos$1);
                       }
                       evidence$4.p = endCut$1;
                       if (verboseFailures$1) {
@@ -1354,7 +1354,7 @@ $p.aIo = (function(evidence$4) {
                     if (instrument$3) {
                       evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$4.c, x1$3$4.d);
                     }
-                    if (x1$3$4.C) {
+                    if (x1$3$4.D) {
                       var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                       var forceAggregate$3 = (startIndex$4 < x1$3$4.S);
                       x1$3$4.K(newshortMsg$4, x1$3$4.v, forceAggregate$3);
@@ -1375,8 +1375,8 @@ $p.aIo = (function(evidence$4) {
                       }
                       var res$macro$61 = evidence$4.ab(evidence$4.E, nextIndex$macro$60);
                     }
-                    if (evidence$4.C) {
-                      evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$56, rhsMsg$macro$55), lhsAggregate$macro$53.W(rhsAggregate$macro$54), (preRhsIndex$macro$51 === evidence$4.S));
+                    if (evidence$4.D) {
+                      evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$56, rhsMsg$macro$55), lhsAggregate$macro$53.W(rhsAggregate$macro$54), (preRhsIndex$macro$51 === evidence$4.S));
                     }
                   }
                 }
@@ -1390,10 +1390,10 @@ $p.aIo = (function(evidence$4) {
                 var res$6$1 = evidence$4.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
                 res$6$1.p = (!(!(res$6$1.p | startCut)));
               }
-              if (evidence$4.C) {
+              if (evidence$4.D) {
                 var msg = evidence$4.G;
                 if ((!postSuccess)) {
-                  evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dB) + ".?")))), evidence$4.v, false);
+                  evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dC) + ".?")))), evidence$4.v, false);
                 }
               }
               var rhsAggregate$macro$69 = evidence$4.v;
@@ -1407,10 +1407,10 @@ $p.aIo = (function(evidence$4) {
                 if (rhsMadeProgress$macro$72) {
                   evidence$4.Q();
                 }
-                var res$macro$76 = evidence$4.ab(x1$3.aD(lhsValue$macro$74, evidence$4.E), nextIndex$macro$75);
+                var res$macro$76 = evidence$4.ab(x1$3.aF(lhsValue$macro$74, evidence$4.E), nextIndex$macro$75);
               }
-              if (evidence$4.C) {
-                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$71, rhsMsg$macro$70), lhsAggregate$macro$68.W(rhsAggregate$macro$69), (preRhsIndex$macro$66 === evidence$4.S));
+              if (evidence$4.D) {
+                evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$71, rhsMsg$macro$70), lhsAggregate$macro$68.W(rhsAggregate$macro$69), (preRhsIndex$macro$66 === evidence$4.S));
               }
               var x1$18 = res$macro$76;
             }
@@ -1421,7 +1421,7 @@ $p.aIo = (function(evidence$4) {
         if (instrument$1) {
           evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B, x1$18.c, x1$18.d);
         }
-        if (x1$18.C) {
+        if (x1$18.D) {
           var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("import").B)));
           var forceAggregate$4 = (startIndex$1 < x1$18.S);
           x1$18.K(newshortMsg$6, x1$18.v, forceAggregate$4);
@@ -1440,10 +1440,10 @@ $p.aIo = (function(evidence$4) {
           if (rhsMadeProgress$macro$10$4) {
             evidence$4.Q();
           }
-          var res$macro$14$4 = evidence$4.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$4.E), nextIndex$macro$13$4);
+          var res$macro$14$4 = evidence$4.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$4.E), nextIndex$macro$13$4);
         }
-        if (evidence$4.C) {
-          evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$4.S));
+        if (evidence$4.D) {
+          evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$4.S));
         }
       }
     }
@@ -1458,7 +1458,7 @@ $p.aIo = (function(evidence$4) {
       evidence$4.Q();
     }
     var lhsValue$macro$27$3 = evidence$4.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
       if (((!evidence$4.d) && evidence$4.p)) {
         var parse0$9 = evidence$4;
@@ -1476,10 +1476,10 @@ $p.aIo = (function(evidence$4) {
           if (rhsMadeProgress$macro$25$3) {
             evidence$4.Q();
           }
-          var res$macro$29$3 = evidence$4.ab(x1$2.aD(lhsValue$macro$27$3, (evidence$4.E | 0)), nextIndex$macro$28$3);
+          var res$macro$29$3 = evidence$4.ab(x1$2.aF(lhsValue$macro$27$3, (evidence$4.E | 0)), nextIndex$macro$28$3);
         }
-        if (evidence$4.C) {
-          evidence$4.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$4.S));
+        if (evidence$4.D) {
+          evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$3, rhsMsg$macro$23$3), lhsAggregate$macro$21$3.W(rhsAggregate$macro$22$3), (preRhsIndex$macro$19$3 === evidence$4.S));
         }
         var parse0$9 = res$macro$29$3;
       }
@@ -1495,17 +1495,17 @@ $p.aIo = (function(evidence$4) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value$1 = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, stop);
-    parse0$9.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.ft, begin, end$1), value$1);
+    var value$1 = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$9.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end$1), value$1);
     var x1$2$1 = parse0$9;
   }
   if (instrument) {
     evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     var newshortMsg$7 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$5 = (startIndex < x1$2$1.S);
     x1$2$1.K(newshortMsg$7, x1$2$1.v, forceAggregate$5);
@@ -1520,7 +1520,7 @@ $p.aIo = (function(evidence$4) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$10 = x1$2$1;
   }
   if ((!parse0$10.d)) {
@@ -1530,10 +1530,10 @@ $p.aIo = (function(evidence$4) {
     matchEnd4: {
       var $x_8;
       if ((x0$2 !== null)) {
-        var meta = x0$2.D();
+        var meta = x0$2.C();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_8 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dImport.$c_Lio_septimalmind_baboon_parser_model_RawImport(meta, p2.D(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_scala$002e$002dOption$0024.$m_s_Option$().hX(p2.z()).fd().cM($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(s$2$2))))));
+          var $x_8 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dImport.$c_Lio_septimalmind_baboon_parser_model_RawImport(meta, p2.C(), $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_scala$002e$002dOption$0024.$m_s_Option$().hX(p2.z()).fd().cN($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(s$2$2))))));
           break matchEnd4;
         }
       }
@@ -1543,8 +1543,8 @@ $p.aIo = (function(evidence$4) {
     return parse0$10;
   }
 });
-$p.aIr = (function(evidence$5) {
-  var this$1 = this.CJ;
+$p.aIC = (function(evidence$5) {
+  var this$1 = this.CX;
   var startIndex = evidence$5.c;
   var instrument = (evidence$5.L !== null);
   if (instrument) {
@@ -1566,7 +1566,7 @@ $p.aIr = (function(evidence$5) {
       evidence$5.Q();
     }
     var lhsValue$macro$12 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
       } else {
@@ -1595,13 +1595,13 @@ $p.aIr = (function(evidence$5) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$5.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
             if (((!evidence$5.d) && evidence$5.p)) {
               var x1$4$1 = evidence$5;
             } else {
               var preRhsIndex$macro$4$1 = evidence$5.c;
-              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().Hv(evidence$5);
+              $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$5);
               var rhsAggregate$macro$7 = evidence$5.v;
               var rhsMsg$macro$8 = evidence$5.G;
               if ((!evidence$5.d)) {
@@ -1616,8 +1616,8 @@ $p.aIr = (function(evidence$5) {
                 }
                 var res$macro$14 = evidence$5.ab(evidence$5.E, nextIndex$macro$13);
               }
-              if (evidence$5.C) {
-                evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$5.S));
+              if (evidence$5.D) {
+                evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$1 === evidence$5.S));
               }
               var x1$4$1 = res$macro$14;
             }
@@ -1628,7 +1628,7 @@ $p.aIr = (function(evidence$5) {
         if (instrument$2) {
           evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg, x1$4$1.v, forceAggregate);
@@ -1639,7 +1639,7 @@ $p.aIr = (function(evidence$5) {
         if (instrument$1) {
           evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("include").B)));
           var forceAggregate$1 = (startIndex$1 < x1$4$1.S);
           x1$4$1.K(newshortMsg$1, x1$4$1.v, forceAggregate$1);
@@ -1658,10 +1658,10 @@ $p.aIr = (function(evidence$5) {
           if (rhsMadeProgress$macro$10$1) {
             evidence$5.Q();
           }
-          var res$macro$14$1 = evidence$5.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$5.E), nextIndex$macro$13$1);
+          var res$macro$14$1 = evidence$5.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$5.E), nextIndex$macro$13$1);
         }
-        if (evidence$5.C) {
-          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$5.S));
+        if (evidence$5.D) {
+          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$1), lhsAggregate$macro$6.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4 === evidence$5.S));
         }
       }
     }
@@ -1676,7 +1676,7 @@ $p.aIr = (function(evidence$5) {
       evidence$5.Q();
     }
     var lhsValue$macro$27 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
         var parse0$3 = evidence$5;
@@ -1694,10 +1694,10 @@ $p.aIr = (function(evidence$5) {
           if (rhsMadeProgress$macro$25) {
             evidence$5.Q();
           }
-          var res$macro$29 = evidence$5.ab(x1$2.aD(lhsValue$macro$27, (evidence$5.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$5.ab(x1$2.aF(lhsValue$macro$27, (evidence$5.E | 0)), nextIndex$macro$28);
         }
-        if (evidence$5.C) {
-          evidence$5.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$5.S));
+        if (evidence$5.D) {
+          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$5.S));
         }
         var parse0$3 = res$macro$29;
       }
@@ -1713,17 +1713,17 @@ $p.aIr = (function(evidence$5) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, stop);
-    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end), value);
     var x1$2$1 = parse0$3;
   }
   if (instrument) {
     evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
-  if (x1$2$1.C) {
+  if (x1$2$1.D) {
     var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$2 = (startIndex < x1$2$1.S);
     x1$2$1.K(newshortMsg$2, x1$2$1.v, forceAggregate$2);
@@ -1738,7 +1738,7 @@ $p.aIr = (function(evidence$5) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$4 = x1$2$1;
   }
   if ((!parse0$4.d)) {
@@ -1748,11 +1748,11 @@ $p.aIr = (function(evidence$5) {
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dInclude.$c_Lio_septimalmind_baboon_parser_model_RawInclude(x0$2.D(), x0$2.z());
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dInclude.$c_Lio_septimalmind_baboon_parser_model_RawInclude(x0$2.C(), x0$2.z());
     return parse0$4;
   }
 });
-$p.aKf = (function(evidence$6) {
+$p.aKr = (function(evidence$6) {
   var startIndex = evidence$6.c;
   var instrument = (evidence$6.L !== null);
   if (instrument) {
@@ -1761,7 +1761,7 @@ $p.aKf = (function(evidence$6) {
   var x1$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 = evidence$6.c;
   var input$macro$11 = evidence$6.T;
-  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().Ay();
+  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
   var startPos = evidence$6.c;
   var startCut = evidence$6.p;
   evidence$6.p = false;
@@ -1772,7 +1772,7 @@ $p.aKf = (function(evidence$6) {
   evidence$6.gC = oldCapturing;
   if ((!evidence$6.d)) {
   } else {
-    evidence$6.jY(evidence$6.T.Il(startPos$2, evidence$6.c));
+    evidence$6.jY(evidence$6.T.IA(startPos$2, evidence$6.c));
   }
   var postSuccess = evidence$6.d;
   if (postSuccess) {
@@ -1783,10 +1783,10 @@ $p.aKf = (function(evidence$6) {
     var res$2 = evidence$6.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
     res$2.p = (!(!(res$2.p | startCut)));
   }
-  if (evidence$6.C) {
+  if (evidence$6.D) {
     var msg = evidence$6.G;
     if ((!postSuccess)) {
-      evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dB) + ".?")))), evidence$6.v, false);
+      evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dC) + ".?")))), evidence$6.v, false);
     }
   }
   if ((!evidence$6.d)) {
@@ -1799,7 +1799,7 @@ $p.aKf = (function(evidence$6) {
       evidence$6.Q();
     }
     var lhsValue$macro$12 = evidence$6.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$6);
     if (evidence$6.d) {
       if (((!evidence$6.d) && evidence$6.p)) {
         var x1$12 = evidence$6;
@@ -1820,25 +1820,25 @@ $p.aKf = (function(evidence$6) {
         var oldCut$5 = evidence$6.p;
         evidence$6.p = false;
         var startPos$7 = evidence$6.c;
-        this.aEH(evidence$6);
+        this.aET(evidence$6);
         var lhsMsg = evidence$6.G;
         var lhsAggregate = evidence$6.v;
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$5)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures = evidence$6.C;
+          var verboseFailures = evidence$6.D;
           evidence$6.c = startPos$7;
           if (verboseFailures) {
             evidence$6.K(lhsMsg, evidence$6.v, false);
           }
           evidence$6.p = false;
-          this.a0c(evidence$6);
+          this.a0g(evidence$6);
           var rhsMsg = evidence$6.G;
           var rhsCut = evidence$6.p;
           var endCut = (!(!(rhsCut | oldCut$5)));
           if (((!evidence$6.d) && (!rhsCut))) {
-            evidence$6.d2(startPos$7);
+            evidence$6.d3(startPos$7);
           }
           evidence$6.p = endCut;
           if (verboseFailures) {
@@ -1853,18 +1853,18 @@ $p.aKf = (function(evidence$6) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$4)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$2 = evidence$6.C;
+          var verboseFailures$2 = evidence$6.D;
           evidence$6.c = startPos$6;
           if (verboseFailures$2) {
             evidence$6.K(lhsMsg$2, evidence$6.v, false);
           }
           evidence$6.p = false;
-          this.aey(evidence$6);
+          this.aeH(evidence$6);
           var rhsMsg$2 = evidence$6.G;
           var rhsCut$2 = evidence$6.p;
           var endCut$2 = (!(!(rhsCut$2 | oldCut$4)));
           if (((!evidence$6.d) && (!rhsCut$2))) {
-            evidence$6.d2(startPos$6);
+            evidence$6.d3(startPos$6);
           }
           evidence$6.p = endCut$2;
           if (verboseFailures$2) {
@@ -1879,18 +1879,18 @@ $p.aKf = (function(evidence$6) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$3)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$3 = evidence$6.C;
+          var verboseFailures$3 = evidence$6.D;
           evidence$6.c = startPos$5;
           if (verboseFailures$3) {
             evidence$6.K(lhsMsg$3, evidence$6.v, false);
           }
           evidence$6.p = false;
-          this.afA(evidence$6);
+          this.afJ(evidence$6);
           var rhsMsg$3 = evidence$6.G;
           var rhsCut$3 = evidence$6.p;
           var endCut$3 = (!(!(rhsCut$3 | oldCut$3)));
           if (((!evidence$6.d) && (!rhsCut$3))) {
-            evidence$6.d2(startPos$5);
+            evidence$6.d3(startPos$5);
           }
           evidence$6.p = endCut$3;
           if (verboseFailures$3) {
@@ -1905,18 +1905,18 @@ $p.aKf = (function(evidence$6) {
           evidence$6.p = (!(!(evidence$6.p | oldCut$2)));
         } else if (evidence$6.p) {
         } else {
-          var verboseFailures$4 = evidence$6.C;
+          var verboseFailures$4 = evidence$6.D;
           evidence$6.c = startPos$4;
           if (verboseFailures$4) {
             evidence$6.K(lhsMsg$4, evidence$6.v, false);
           }
           evidence$6.p = false;
-          this.aFm(evidence$6);
+          this.aFy(evidence$6);
           var rhsMsg$4 = evidence$6.G;
           var rhsCut$4 = evidence$6.p;
           var endCut$4 = (!(!(rhsCut$4 | oldCut$2)));
           if (((!evidence$6.d) && (!rhsCut$4))) {
-            evidence$6.d2(startPos$4);
+            evidence$6.d3(startPos$4);
           }
           evidence$6.p = endCut$4;
           if (verboseFailures$4) {
@@ -1930,18 +1930,18 @@ $p.aKf = (function(evidence$6) {
         if (evidence$6.d) {
           evidence$6.p = (!(!(evidence$6.p | oldCut)));
         } else if ((!evidence$6.p)) {
-          var verboseFailures$5 = evidence$6.C;
+          var verboseFailures$5 = evidence$6.D;
           evidence$6.c = startPos$3;
           if (verboseFailures$5) {
             evidence$6.K(lhsMsg$5, evidence$6.v, false);
           }
           evidence$6.p = false;
-          this.ahw(evidence$6);
+          this.ahB(evidence$6);
           var rhsMsg$5 = evidence$6.G;
           var rhsCut$5 = evidence$6.p;
           var endCut$5 = (!(!(rhsCut$5 | oldCut)));
           if (((!evidence$6.d) && (!rhsCut$5))) {
-            evidence$6.d2(startPos$3);
+            evidence$6.d3(startPos$3);
           }
           evidence$6.p = endCut$5;
           if (verboseFailures$5) {
@@ -1961,10 +1961,10 @@ $p.aKf = (function(evidence$6) {
           if (rhsMadeProgress$macro$10) {
             evidence$6.Q();
           }
-          var res$macro$14 = evidence$6.ab(x1$3.aD(lhsValue$macro$12, evidence$6.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$6.ab(x1$3.aF(lhsValue$macro$12, evidence$6.E), nextIndex$macro$13);
         }
-        if (evidence$6.C) {
-          evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
+        if (evidence$6.D) {
+          evidence$6.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$6.S));
         }
         var x1$12 = res$macro$14;
       }
@@ -1975,7 +1975,7 @@ $p.aKf = (function(evidence$6) {
   if (instrument) {
     evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B, x1$12.c, x1$12.d);
   }
-  if (x1$12.C) {
+  if (x1$12.D) {
     var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("main").B)));
     var forceAggregate = (startIndex < x1$12.S);
     x1$12.K(newshortMsg$6, x1$12.v, forceAggregate);
@@ -1989,8 +1989,8 @@ $p.aKf = (function(evidence$6) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var root = x0.D();
-    x1$12.E = x0.z().BB((!root.l()));
+    var root = x0.C();
+    x1$12.E = x0.z().BQ((!root.l()));
   }
   var startIndex$2 = evidence$6.c;
   var instrument$2 = (evidence$6.L !== null);
@@ -2008,18 +2008,18 @@ $p.aKf = (function(evidence$6) {
   } else if (evidence$6.p) {
     var x1$16 = evidence$6;
   } else {
-    var verboseFailures$6 = evidence$6.C;
+    var verboseFailures$6 = evidence$6.D;
     evidence$6.c = startPos$8;
     if (verboseFailures$6) {
       evidence$6.K(lhsMsg$6, evidence$6.v, false);
     }
     evidence$6.p = false;
-    this.aKC(evidence$6);
+    this.aKO(evidence$6);
     var rhsMsg$6 = evidence$6.G;
     var rhsCut$6 = evidence$6.p;
     var endCut$6 = (!(!(rhsCut$6 | oldCut$6)));
     if (((!evidence$6.d) && (!rhsCut$6))) {
-      evidence$6.d2(startPos$8);
+      evidence$6.d3(startPos$8);
     }
     evidence$6.p = endCut$6;
     if (verboseFailures$6) {
@@ -2032,7 +2032,7 @@ $p.aKf = (function(evidence$6) {
   if (instrument$2) {
     evidence$6.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B, x1$16.c, x1$16.d);
   }
-  if (x1$16.C) {
+  if (x1$16.D) {
     var newshortMsg$8 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("member").B)));
     var forceAggregate$1 = (startIndex$2 < x1$16.S);
     x1$16.K(newshortMsg$8, x1$16.v, forceAggregate$1);
@@ -2042,14 +2042,14 @@ $p.aKf = (function(evidence$6) {
   }
   return x1$16;
 });
-$p.af2 = (function(evidence$7) {
+$p.afb = (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$2 = evidence$7.c;
   var input$macro$11 = evidence$7.T;
   var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$5 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
+  var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
   var startIndex = evidence$7.c;
   var count = 0;
   var precut = false;
@@ -2058,29 +2058,29 @@ $p.af2 = (function(evidence$7) {
   var lastAgg = null;
   while (true) {
     evidence$7.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aIr(evidence$7);
+    this.aIC(evidence$7);
     var parsedMsg = evidence$7.G;
     var parsedAgg = evidence$7.v;
     var postCut = evidence$7.p;
-    var verboseFailures = evidence$7.C;
+    var verboseFailures = evidence$7.D;
     if ((!evidence$7.d)) {
       var res = (postCut ? evidence$7 : $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$5, startIndex, startIndex, count, (!(!(outerCut | postCut))), 0, evidence$7, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ir(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex, 0, evidence$7, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       break;
     } else {
       var beforeSepIndex = evidence$7.c;
-      acc.am(evidence$7.E);
+      acc.al(evidence$7.E);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$5, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$7, repeater, acc);
         if (verboseFailures) {
-          evidence$7.aw(startIndex, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dB) + ".rep")))(parsedMsg))));
+          evidence$7.aw(startIndex, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
         }
         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$7), (!((!evidence$7.d) && evidence$7.p))))) {
+        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
           evidence$7.p = false;
           var sepCut = evidence$7.p;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
@@ -2106,7 +2106,7 @@ $p.af2 = (function(evidence$7) {
       evidence$7.Q();
     }
     var lhsValue$macro$12 = evidence$7.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$7);
     if (evidence$7.d) {
       if (((!evidence$7.d) && evidence$7.p)) {
         var parse0$1 = evidence$7;
@@ -2115,7 +2115,7 @@ $p.af2 = (function(evidence$7) {
         var repeater$1 = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
         var whitespace$1 = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
         var this$11 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
-        var acc$1 = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bQ();
+        var acc$1 = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
         var startIndex$1 = evidence$7.c;
         var count$1 = 0;
         var precut$1 = false;
@@ -2124,35 +2124,35 @@ $p.af2 = (function(evidence$7) {
         var lastAgg$1 = null;
         while (true) {
           evidence$7.p = (!(!(precut$1 | ((count$1 < 0) && outerCut$1))));
-          this.aKf(evidence$7);
+          this.aKr(evidence$7);
           var parsedMsg$1 = evidence$7.G;
           var parsedAgg$1 = evidence$7.v;
           var postCut$1 = evidence$7.p;
-          var verboseFailures$1 = evidence$7.C;
+          var verboseFailures$1 = evidence$7.D;
           if ((!evidence$7.d)) {
             if (postCut$1) {
             } else {
               $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$11, startIndex$1, startIndex$1, count$1, (!(!(outerCut$1 | postCut$1))), 0, evidence$7, repeater$1, acc$1);
             }
             if (verboseFailures$1) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ir(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, evidence$7, sepMsg$1, parsedMsg$1, lastAgg$1, (precut$1 || postCut$1));
               break;
             } else {
               break;
             }
           } else {
             var beforeSepIndex$1 = evidence$7.c;
-            acc$1.am(evidence$7.E);
+            acc$1.al(evidence$7.E);
             var nextCount$1 = ((1 + count$1) | 0);
             if ((nextCount$1 === 2147483647)) {
               $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$11, beforeSepIndex$1, beforeSepIndex$1, nextCount$1, (!(!(outerCut$1 | postCut$1))), 0, evidence$7, repeater$1, acc$1);
               if (verboseFailures$1) {
-                evidence$7.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg$1) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg$1.dB) + ".rep")))(parsedMsg$1))));
+                evidence$7.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg$1) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg$1.dC) + ".rep")))(parsedMsg$1))));
                 break;
               } else {
                 break;
               }
-            } else if (((whitespace$1 === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace$1, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
+            } else if (((whitespace$1 === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace$1, evidence$7), (!((!evidence$7.d) && evidence$7.p))))) {
               evidence$7.p = false;
               var sepCut$1 = evidence$7.p;
               var endCut$1 = (!(!((!(!(outerCut$1 | postCut$1))) | sepCut$1)));
@@ -2178,10 +2178,10 @@ $p.af2 = (function(evidence$7) {
           if (rhsMadeProgress$macro$10) {
             evidence$7.Q();
           }
-          var res$macro$14 = evidence$7.ab(x1$2.aD(lhsValue$macro$12, evidence$7.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$7.ab(x1$2.aF(lhsValue$macro$12, evidence$7.E), nextIndex$macro$13);
         }
-        if (evidence$7.C) {
-          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
+        if (evidence$7.D) {
+          evidence$7.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$7.S));
         }
         var parse0$1 = res$macro$14;
       }
@@ -2196,15 +2196,15 @@ $p.af2 = (function(evidence$7) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    parse0$1.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContent.$c_Lio_septimalmind_baboon_parser_model_RawContent(x0.D(), x0.z());
+    parse0$1.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContent.$c_Lio_septimalmind_baboon_parser_model_RawContent(x0.C(), x0.z());
     return parse0$1;
   }
 });
-$p.aFl = (function(evidence$8) {
+$p.aFx = (function(evidence$8) {
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
   var preLhsIndex$macro$2 = evidence$8.c;
   var input$macro$11 = evidence$8.T;
-  this.af2(evidence$8);
+  this.afb(evidence$8);
   if ((!evidence$8.d)) {
     return evidence$8;
   } else {
@@ -2215,7 +2215,7 @@ $p.aFl = (function(evidence$8) {
       evidence$8.Q();
     }
     var lhsValue$macro$12 = evidence$8.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$8);
     if (evidence$8.d) {
       if (((!evidence$8.d) && evidence$8.p)) {
         return evidence$8;
@@ -2235,8 +2235,8 @@ $p.aFl = (function(evidence$8) {
           }
           var res$macro$14 = evidence$8.ab(lhsValue$macro$12, nextIndex$macro$13);
         }
-        if (evidence$8.C) {
-          evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
+        if (evidence$8.D) {
+          evidence$8.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$8.S));
         }
         return res$macro$14;
       }
@@ -2245,13 +2245,13 @@ $p.aFl = (function(evidence$8) {
     }
   }
 });
-$p.aKD = (function(evidence$9) {
+$p.aKP = (function(evidence$9) {
   var startIndex = evidence$9.c;
   var instrument = (evidence$9.L !== null);
   if (instrument) {
     evidence$9.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, startIndex);
   }
-  var this$1 = this.CJ;
+  var this$1 = this.CX;
   var startIndex$1 = evidence$9.c;
   var instrument$1 = (evidence$9.L !== null);
   if (instrument$1) {
@@ -2273,7 +2273,7 @@ $p.aKD = (function(evidence$9) {
       evidence$9.Q();
     }
     var lhsValue$macro$12 = evidence$9.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
       if (((!evidence$9.d) && evidence$9.p)) {
       } else {
@@ -2297,7 +2297,7 @@ $p.aKD = (function(evidence$9) {
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$9.Q();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
           if (evidence$9.d) {
             if (((!evidence$9.d) && evidence$9.p)) {
               var x1$4$1 = evidence$9;
@@ -2315,11 +2315,11 @@ $p.aKD = (function(evidence$9) {
                   evidence$9.Q();
                 }
                 var lhsValue$macro$12$2 = evidence$9.E;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                 if (evidence$9.d) {
                   if ((!((!evidence$9.d) && evidence$9.p))) {
                     var preRhsIndex$macro$4$2 = evidence$9.c;
-                    var f = (() => this.af2(evidence$9));
+                    var f = (() => this.afb(evidence$9));
                     var startIndex$3 = evidence$9.c;
                     var instrument$3 = (evidence$9.L !== null);
                     if (instrument$3) {
@@ -2346,7 +2346,7 @@ $p.aKD = (function(evidence$9) {
                     } else {
                       evidence$9.aH();
                     }
-                    if (evidence$9.C) {
+                    if (evidence$9.D) {
                       evidence$9.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$9.d)) {
@@ -2357,7 +2357,7 @@ $p.aKD = (function(evidence$9) {
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$9.Q();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
                         if (((!evidence$9.d) && evidence$9.p)) {
                         } else {
@@ -2376,8 +2376,8 @@ $p.aKD = (function(evidence$9) {
                             }
                             var res$macro$14 = evidence$9.ab(evidence$9.E, nextIndex$macro$13);
                           }
-                          if (evidence$9.C) {
-                            evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$3 === evidence$9.S));
+                          if (evidence$9.D) {
+                            evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$3 === evidence$9.S));
                           }
                         }
                       }
@@ -2392,7 +2392,7 @@ $p.aKD = (function(evidence$9) {
                         evidence$9.Q();
                       }
                       var lhsValue$macro$27 = evidence$9.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                       if (evidence$9.d) {
                         if (((!evidence$9.d) && evidence$9.p)) {
                           var x1$8 = evidence$9;
@@ -2405,7 +2405,7 @@ $p.aKD = (function(evidence$9) {
                           } else {
                             evidence$9.aH();
                           }
-                          if (evidence$9.C) {
+                          if (evidence$9.D) {
                             evidence$9.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
                           var rhsAggregate$macro$22 = evidence$9.v;
@@ -2421,8 +2421,8 @@ $p.aKD = (function(evidence$9) {
                             }
                             var res$macro$29 = evidence$9.ab(lhsValue$macro$27, nextIndex$macro$28);
                           }
-                          if (evidence$9.C) {
-                            evidence$9.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$9.S));
+                          if (evidence$9.D) {
+                            evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$9.S));
                           }
                           var x1$8 = res$macro$29;
                         }
@@ -2433,7 +2433,7 @@ $p.aKD = (function(evidence$9) {
                     if (instrument$4) {
                       evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (x1$8.C) {
+                    if (x1$8.D) {
                       var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                       var forceAggregate = (startIndex$4 < x1$8.S);
                       x1$8.K(newshortMsg, x1$8.v, forceAggregate);
@@ -2449,7 +2449,7 @@ $p.aKD = (function(evidence$9) {
                     } else if (evidence$9.p) {
                       var x1$3$3 = evidence$9;
                     } else {
-                      var verboseFailures = evidence$9.C;
+                      var verboseFailures = evidence$9.D;
                       evidence$9.c = startPos;
                       if (verboseFailures) {
                         evidence$9.K(lhsMsg, evidence$9.v, false);
@@ -2473,7 +2473,7 @@ $p.aKD = (function(evidence$9) {
                       } else {
                         evidence$9.aH();
                       }
-                      if (evidence$9.C) {
+                      if (evidence$9.D) {
                         evidence$9.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$9.d)) {
@@ -2484,7 +2484,7 @@ $p.aKD = (function(evidence$9) {
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                           evidence$9.Q();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
                           if (((!evidence$9.d) && evidence$9.p)) {
                           } else {
@@ -2503,8 +2503,8 @@ $p.aKD = (function(evidence$9) {
                               }
                               var res$macro$14$1 = evidence$9.ab(evidence$9.E, nextIndex$macro$13$1);
                             }
-                            if (evidence$9.C) {
-                              evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8$1), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$4 === evidence$9.S));
+                            if (evidence$9.D) {
+                              evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8$1), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$4 === evidence$9.S));
                             }
                           }
                         }
@@ -2519,7 +2519,7 @@ $p.aKD = (function(evidence$9) {
                           evidence$9.Q();
                         }
                         var lhsValue$macro$27$1 = evidence$9.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
                         if (evidence$9.d) {
                           if (((!evidence$9.d) && evidence$9.p)) {
                             var x1$8$1 = evidence$9;
@@ -2532,7 +2532,7 @@ $p.aKD = (function(evidence$9) {
                             } else {
                               evidence$9.aH();
                             }
-                            if (evidence$9.C) {
+                            if (evidence$9.D) {
                               evidence$9.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                             }
                             var rhsAggregate$macro$22$1 = evidence$9.v;
@@ -2548,8 +2548,8 @@ $p.aKD = (function(evidence$9) {
                               }
                               var res$macro$29$1 = evidence$9.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                             }
-                            if (evidence$9.C) {
-                              evidence$9.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$9.S));
+                            if (evidence$9.D) {
+                              evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$9.S));
                             }
                             var x1$8$1 = res$macro$29$1;
                           }
@@ -2560,7 +2560,7 @@ $p.aKD = (function(evidence$9) {
                       if (instrument$5) {
                         evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (x1$8$1.C) {
+                      if (x1$8$1.D) {
                         var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                         var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
                         x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
@@ -2572,7 +2572,7 @@ $p.aKD = (function(evidence$9) {
                       var rhsCut = evidence$9.p;
                       var endCut = (!(!(rhsCut | oldCut)));
                       if (((!evidence$9.d) && (!rhsCut))) {
-                        evidence$9.d2(startPos);
+                        evidence$9.d3(startPos);
                       }
                       evidence$9.p = endCut;
                       if (verboseFailures) {
@@ -2585,7 +2585,7 @@ $p.aKD = (function(evidence$9) {
                     if (instrument$3) {
                       evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                     }
-                    if (x1$3$3.C) {
+                    if (x1$3$3.D) {
                       var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                       var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
                       x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
@@ -2603,10 +2603,10 @@ $p.aKD = (function(evidence$9) {
                       if (rhsMadeProgress$macro$10$2) {
                         evidence$9.Q();
                       }
-                      evidence$9.ab(x1$2$1.aD(lhsValue$macro$12$2, evidence$9.E), nextIndex$macro$13$2);
+                      evidence$9.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$9.E), nextIndex$macro$13$2);
                     }
-                    if (evidence$9.C) {
-                      evidence$9.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$9.S));
+                    if (evidence$9.D) {
+                      evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$2), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$2 === evidence$9.S));
                     }
                   }
                 }
@@ -2625,8 +2625,8 @@ $p.aKD = (function(evidence$9) {
                 }
                 var res$macro$14$3 = evidence$9.ab(evidence$9.E, nextIndex$macro$13$3);
               }
-              if (evidence$9.C) {
-                evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$3), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$1 === evidence$9.S));
+              if (evidence$9.D) {
+                evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8$3), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$1 === evidence$9.S));
               }
               var x1$4$1 = res$macro$14$3;
             }
@@ -2637,7 +2637,7 @@ $p.aKD = (function(evidence$9) {
         if (instrument$2) {
           evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.C) {
+        if (x1$4$1.D) {
           var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
           x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
@@ -2656,10 +2656,10 @@ $p.aKD = (function(evidence$9) {
           if (rhsMadeProgress$macro$10$4) {
             evidence$9.Q();
           }
-          var res$macro$14$4 = evidence$9.ab(x1$4.aD((lhsValue$macro$12 | 0), evidence$9.E), nextIndex$macro$13$4);
+          var res$macro$14$4 = evidence$9.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$9.E), nextIndex$macro$13$4);
         }
-        if (evidence$9.C) {
-          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$9.S));
+        if (evidence$9.D) {
+          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$4), lhsAggregate$macro$6.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4 === evidence$9.S));
         }
       }
     }
@@ -2674,7 +2674,7 @@ $p.aKD = (function(evidence$9) {
       evidence$9.Q();
     }
     var lhsValue$macro$27$2 = evidence$9.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$9);
     if (evidence$9.d) {
       if (((!evidence$9.d) && evidence$9.p)) {
         var parse0$6 = evidence$9;
@@ -2692,10 +2692,10 @@ $p.aKD = (function(evidence$9) {
           if (rhsMadeProgress$macro$25$2) {
             evidence$9.Q();
           }
-          var res$macro$29$2 = evidence$9.ab(x1$2.aD(lhsValue$macro$27$2, (evidence$9.E | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$9.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$9.E | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$9.C) {
-          evidence$9.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$9.S));
+        if (evidence$9.D) {
+          evidence$9.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$9.S));
         }
         var parse0$6 = res$macro$29$2;
       }
@@ -2711,17 +2711,17 @@ $p.aKD = (function(evidence$9) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.be;
-    var stop = (x0.bn | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cE(this$1.br.c7, stop);
-    parse0$6.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.ft, begin, end), value);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
+    parse0$6.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end), value);
     var x1$2$2 = parse0$6;
   }
   if (instrument$1) {
     evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
-  if (x1$2$2.C) {
+  if (x1$2$2.D) {
     var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$4 = (startIndex$1 < x1$2$2.S);
     x1$2$2.K(newshortMsg$5, x1$2$2.v, forceAggregate$4);
@@ -2736,7 +2736,7 @@ $p.aKD = (function(evidence$9) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$2.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$2.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
     var parse0$7 = x1$2$2;
   }
   if ((!parse0$7.d)) {
@@ -2746,10 +2746,10 @@ $p.aKD = (function(evidence$9) {
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.D();
+        var m = x0$2.C();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.C(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -2761,7 +2761,7 @@ $p.aKD = (function(evidence$9) {
   if (instrument) {
     evidence$9.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B, x1$2$3.c, x1$2$3.d);
   }
-  if (x1$2$3.C) {
+  if (x1$2$3.D) {
     var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("namespaceDef").B)));
     var forceAggregate$5 = (startIndex < x1$2$3.S);
     x1$2$3.K(newshortMsg$6, x1$2$3.v, forceAggregate$5);
@@ -2777,12 +2777,12 @@ $p.aKD = (function(evidence$9) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
     }
     var meta = x0$3.aY;
-    x1$2$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.be), x0$3.bn.oW, meta);
+    x1$2$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.bk), x0$3.br.oY, meta);
     return x1$2$3;
   }
 });
-$p.aEH = (function(evidence$10) {
-  var parse0 = this.aje.avW(evidence$10);
+$p.aET = (function(evidence$10) {
+  var parse0 = this.ajm.aw6(evidence$10);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2790,8 +2790,8 @@ $p.aEH = (function(evidence$10) {
     return parse0;
   }
 });
-$p.a0c = (function(evidence$11) {
-  var parse0 = this.ajd.afe(evidence$11);
+$p.a0g = (function(evidence$11) {
+  var parse0 = this.ajl.afn(evidence$11);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2799,8 +2799,8 @@ $p.a0c = (function(evidence$11) {
     return parse0;
   }
 });
-$p.aey = (function(evidence$12) {
-  var parse0 = this.ajb.auu(evidence$12);
+$p.aeH = (function(evidence$12) {
+  var parse0 = this.ajj.auC(evidence$12);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2808,8 +2808,8 @@ $p.aey = (function(evidence$12) {
     return parse0;
   }
 });
-$p.afA = (function(evidence$13) {
-  var parse0 = this.ajf.aH9(evidence$13);
+$p.afJ = (function(evidence$13) {
+  var parse0 = this.ajn.aHk(evidence$13);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2817,8 +2817,8 @@ $p.afA = (function(evidence$13) {
     return parse0;
   }
 });
-$p.aFm = (function(evidence$14) {
-  var parse0 = this.ajc.avp(evidence$14);
+$p.aFy = (function(evidence$14) {
+  var parse0 = this.ajk.avx(evidence$14);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2826,8 +2826,8 @@ $p.aFm = (function(evidence$14) {
     return parse0;
   }
 });
-$p.ahw = (function(evidence$15) {
-  var parse0 = this.ajg.ahw(evidence$15);
+$p.ahB = (function(evidence$15) {
+  var parse0 = this.ajo.ahB(evidence$15);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2835,8 +2835,8 @@ $p.ahw = (function(evidence$15) {
     return parse0;
   }
 });
-$p.aKC = (function(evidence$16) {
-  var parse0 = this.aKD(evidence$16);
+$p.aKO = (function(evidence$16) {
+  var parse0 = this.aKP(evidence$16);
   if ((!parse0.d)) {
     return parse0;
   } else {
@@ -2845,7 +2845,7 @@ $p.aKC = (function(evidence$16) {
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefModel = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefModel, "io.septimalmind.baboon.parser.defns.DefModel", ({
-  vt: 1
+  vx: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefModel as $d_Lio_septimalmind_baboon_parser_defns_DefModel };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Model.js.map