@7mind.io/baboon 0.0.166 → 0.0.168

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

@@ -27,12 +27,12 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefAdt(context, meta, defDto, defContract) {
-  this.Jo = null;
-  this.a2N = null;
-  this.ajs = null;
-  this.Jo = meta;
-  this.a2N = defDto;
-  this.ajs = defContract;
+  this.JH = null;
+  this.a3c = null;
+  this.ak2 = null;
+  this.JH = meta;
+  this.a3c = defDto;
+  this.ak2 = defContract;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefAdt as $c_Lio_septimalmind_baboon_parser_defns_DefAdt };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefAdt.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -42,19 +42,19 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefAdt() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefAdt as $h_Lio_septimalmind_baboon_parser_defns_DefAdt };
 $h_Lio_septimalmind_baboon_parser_defns_DefAdt.prototype = $p;
-$p.aDi = (function(evidence$1) {
+$p.aEk = (function(evidence$1) {
   var startIndex = evidence$1.c;
-  var instrument = (evidence$1.L !== null);
+  var instrument = (evidence$1.M !== null);
   if (instrument) {
-    evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B, startIndex);
+    evidence$1.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B, startIndex);
   }
-  var this$1 = this.Jo;
+  var this$1 = this.JH;
   var startIndex$1 = evidence$1.c;
-  var instrument$1 = (evidence$1.L !== null);
+  var instrument$1 = (evidence$1.M !== null);
   if (instrument$1) {
-    evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$1.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -64,30 +64,30 @@ $p.aDi = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.s;
+    var lhsAggregate$macro$6 = evidence$1.v;
     var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$1.P();
     }
-    var lhsValue$macro$12 = evidence$1.E;
+    var lhsValue$macro$12 = evidence$1.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$1.c;
-        this.a2N.afy(evidence$1);
-        var rhsAggregate$macro$7 = evidence$1.s;
+        this.a3c.ag8(evidence$1);
+        var rhsAggregate$macro$7 = evidence$1.v;
         var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
         } else {
           var postRhsIndex$macro$5 = evidence$1.c;
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
-          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
+          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
             evidence$1.P();
           }
-          var res$macro$14 = evidence$1.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$1.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$1.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$1.D), nextIndex$macro$13);
         }
         if (evidence$1.C) {
           evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
@@ -99,31 +99,31 @@ $p.aDi = (function(evidence$1) {
     var parse0$2 = evidence$1;
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.s;
+    var lhsAggregate$macro$21 = evidence$1.v;
     var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$1.P();
     }
-    var lhsValue$macro$27 = evidence$1.E;
+    var lhsValue$macro$27 = evidence$1.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
     if (evidence$1.d) {
-      if (((!evidence$1.d) && evidence$1.p)) {
+      if (((!evidence$1.d) && evidence$1.o)) {
         var parse0$2 = evidence$1;
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$1);
-        var rhsAggregate$macro$22 = evidence$1.s;
+        var rhsAggregate$macro$22 = evidence$1.v;
         var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
         } else {
           var postRhsIndex$macro$20 = evidence$1.c;
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
-          var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
+          var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
             evidence$1.P();
           }
-          var res$macro$29 = evidence$1.ab(x1$2.aF(lhsValue$macro$27, (evidence$1.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$1.aa(x1$2.aG(lhsValue$macro$27, (evidence$1.D | 0)), 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));
@@ -137,25 +137,25 @@ $p.aDi = (function(evidence$1) {
   if ((!parse0$2.d)) {
     var x1$2$1 = parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aY | 0);
-    var value = x0.bm;
-    var stop = (x0.bs | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
-    parse0$2.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fu, begin, end), value);
+    var start = (x0.aX | 0);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument$1) {
-    evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$1.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate = (startIndex$1 < x1$2$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.s, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
     if ((!x1$2$1.d)) {
       x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$1.Y);
     }
@@ -163,20 +163,20 @@ $p.aDi = (function(evidence$1) {
   if ((!x1$2$1.d)) {
     var x1$2$2 = x1$2$1;
   } else {
-    var x0$1 = x1$2$1.E;
+    var x0$1 = x1$2$1.D;
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.E()), x0$1.z());
     var x1$2$2 = x1$2$1;
   }
   if (instrument) {
-    evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B, x1$2$2.c, x1$2$2.d);
+    evidence$1.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B, x1$2$2.c, x1$2$2.d);
   }
   if (x1$2$2.C) {
     var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B)));
     var forceAggregate$1 = (startIndex < x1$2$2.S);
-    x1$2$2.K(newshortMsg$1, x1$2$2.s, forceAggregate$1);
+    x1$2$2.K(newshortMsg$1, x1$2$2.v, forceAggregate$1);
     if ((!x1$2$2.d)) {
       x1$2$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMember").B, startIndex), x1$2$2.Y);
     }
@@ -184,28 +184,28 @@ $p.aDi = (function(evidence$1) {
   if ((!x1$2$2.d)) {
     return x1$2$2;
   } else {
-    var x0$2 = x1$2$2.E;
+    var x0$2 = x1$2$2.D;
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
-    x1$2$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt$002dMember$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawAdtMemberDto(x0$2.z(), meta);
+    var meta = x0$2.E();
+    x1$2$2.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt$002dMember$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawAdtMemberDto(x0$2.z(), meta);
     return x1$2$2;
   }
 });
-$p.aDj = (function(evidence$2) {
+$p.aEl = (function(evidence$2) {
   var startIndex = evidence$2.c;
-  var instrument = (evidence$2.L !== null);
+  var instrument = (evidence$2.M !== null);
   if (instrument) {
-    evidence$2.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B, startIndex);
+    evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B, startIndex);
   }
-  var this$1 = this.Jo;
+  var this$1 = this.JH;
   var startIndex$1 = evidence$2.c;
-  var instrument$1 = (evidence$2.L !== null);
+  var instrument$1 = (evidence$2.M !== null);
   if (instrument$1) {
-    evidence$2.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$2.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   var preLhsIndex$macro$17 = evidence$2.c;
   var input$macro$26 = evidence$2.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -215,30 +215,30 @@ $p.aDj = (function(evidence$2) {
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$2.c;
-    var lhsAggregate$macro$6 = evidence$2.s;
+    var lhsAggregate$macro$6 = evidence$2.v;
     var lhsMsg$macro$9 = evidence$2.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$2.P();
     }
-    var lhsValue$macro$12 = evidence$2.E;
+    var lhsValue$macro$12 = evidence$2.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
-      if (((!evidence$2.d) && evidence$2.p)) {
+      if (((!evidence$2.d) && evidence$2.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$2.c;
-        this.ajs.avK(evidence$2);
-        var rhsAggregate$macro$7 = evidence$2.s;
+        this.ak2.awR(evidence$2);
+        var rhsAggregate$macro$7 = evidence$2.v;
         var rhsMsg$macro$8 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$14 = evidence$2;
         } else {
           var postRhsIndex$macro$5 = evidence$2.c;
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
-          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
+          var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
             evidence$2.P();
           }
-          var res$macro$14 = evidence$2.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$2.E), nextIndex$macro$13);
+          var res$macro$14 = evidence$2.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$2.D), nextIndex$macro$13);
         }
         if (evidence$2.C) {
           evidence$2.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$2.S));
@@ -250,31 +250,31 @@ $p.aDj = (function(evidence$2) {
     var parse0$2 = evidence$2;
   } else {
     var postLhsIndex$macro$18 = evidence$2.c;
-    var lhsAggregate$macro$21 = evidence$2.s;
+    var lhsAggregate$macro$21 = evidence$2.v;
     var lhsMsg$macro$24 = evidence$2.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
       evidence$2.P();
     }
-    var lhsValue$macro$27 = evidence$2.E;
+    var lhsValue$macro$27 = evidence$2.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
-      if (((!evidence$2.d) && evidence$2.p)) {
+      if (((!evidence$2.d) && evidence$2.o)) {
         var parse0$2 = evidence$2;
       } else {
         var preRhsIndex$macro$19 = evidence$2.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$2);
-        var rhsAggregate$macro$22 = evidence$2.s;
+        var rhsAggregate$macro$22 = evidence$2.v;
         var rhsMsg$macro$23 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$29 = evidence$2;
         } else {
           var postRhsIndex$macro$20 = evidence$2.c;
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
-          var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
+          var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
             evidence$2.P();
           }
-          var res$macro$29 = evidence$2.ab(x1$2.aF(lhsValue$macro$27, (evidence$2.E | 0)), nextIndex$macro$28);
+          var res$macro$29 = evidence$2.aa(x1$2.aG(lhsValue$macro$27, (evidence$2.D | 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));
@@ -288,25 +288,25 @@ $p.aDj = (function(evidence$2) {
   if ((!parse0$2.d)) {
     var x1$2$1 = parse0$2;
   } else {
-    var x0 = parse0$2.E;
+    var x0 = parse0$2.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aY | 0);
-    var value = x0.bm;
-    var stop = (x0.bs | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
-    parse0$2.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fu, begin, end), value);
+    var start = (x0.aX | 0);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$2.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value);
     var x1$2$1 = parse0$2;
   }
   if (instrument$1) {
-    evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
+    evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$1.c, x1$2$1.d);
   }
   if (x1$2$1.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate = (startIndex$1 < x1$2$1.S);
-    x1$2$1.K(newshortMsg, x1$2$1.s, forceAggregate);
+    x1$2$1.K(newshortMsg, x1$2$1.v, forceAggregate);
     if ((!x1$2$1.d)) {
       x1$2$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$1.Y);
     }
@@ -314,20 +314,20 @@ $p.aDj = (function(evidence$2) {
   if ((!x1$2$1.d)) {
     var x1$2$2 = x1$2$1;
   } else {
-    var x0$1 = x1$2$1.E;
+    var x0$1 = x1$2$1.D;
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$1.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$1.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.E()), x0$1.z());
     var x1$2$2 = x1$2$1;
   }
   if (instrument) {
-    evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B, x1$2$2.c, x1$2$2.d);
+    evidence$2.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B, x1$2$2.c, x1$2$2.d);
   }
   if (x1$2$2.C) {
     var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B)));
     var forceAggregate$1 = (startIndex < x1$2$2.S);
-    x1$2$2.K(newshortMsg$1, x1$2$2.s, forceAggregate$1);
+    x1$2$2.K(newshortMsg$1, x1$2$2.v, forceAggregate$1);
     if ((!x1$2$2.d)) {
       x1$2$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtMemberContract").B, startIndex), x1$2$2.Y);
     }
@@ -335,141 +335,141 @@ $p.aDj = (function(evidence$2) {
   if ((!x1$2$2.d)) {
     return x1$2$2;
   } else {
-    var x0$2 = x1$2$2.E;
+    var x0$2 = x1$2$2.D;
     if ((x0$2 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    var meta = x0$2.D();
-    x1$2$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt$002dMember$002dContract.$c_Lio_septimalmind_baboon_parser_model_RawAdtMemberContract(x0$2.z(), meta);
+    var meta = x0$2.E();
+    x1$2$2.D = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt$002dMember$002dContract.$c_Lio_septimalmind_baboon_parser_model_RawAdtMemberContract(x0$2.z(), meta);
     return x1$2$2;
   }
 });
-$p.aeR = (function(evidence$3) {
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
+$p.afr = (function(evidence$3) {
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().nd();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$4 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
   var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
   var startIndex = evidence$3.c;
   var count = 0;
   var precut = false;
-  var outerCut = evidence$3.p;
+  var outerCut = evidence$3.o;
   var sepMsg = null;
   var lastAgg = null;
   while (true) {
-    evidence$3.p = (!(!(precut | ((count < 0) && outerCut))));
+    evidence$3.o = (!(!(precut | ((count < 0) && outerCut))));
     var startIndex$1 = evidence$3.c;
-    var instrument = (evidence$3.L !== null);
+    var instrument = (evidence$3.M !== null);
     if (instrument) {
-      evidence$3.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B, startIndex$1);
+      evidence$3.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B, startIndex$1);
     }
-    var oldCut = evidence$3.p;
-    evidence$3.p = false;
+    var oldCut = evidence$3.o;
+    evidence$3.o = false;
     var startPos = evidence$3.c;
-    var oldCut$2 = evidence$3.p;
-    evidence$3.p = false;
+    var oldCut$2 = evidence$3.o;
+    evidence$3.o = false;
     var startPos$2 = evidence$3.c;
-    this.aDi(evidence$3);
+    this.aEk(evidence$3);
     var lhsMsg = evidence$3.F;
-    var lhsAggregate = evidence$3.s;
+    var lhsAggregate = evidence$3.v;
     if (evidence$3.d) {
-      evidence$3.p = (!(!(evidence$3.p | oldCut$2)));
+      evidence$3.o = (!(!(evidence$3.o | oldCut$2)));
       var parse0$1 = evidence$3;
-    } else if (evidence$3.p) {
+    } else if (evidence$3.o) {
       var parse0$1 = evidence$3;
     } else {
       var verboseFailures = evidence$3.C;
       evidence$3.c = startPos$2;
       if (verboseFailures) {
-        evidence$3.K(lhsMsg, evidence$3.s, false);
+        evidence$3.K(lhsMsg, evidence$3.v, false);
       }
-      evidence$3.p = false;
-      this.aDj(evidence$3);
+      evidence$3.o = false;
+      this.aEl(evidence$3);
       var rhsMsg = evidence$3.F;
-      var rhsCut = evidence$3.p;
+      var rhsCut = evidence$3.o;
       var endCut = (!(!(rhsCut | oldCut$2)));
       if (((!evidence$3.d) && (!rhsCut))) {
-        evidence$3.cZ(startPos$2);
+        evidence$3.d1(startPos$2);
       }
-      evidence$3.p = endCut;
+      evidence$3.o = endCut;
       if (verboseFailures) {
         var $x_1 = lhsMsg.W(rhsMsg);
-        var rassoc$3 = evidence$3.s;
+        var rassoc$3 = evidence$3.v;
         evidence$3.K($x_1, lhsAggregate.W(rassoc$3), false);
       }
       var parse0$1 = evidence$3;
     }
     if ((!parse0$1.d)) {
     } else {
-      parse0$1.E = new $j_java$002elang$002e$002dObject.$c_s_util_Right(parse0$1.E);
+      parse0$1.D = new $j_java$002elang$002e$002dObject.$c_s_util_Right(parse0$1.D);
     }
     var lhsMsg$2 = evidence$3.F;
-    var lhsAggregate$2 = evidence$3.s;
+    var lhsAggregate$2 = evidence$3.v;
     if (evidence$3.d) {
-      evidence$3.p = (!(!(evidence$3.p | oldCut)));
+      evidence$3.o = (!(!(evidence$3.o | oldCut)));
       var x1$6 = evidence$3;
-    } else if (evidence$3.p) {
+    } else if (evidence$3.o) {
       var x1$6 = evidence$3;
     } else {
       var verboseFailures$2 = evidence$3.C;
       evidence$3.c = startPos;
       if (verboseFailures$2) {
-        evidence$3.K(lhsMsg$2, evidence$3.s, false);
+        evidence$3.K(lhsMsg$2, evidence$3.v, false);
       }
-      evidence$3.p = false;
-      var parse0$3 = this.a2N.awu(evidence$3);
+      evidence$3.o = false;
+      var parse0$3 = this.a3c.axA(evidence$3);
       if (parse0$3.d) {
-        parse0$3.E = new $j_java$002elang$002e$002dObject.$c_s_util_Left(parse0$3.E);
+        parse0$3.D = new $j_java$002elang$002e$002dObject.$c_s_util_Left(parse0$3.D);
       }
       var rhsMsg$2 = evidence$3.F;
-      var rhsCut$2 = evidence$3.p;
+      var rhsCut$2 = evidence$3.o;
       var endCut$2 = (!(!(rhsCut$2 | oldCut)));
       if (((!evidence$3.d) && (!rhsCut$2))) {
-        evidence$3.cZ(startPos);
+        evidence$3.d1(startPos);
       }
-      evidence$3.p = endCut$2;
+      evidence$3.o = endCut$2;
       if (verboseFailures$2) {
         var $x_2 = lhsMsg$2.W(rhsMsg$2);
-        var rassoc$3$2 = evidence$3.s;
+        var rassoc$3$2 = evidence$3.v;
         evidence$3.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
       }
       var x1$6 = evidence$3;
     }
     if (instrument) {
-      evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B, x1$6.c, x1$6.d);
+      evidence$3.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B, x1$6.c, x1$6.d);
     }
     if (x1$6.C) {
       var newshortMsg$2 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B)));
       var forceAggregate = (startIndex$1 < x1$6.S);
-      x1$6.K(newshortMsg$2, x1$6.s, forceAggregate);
+      x1$6.K(newshortMsg$2, x1$6.v, forceAggregate);
       if ((!x1$6.d)) {
         x1$6.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adt").B, startIndex$1), x1$6.Y);
       }
     }
     var parsedMsg = evidence$3.F;
-    var parsedAgg = evidence$3.s;
-    var postCut = evidence$3.p;
+    var parsedAgg = evidence$3.v;
+    var postCut = evidence$3.o;
     var verboseFailures$1 = evidence$3.C;
     if ((!evidence$3.d)) {
       var res = (postCut ? evidence$3 : $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, startIndex, startIndex, count, (!(!(outerCut | postCut))), 0, evidence$3, repeater, acc));
       if (verboseFailures$1) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex, 0, evidence$3, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iv(startIndex, 0, evidence$3, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       return res;
     } else {
       var beforeSepIndex = evidence$3.c;
-      acc.am(evidence$3.E);
+      acc.am(evidence$3.D);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$3, repeater, acc);
         if (verboseFailures$1) {
-          evidence$3.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$().g1(parsedMsg.dL) + ".rep")))(parsedMsg))));
+          evidence$3.av(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$().g3(parsedMsg.dL) + ".rep")))(parsedMsg))));
         }
         return res$2;
-      } 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$3), (!((!evidence$3.d) && evidence$3.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$().ac(whitespace, evidence$3), (!((!evidence$3.d) && evidence$3.o)))))) {
         return evidence$3;
       } else {
-        evidence$3.p = false;
-        var sepCut = evidence$3.p;
+        evidence$3.o = false;
+        var sepCut = evidence$3.o;
         var endCut$1 = (!(!((!(!(outerCut | postCut))) | sepCut)));
         startIndex = beforeSepIndex;
         count = nextCount;
@@ -481,19 +481,19 @@ $p.aeR = (function(evidence$3) {
     }
   }
 });
-$p.auP = (function(evidence$4) {
+$p.avW = (function(evidence$4) {
   var startIndex = evidence$4.c;
-  var instrument = (evidence$4.L !== null);
+  var instrument = (evidence$4.M !== null);
   if (instrument) {
-    evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B, startIndex);
+    evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B, startIndex);
   }
-  var this$1 = this.Jo;
+  var this$1 = this.JH;
   var startIndex$1 = evidence$4.c;
-  var instrument$1 = (evidence$4.L !== null);
+  var instrument$1 = (evidence$4.M !== null);
   if (instrument$1) {
-    evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
+    evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g7;
   var preLhsIndex$macro$17 = evidence$4.c;
   var input$macro$26 = evidence$4.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -503,21 +503,21 @@ $p.auP = (function(evidence$4) {
   if ((!evidence$4.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$4.c;
-    var lhsAggregate$macro$6 = evidence$4.s;
+    var lhsAggregate$macro$6 = evidence$4.v;
     var lhsMsg$macro$9 = evidence$4.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
       evidence$4.P();
     }
-    var lhsValue$macro$12 = evidence$4.E;
+    var lhsValue$macro$12 = evidence$4.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
       } else {
         var preRhsIndex$macro$4 = evidence$4.c;
         var startIndex$2 = evidence$4.c;
-        var instrument$2 = (evidence$4.L !== null);
+        var instrument$2 = (evidence$4.M !== null);
         if (instrument$2) {
-          evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
+          evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2);
         }
         $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
         var preLhsIndex$macro$2$1 = evidence$4.c;
@@ -527,15 +527,15 @@ $p.auP = (function(evidence$4) {
           var x1$4$1 = evidence$4;
         } else {
           var postLhsIndex$macro$3$1 = evidence$4.c;
-          var lhsAggregate$macro$6$1 = evidence$4.s;
+          var lhsAggregate$macro$6$1 = evidence$4.v;
           var lhsMsg$macro$9$1 = evidence$4.F;
-          evidence$4.p = true;
+          evidence$4.o = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
             evidence$4.P();
           }
           $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
           if (evidence$4.d) {
-            if (((!evidence$4.d) && evidence$4.p)) {
+            if (((!evidence$4.d) && evidence$4.o)) {
               var x1$4$1 = evidence$4;
             } else {
               var preRhsIndex$macro$4$1 = evidence$4.c;
@@ -545,47 +545,47 @@ $p.auP = (function(evidence$4) {
               $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$4);
               if (evidence$4.d) {
                 var postLhsIndex$macro$3$2 = evidence$4.c;
-                var lhsAggregate$macro$6$2 = evidence$4.s;
+                var lhsAggregate$macro$6$2 = evidence$4.v;
                 var lhsMsg$macro$9$2 = evidence$4.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
                   evidence$4.P();
                 }
-                var lhsValue$macro$12$2 = evidence$4.E;
+                var lhsValue$macro$12$2 = evidence$4.D;
                 $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                 if (evidence$4.d) {
-                  if ((!((!evidence$4.d) && evidence$4.p))) {
+                  if ((!((!evidence$4.d) && evidence$4.o))) {
                     var preRhsIndex$macro$4$2 = evidence$4.c;
                     var x1$2$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
                     var preLhsIndex$macro$2$3 = evidence$4.c;
                     var input$macro$11$3 = evidence$4.T;
-                    this.Jo.a0m(evidence$4);
+                    this.JH.a0G(evidence$4);
                     if (evidence$4.d) {
                       var postLhsIndex$macro$3$3 = evidence$4.c;
-                      var lhsAggregate$macro$6$3 = evidence$4.s;
+                      var lhsAggregate$macro$6$3 = evidence$4.v;
                       var lhsMsg$macro$9$3 = evidence$4.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
                         evidence$4.P();
                       }
-                      var lhsValue$macro$12$3 = evidence$4.E;
+                      var lhsValue$macro$12$3 = evidence$4.D;
                       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                       if (evidence$4.d) {
-                        if ((!((!evidence$4.d) && evidence$4.p))) {
+                        if ((!((!evidence$4.d) && evidence$4.o))) {
                           var preRhsIndex$macro$4$3 = evidence$4.c;
-                          var f = (() => this.aeR(evidence$4));
+                          var f = (() => this.afr(evidence$4));
                           var startIndex$3 = evidence$4.c;
-                          var instrument$3 = (evidence$4.L !== null);
+                          var instrument$3 = (evidence$4.M !== null);
                           if (instrument$3) {
-                            evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
+                            evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3);
                           }
-                          var oldCut = evidence$4.p;
-                          evidence$4.p = false;
+                          var oldCut = evidence$4.o;
+                          evidence$4.o = false;
                           var startPos = evidence$4.c;
                           var startIndex$4 = evidence$4.c;
-                          var instrument$4 = (evidence$4.L !== null);
+                          var instrument$4 = (evidence$4.M !== null);
                           if (instrument$4) {
-                            evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
+                            evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                           }
-                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
                           var preLhsIndex$macro$17$1 = evidence$4.c;
                           var input$macro$26$1 = evidence$4.T;
                           $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -593,40 +593,40 @@ $p.auP = (function(evidence$4) {
                           var input$macro$11$4 = evidence$4.T;
                           var input = evidence$4.T;
                           var index = evidence$4.c;
-                          if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                            evidence$4.aI(((1 + index) | 0));
+                          if ((input.V(index) && (input.as.charCodeAt(index) === 123))) {
+                            evidence$4.aJ(((1 + index) | 0));
                           } else {
-                            evidence$4.aG();
+                            evidence$4.aH();
                           }
                           if (evidence$4.C) {
-                            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((() => "\"{\""))));
+                            evidence$4.av(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                           }
                           if ((!evidence$4.d)) {
                           } else {
                             var postLhsIndex$macro$3$4 = evidence$4.c;
-                            var lhsAggregate$macro$6$4 = evidence$4.s;
+                            var lhsAggregate$macro$6$4 = evidence$4.v;
                             var lhsMsg$macro$9$4 = evidence$4.F;
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
                               evidence$4.P();
                             }
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                             if (evidence$4.d) {
-                              if (((!evidence$4.d) && evidence$4.p)) {
+                              if (((!evidence$4.d) && evidence$4.o)) {
                               } else {
                                 var preRhsIndex$macro$4$4 = evidence$4.c;
                                 f();
-                                var rhsAggregate$macro$7 = evidence$4.s;
+                                var rhsAggregate$macro$7 = evidence$4.v;
                                 var rhsMsg$macro$8 = evidence$4.F;
                                 if ((!evidence$4.d)) {
                                   var res$macro$14 = evidence$4;
                                 } else {
                                   var postRhsIndex$macro$5 = evidence$4.c;
                                   var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$4);
-                                  var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
+                                  var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.V(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
                                   if (rhsMadeProgress$macro$10) {
                                     evidence$4.P();
                                   }
-                                  var res$macro$14 = evidence$4.ab(evidence$4.E, nextIndex$macro$13);
+                                  var res$macro$14 = evidence$4.aa(evidence$4.D, nextIndex$macro$13);
                                 }
                                 if (evidence$4.C) {
                                   evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$4.S));
@@ -638,40 +638,40 @@ $p.auP = (function(evidence$4) {
                             var x1$8 = evidence$4;
                           } else {
                             var postLhsIndex$macro$18 = evidence$4.c;
-                            var lhsAggregate$macro$21 = evidence$4.s;
+                            var lhsAggregate$macro$21 = evidence$4.v;
                             var lhsMsg$macro$24 = evidence$4.F;
                             if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
                               evidence$4.P();
                             }
-                            var lhsValue$macro$27 = evidence$4.E;
+                            var lhsValue$macro$27 = evidence$4.D;
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                             if (evidence$4.d) {
-                              if (((!evidence$4.d) && evidence$4.p)) {
+                              if (((!evidence$4.d) && evidence$4.o)) {
                                 var x1$8 = evidence$4;
                               } else {
                                 var preRhsIndex$macro$19 = evidence$4.c;
                                 var input$2 = evidence$4.T;
                                 var index$2 = evidence$4.c;
-                                if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                                  evidence$4.aI(((1 + index$2) | 0));
+                                if ((input$2.V(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
+                                  evidence$4.aJ(((1 + index$2) | 0));
                                 } else {
-                                  evidence$4.aG();
+                                  evidence$4.aH();
                                 }
                                 if (evidence$4.C) {
-                                  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((() => "\"}\""))));
+                                  evidence$4.av(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                                 }
-                                var rhsAggregate$macro$22 = evidence$4.s;
+                                var rhsAggregate$macro$22 = evidence$4.v;
                                 var rhsMsg$macro$23 = evidence$4.F;
                                 if ((!evidence$4.d)) {
                                   var res$macro$29 = evidence$4;
                                 } else {
                                   var postRhsIndex$macro$20 = evidence$4.c;
                                   var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
-                                  var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
+                                  var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.V(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                                   if (rhsMadeProgress$macro$25) {
                                     evidence$4.P();
                                   }
-                                  var res$macro$29 = evidence$4.ab(lhsValue$macro$27, nextIndex$macro$28);
+                                  var res$macro$29 = evidence$4.aa(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));
@@ -683,36 +683,36 @@ $p.auP = (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);
+                            evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                           }
                           if (x1$8.C) {
                             var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                             var forceAggregate = (startIndex$4 < x1$8.S);
-                            x1$8.K(newshortMsg, x1$8.s, forceAggregate);
+                            x1$8.K(newshortMsg, x1$8.v, forceAggregate);
                             if ((!x1$8.d)) {
                               x1$8.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.Y);
                             }
                           }
                           var lhsMsg = evidence$4.F;
-                          var lhsAggregate = evidence$4.s;
+                          var lhsAggregate = evidence$4.v;
                           if (evidence$4.d) {
-                            evidence$4.p = (!(!(evidence$4.p | oldCut)));
+                            evidence$4.o = (!(!(evidence$4.o | oldCut)));
                             var x1$3$3 = evidence$4;
-                          } else if (evidence$4.p) {
+                          } else if (evidence$4.o) {
                             var x1$3$3 = evidence$4;
                           } else {
                             var verboseFailures = evidence$4.C;
                             evidence$4.c = startPos;
                             if (verboseFailures) {
-                              evidence$4.K(lhsMsg, evidence$4.s, false);
+                              evidence$4.K(lhsMsg, evidence$4.v, false);
                             }
-                            evidence$4.p = false;
+                            evidence$4.o = false;
                             var startIndex$5 = evidence$4.c;
-                            var instrument$5 = (evidence$4.L !== null);
+                            var instrument$5 = (evidence$4.M !== null);
                             if (instrument$5) {
-                              evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
+                              evidence$4.M.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                             }
-                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().et();
                             var preLhsIndex$macro$17$2 = evidence$4.c;
                             var input$macro$26$2 = evidence$4.T;
                             $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -720,40 +720,40 @@ $p.auP = (function(evidence$4) {
                             var input$macro$11$5 = evidence$4.T;
                             var input$1 = evidence$4.T;
                             var index$1 = evidence$4.c;
-                            if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                              evidence$4.aI(((1 + index$1) | 0));
+                            if ((input$1.V(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
+                              evidence$4.aJ(((1 + index$1) | 0));
                             } else {
-                              evidence$4.aG();
+                              evidence$4.aH();
                             }
                             if (evidence$4.C) {
-                              evidence$4.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
+                              evidence$4.av(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                             }
                             if ((!evidence$4.d)) {
                             } else {
                               var postLhsIndex$macro$3$5 = evidence$4.c;
-                              var lhsAggregate$macro$6$5 = evidence$4.s;
+                              var lhsAggregate$macro$6$5 = evidence$4.v;
                               var lhsMsg$macro$9$5 = evidence$4.F;
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
                                 evidence$4.P();
                               }
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                               if (evidence$4.d) {
-                                if (((!evidence$4.d) && evidence$4.p)) {
+                                if (((!evidence$4.d) && evidence$4.o)) {
                                 } else {
                                   var preRhsIndex$macro$4$5 = evidence$4.c;
                                   f();
-                                  var rhsAggregate$macro$7$1 = evidence$4.s;
+                                  var rhsAggregate$macro$7$1 = evidence$4.v;
                                   var rhsMsg$macro$8$1 = evidence$4.F;
                                   if ((!evidence$4.d)) {
                                     var res$macro$14$1 = evidence$4;
                                   } else {
                                     var postRhsIndex$macro$5$1 = evidence$4.c;
                                     var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$5);
-                                    var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
+                                    var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.V(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
                                     if (rhsMadeProgress$macro$10$1) {
                                       evidence$4.P();
                                     }
-                                    var res$macro$14$1 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$1);
+                                    var res$macro$14$1 = evidence$4.aa(evidence$4.D, nextIndex$macro$13$1);
                                   }
                                   if (evidence$4.C) {
                                     evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$4.S));
@@ -765,40 +765,40 @@ $p.auP = (function(evidence$4) {
                               var x1$8$1 = evidence$4;
                             } else {
                               var postLhsIndex$macro$18$1 = evidence$4.c;
-                              var lhsAggregate$macro$21$1 = evidence$4.s;
+                              var lhsAggregate$macro$21$1 = evidence$4.v;
                               var lhsMsg$macro$24$1 = evidence$4.F;
                               if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
                                 evidence$4.P();
                               }
-                              var lhsValue$macro$27$1 = evidence$4.E;
+                              var lhsValue$macro$27$1 = evidence$4.D;
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
                               if (evidence$4.d) {
-                                if (((!evidence$4.d) && evidence$4.p)) {
+                                if (((!evidence$4.d) && evidence$4.o)) {
                                   var x1$8$1 = evidence$4;
                                 } else {
                                   var preRhsIndex$macro$19$1 = evidence$4.c;
                                   var input$2$1 = evidence$4.T;
                                   var index$2$1 = evidence$4.c;
-                                  if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                                    evidence$4.aI(((1 + index$2$1) | 0));
+                                  if ((input$2$1.V(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
+                                    evidence$4.aJ(((1 + index$2$1) | 0));
                                   } else {
-                                    evidence$4.aG();
+                                    evidence$4.aH();
                                   }
                                   if (evidence$4.C) {
-                                    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((() => "\")\""))));
+                                    evidence$4.av(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                                   }
-                                  var rhsAggregate$macro$22$1 = evidence$4.s;
+                                  var rhsAggregate$macro$22$1 = evidence$4.v;
                                   var rhsMsg$macro$23$1 = evidence$4.F;
                                   if ((!evidence$4.d)) {
                                     var res$macro$29$1 = evidence$4;
                                   } else {
                                     var postRhsIndex$macro$20$1 = evidence$4.c;
                                     var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
-                                    var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.U(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
+                                    var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.V(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                                     if (rhsMadeProgress$macro$25$1) {
                                       evidence$4.P();
                                     }
-                                    var res$macro$29$1 = evidence$4.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
+                                    var res$macro$29$1 = evidence$4.aa(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));
@@ -810,52 +810,52 @@ $p.auP = (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);
+                              evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                             }
                             if (x1$8$1.C) {
                               var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                               var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
-                              x1$8$1.K(newshortMsg$1, x1$8$1.s, forceAggregate$1);
+                              x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
                               if ((!x1$8$1.d)) {
                                 x1$8$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.Y);
                               }
                             }
                             var rhsMsg = evidence$4.F;
-                            var rhsCut = evidence$4.p;
+                            var rhsCut = evidence$4.o;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$4.d) && (!rhsCut))) {
-                              evidence$4.cZ(startPos);
+                              evidence$4.d1(startPos);
                             }
-                            evidence$4.p = endCut;
+                            evidence$4.o = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
-                              var rassoc$3 = evidence$4.s;
+                              var rassoc$3 = evidence$4.v;
                               evidence$4.K($x_1, lhsAggregate.W(rassoc$3), false);
                             }
                             var x1$3$3 = evidence$4;
                           }
                           if (instrument$3) {
-                            evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
+                            evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                           }
                           if (x1$3$3.C) {
                             var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                             var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
-                            x1$3$3.K(newshortMsg$3, x1$3$3.s, forceAggregate$2);
+                            x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
                             if ((!x1$3$3.d)) {
                               x1$3$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.Y);
                             }
                           }
-                          var rhsAggregate$macro$7$2 = evidence$4.s;
+                          var rhsAggregate$macro$7$2 = evidence$4.v;
                           var rhsMsg$macro$8$2 = evidence$4.F;
                           if ((!evidence$4.d)) {
                           } else {
                             var postRhsIndex$macro$5$2 = evidence$4.c;
                             var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$3);
-                            var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
+                            var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.V(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
                             if (rhsMadeProgress$macro$10$2) {
                               evidence$4.P();
                             }
-                            evidence$4.ab(x1$2$2.aF(lhsValue$macro$12$3, evidence$4.E), nextIndex$macro$13$2);
+                            evidence$4.aa(x1$2$2.aG(lhsValue$macro$12$3, evidence$4.D), 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));
@@ -863,17 +863,17 @@ $p.auP = (function(evidence$4) {
                         }
                       }
                     }
-                    var rhsAggregate$macro$7$3 = evidence$4.s;
+                    var rhsAggregate$macro$7$3 = evidence$4.v;
                     var rhsMsg$macro$8$3 = evidence$4.F;
                     if ((!evidence$4.d)) {
                     } else {
                       var postRhsIndex$macro$5$3 = evidence$4.c;
                       var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$2);
-                      var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
+                      var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.V(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
                       if (rhsMadeProgress$macro$10$3) {
                         evidence$4.P();
                       }
-                      evidence$4.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$4.E), nextIndex$macro$13$3);
+                      evidence$4.aa(x1$2$1.aG(lhsValue$macro$12$2, evidence$4.D), nextIndex$macro$13$3);
                     }
                     if (evidence$4.C) {
                       evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$4.S));
@@ -881,19 +881,19 @@ $p.auP = (function(evidence$4) {
                   }
                 }
               }
-              var rhsAggregate$macro$7$4 = evidence$4.s;
+              var rhsAggregate$macro$7$4 = evidence$4.v;
               var rhsMsg$macro$8$4 = evidence$4.F;
               if ((!evidence$4.d)) {
-                evidence$4.p = true;
+                evidence$4.o = true;
                 var res$macro$14$4 = evidence$4;
               } else {
                 var postRhsIndex$macro$5$4 = evidence$4.c;
                 var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$1);
-                var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
+                var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.V(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
                 if (rhsMadeProgress$macro$10$4) {
                   evidence$4.P();
                 }
-                var res$macro$14$4 = evidence$4.ab(evidence$4.E, nextIndex$macro$13$4);
+                var res$macro$14$4 = evidence$4.aa(evidence$4.D, nextIndex$macro$13$4);
               }
               if (evidence$4.C) {
                 evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$4.S));
@@ -905,28 +905,28 @@ $p.auP = (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);
+          evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
         if (x1$4$1.C) {
           var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$4, x1$4$1.s, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
           if ((!x1$4$1.d)) {
             x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
           }
         }
-        var rhsAggregate$macro$7$5 = evidence$4.s;
+        var rhsAggregate$macro$7$5 = evidence$4.v;
         var rhsMsg$macro$8$5 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$14$5 = evidence$4;
         } else {
           var postRhsIndex$macro$5$5 = evidence$4.c;
           var rhsMadeProgress$macro$10$5 = (postRhsIndex$macro$5$5 > preRhsIndex$macro$4);
-          var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.U(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
+          var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.V(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
           if (rhsMadeProgress$macro$10$5) {
             evidence$4.P();
           }
-          var res$macro$14$5 = evidence$4.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$4.E), nextIndex$macro$13$5);
+          var res$macro$14$5 = evidence$4.aa(x1$4.aG((lhsValue$macro$12 | 0), evidence$4.D), nextIndex$macro$13$5);
         }
         if (evidence$4.C) {
           evidence$4.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$4.S));
@@ -938,31 +938,31 @@ $p.auP = (function(evidence$4) {
     var parse0$7 = evidence$4;
   } else {
     var postLhsIndex$macro$18$2 = evidence$4.c;
-    var lhsAggregate$macro$21$2 = evidence$4.s;
+    var lhsAggregate$macro$21$2 = evidence$4.v;
     var lhsMsg$macro$24$2 = evidence$4.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
       evidence$4.P();
     }
-    var lhsValue$macro$27$2 = evidence$4.E;
+    var lhsValue$macro$27$2 = evidence$4.D;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$4);
     if (evidence$4.d) {
-      if (((!evidence$4.d) && evidence$4.p)) {
+      if (((!evidence$4.d) && evidence$4.o)) {
         var parse0$7 = evidence$4;
       } else {
         var preRhsIndex$macro$19$2 = evidence$4.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$4);
-        var rhsAggregate$macro$22$2 = evidence$4.s;
+        var rhsAggregate$macro$22$2 = evidence$4.v;
         var rhsMsg$macro$23$2 = evidence$4.F;
         if ((!evidence$4.d)) {
           var res$macro$29$2 = evidence$4;
         } else {
           var postRhsIndex$macro$20$2 = evidence$4.c;
           var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
-          var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.U(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
+          var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.V(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
           if (rhsMadeProgress$macro$25$2) {
             evidence$4.P();
           }
-          var res$macro$29$2 = evidence$4.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$4.E | 0)), nextIndex$macro$28$2);
+          var res$macro$29$2 = evidence$4.aa(x1$2.aG(lhsValue$macro$27$2, (evidence$4.D | 0)), 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));
@@ -976,25 +976,25 @@ $p.auP = (function(evidence$4) {
   if ((!parse0$7.d)) {
     var x1$2$3 = parse0$7;
   } else {
-    var x0 = parse0$7.E;
+    var x0 = parse0$7.D;
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    var start = (x0.aY | 0);
-    var value = x0.bm;
-    var stop = (x0.bs | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
-    parse0$7.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fu, begin, end), value);
+    var start = (x0.aX | 0);
+    var value = x0.bk;
+    var stop = (x0.br | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cH(this$1.bq.c7, stop);
+    parse0$7.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.fz, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
-    evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
+    evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
   }
   if (x1$2$3.C) {
     var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$4 = (startIndex$1 < x1$2$3.S);
-    x1$2$3.K(newshortMsg$5, x1$2$3.s, forceAggregate$4);
+    x1$2$3.K(newshortMsg$5, x1$2$3.v, forceAggregate$4);
     if ((!x1$2$3.d)) {
       x1$2$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$3.Y);
     }
@@ -1002,39 +1002,39 @@ $p.auP = (function(evidence$4) {
   if ((!x1$2$3.d)) {
     var parse0$8 = x1$2$3;
   } else {
-    var x0$1 = x1$2$3.E;
+    var x0$1 = x1$2$3.D;
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
+    x1$2$3.D = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.E()), x0$1.z());
     var parse0$8 = x1$2$3;
   }
   if ((!parse0$8.d)) {
     var x1$2$4 = parse0$8;
   } else {
-    var x0$2 = parse0$8.E;
+    var x0$2 = parse0$8.D;
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.D();
+        var m = x0$2.E();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.E(), p2.z());
           break matchEnd4$1;
         }
       }
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2);
     }
-    parse0$8.E = $x_2;
+    parse0$8.D = $x_2;
     var x1$2$4 = parse0$8;
   }
   if (instrument) {
-    evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B, x1$2$4.c, x1$2$4.d);
+    evidence$4.M.at(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B, x1$2$4.c, x1$2$4.d);
   }
   if (x1$2$4.C) {
     var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B)));
     var forceAggregate$5 = (startIndex < x1$2$4.S);
-    x1$2$4.K(newshortMsg$6, x1$2$4.s, forceAggregate$5);
+    x1$2$4.K(newshortMsg$6, x1$2$4.v, forceAggregate$5);
     if ((!x1$2$4.d)) {
       x1$2$4.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("adtEnclosed").B, startIndex), x1$2$4.Y);
     }
@@ -1042,15 +1042,15 @@ $p.auP = (function(evidence$4) {
   if ((!x1$2$4.d)) {
     return x1$2$4;
   } else {
-    var x0$3 = x1$2$4.E;
+    var x0$3 = x1$2$4.D;
     matchEnd4$2: {
       var $x_3;
       if ((x0$3 !== null)) {
-        var meta = x0$3.aY;
-        var name = x0$3.bm;
-        var p2$1 = x0$3.bs;
+        var meta = x0$3.aX;
+        var name = x0$3.bk;
+        var p2$1 = x0$3.br;
         if ((p2$1 !== null)) {
-          var derived = p2$1.D();
+          var derived = p2$1.E();
           var members = p2$1.z();
           var $x_3 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), members.bG(new $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dAdt$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_parser_defns_DefAdt$$anonfun$1(this)), members.bG(new $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dAdt$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_parser_defns_DefAdt$$anonfun$2(this)), derived, meta);
           break matchEnd4$2;
@@ -1058,12 +1058,12 @@ $p.auP = (function(evidence$4) {
       }
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
     }
-    x1$2$4.E = $x_3;
+    x1$2$4.D = $x_3;
     return x1$2$4;
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefAdt = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefAdt, "io.septimalmind.baboon.parser.defns.DefAdt", ({
-  vr: 1
+  vv: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefAdt as $d_Lio_septimalmind_baboon_parser_defns_DefAdt };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Adt.js.map