@7mind.io/baboon 0.0.164 → 0.0.166

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

@@ -26,14 +26,14 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefService(context, meta, dto, adt, enm) {
-  this.UF = null;
-  this.a2G = null;
-  this.ajp = null;
-  this.ajq = null;
-  this.UF = meta;
-  this.a2G = dto;
-  this.ajp = adt;
-  this.ajq = enm;
+  this.UO = null;
+  this.a2P = null;
+  this.ajB = null;
+  this.ajC = null;
+  this.UO = meta;
+  this.a2P = dto;
+  this.ajB = adt;
+  this.ajC = enm;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefService as $c_Lio_septimalmind_baboon_parser_defns_DefService };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefService.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -43,19 +43,19 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefService() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefService as $h_Lio_septimalmind_baboon_parser_defns_DefService };
 $h_Lio_septimalmind_baboon_parser_defns_DefService.prototype = $p;
-$p.ahB = (function(evidence$1) {
+$p.ahN = (function(evidence$1) {
   var startIndex = evidence$1.c;
   var instrument = (evidence$1.L !== null);
   if (instrument) {
     evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("service").B, startIndex);
   }
-  var this$1 = this.UF;
+  var this$1 = this.UO;
   var startIndex$1 = evidence$1.c;
   var instrument$1 = (evidence$1.L !== null);
   if (instrument$1) {
     evidence$1.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   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$());
@@ -65,13 +65,13 @@ $p.ahB = (function(evidence$1) {
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.v;
-    var lhsMsg$macro$9 = evidence$1.G;
+    var lhsAggregate$macro$6 = evidence$1.s;
+    var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$12 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $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)) {
       } else {
@@ -89,13 +89,13 @@ $p.ahB = (function(evidence$1) {
           var x1$4$1 = evidence$1;
         } else {
           var postLhsIndex$macro$3$1 = evidence$1.c;
-          var lhsAggregate$macro$6$1 = evidence$1.v;
-          var lhsMsg$macro$9$1 = evidence$1.G;
+          var lhsAggregate$macro$6$1 = evidence$1.s;
+          var lhsMsg$macro$9$1 = evidence$1.F;
           evidence$1.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$1.Q();
+            evidence$1.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+          $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)) {
               var x1$4$1 = evidence$1;
@@ -107,17 +107,17 @@ $p.ahB = (function(evidence$1) {
               $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$1);
               if (evidence$1.d) {
                 var postLhsIndex$macro$3$2 = evidence$1.c;
-                var lhsAggregate$macro$6$2 = evidence$1.v;
-                var lhsMsg$macro$9$2 = evidence$1.G;
+                var lhsAggregate$macro$6$2 = evidence$1.s;
+                var lhsMsg$macro$9$2 = evidence$1.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-                  evidence$1.Q();
+                  evidence$1.P();
                 }
                 var lhsValue$macro$12$2 = evidence$1.E;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+                $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))) {
                     var preRhsIndex$macro$4$2 = evidence$1.c;
-                    var f = (() => this.aKv(evidence$1));
+                    var f = (() => this.aKK(evidence$1));
                     var startIndex$3 = evidence$1.c;
                     var instrument$3 = (evidence$1.L !== null);
                     if (instrument$3) {
@@ -131,7 +131,7 @@ $p.ahB = (function(evidence$1) {
                     if (instrument$4) {
                       evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                     var preLhsIndex$macro$17$1 = evidence$1.c;
                     var input$macro$26$1 = evidence$1.T;
                     $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -140,29 +140,29 @@ $p.ahB = (function(evidence$1) {
                     var input = evidence$1.T;
                     var index = evidence$1.c;
                     if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                      evidence$1.aK(((1 + index) | 0));
+                      evidence$1.aI(((1 + index) | 0));
                     } else {
-                      evidence$1.aH();
+                      evidence$1.aG();
                     }
-                    if (evidence$1.D) {
+                    if (evidence$1.C) {
                       evidence$1.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$1.d)) {
                     } else {
                       var postLhsIndex$macro$3$3 = evidence$1.c;
-                      var lhsAggregate$macro$6$3 = evidence$1.v;
-                      var lhsMsg$macro$9$3 = evidence$1.G;
+                      var lhsAggregate$macro$6$3 = evidence$1.s;
+                      var lhsMsg$macro$9$3 = evidence$1.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$1.Q();
+                        evidence$1.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+                      $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)) {
                         } else {
                           var preRhsIndex$macro$4$3 = evidence$1.c;
                           f();
-                          var rhsAggregate$macro$7 = evidence$1.v;
-                          var rhsMsg$macro$8 = evidence$1.G;
+                          var rhsAggregate$macro$7 = evidence$1.s;
+                          var rhsMsg$macro$8 = evidence$1.F;
                           if ((!evidence$1.d)) {
                             var res$macro$14 = evidence$1;
                           } else {
@@ -170,12 +170,12 @@ $p.ahB = (function(evidence$1) {
                             var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$3.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5);
                             if (rhsMadeProgress$macro$10) {
-                              evidence$1.Q();
+                              evidence$1.P();
                             }
                             var res$macro$14 = evidence$1.ab(evidence$1.E, nextIndex$macro$13);
                           }
-                          if (evidence$1.D) {
-                            evidence$1.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$1.S));
+                          if (evidence$1.C) {
+                            evidence$1.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$1.S));
                           }
                         }
                       }
@@ -184,13 +184,13 @@ $p.ahB = (function(evidence$1) {
                       var x1$8 = evidence$1;
                     } else {
                       var postLhsIndex$macro$18 = evidence$1.c;
-                      var lhsAggregate$macro$21 = evidence$1.v;
-                      var lhsMsg$macro$24 = evidence$1.G;
+                      var lhsAggregate$macro$21 = evidence$1.s;
+                      var lhsMsg$macro$24 = evidence$1.F;
                       if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-                        evidence$1.Q();
+                        evidence$1.P();
                       }
                       var lhsValue$macro$27 = evidence$1.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+                      $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)) {
                           var x1$8 = evidence$1;
@@ -199,15 +199,15 @@ $p.ahB = (function(evidence$1) {
                           var input$2 = evidence$1.T;
                           var index$2 = evidence$1.c;
                           if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                            evidence$1.aK(((1 + index$2) | 0));
+                            evidence$1.aI(((1 + index$2) | 0));
                           } else {
-                            evidence$1.aH();
+                            evidence$1.aG();
                           }
-                          if (evidence$1.D) {
+                          if (evidence$1.C) {
                             evidence$1.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                           }
-                          var rhsAggregate$macro$22 = evidence$1.v;
-                          var rhsMsg$macro$23 = evidence$1.G;
+                          var rhsAggregate$macro$22 = evidence$1.s;
+                          var rhsMsg$macro$23 = evidence$1.F;
                           if ((!evidence$1.d)) {
                             var res$macro$29 = evidence$1;
                           } else {
@@ -215,12 +215,12 @@ $p.ahB = (function(evidence$1) {
                             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);
                             if (rhsMadeProgress$macro$25) {
-                              evidence$1.Q();
+                              evidence$1.P();
                             }
                             var res$macro$29 = evidence$1.ab(lhsValue$macro$27, nextIndex$macro$28);
                           }
-                          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));
+                          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));
                           }
                           var x1$8 = res$macro$29;
                         }
@@ -231,26 +231,26 @@ $p.ahB = (function(evidence$1) {
                     if (instrument$4) {
                       evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (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.v, forceAggregate);
+                      x1$8.K(newshortMsg, x1$8.s, 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$1.G;
-                    var lhsAggregate = evidence$1.v;
+                    var lhsMsg = evidence$1.F;
+                    var lhsAggregate = evidence$1.s;
                     if (evidence$1.d) {
                       evidence$1.p = (!(!(evidence$1.p | oldCut)));
                       var x1$3$3 = evidence$1;
                     } else if (evidence$1.p) {
                       var x1$3$3 = evidence$1;
                     } else {
-                      var verboseFailures = evidence$1.D;
+                      var verboseFailures = evidence$1.C;
                       evidence$1.c = startPos;
                       if (verboseFailures) {
-                        evidence$1.K(lhsMsg, evidence$1.v, false);
+                        evidence$1.K(lhsMsg, evidence$1.s, false);
                       }
                       evidence$1.p = false;
                       var startIndex$5 = evidence$1.c;
@@ -258,7 +258,7 @@ $p.ahB = (function(evidence$1) {
                       if (instrument$5) {
                         evidence$1.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                       var preLhsIndex$macro$17$2 = evidence$1.c;
                       var input$macro$26$2 = evidence$1.T;
                       $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -267,29 +267,29 @@ $p.ahB = (function(evidence$1) {
                       var input$1 = evidence$1.T;
                       var index$1 = evidence$1.c;
                       if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                        evidence$1.aK(((1 + index$1) | 0));
+                        evidence$1.aI(((1 + index$1) | 0));
                       } else {
-                        evidence$1.aH();
+                        evidence$1.aG();
                       }
-                      if (evidence$1.D) {
+                      if (evidence$1.C) {
                         evidence$1.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$1.d)) {
                       } else {
                         var postLhsIndex$macro$3$4 = evidence$1.c;
-                        var lhsAggregate$macro$6$4 = evidence$1.v;
-                        var lhsMsg$macro$9$4 = evidence$1.G;
+                        var lhsAggregate$macro$6$4 = evidence$1.s;
+                        var lhsMsg$macro$9$4 = evidence$1.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                          evidence$1.Q();
+                          evidence$1.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+                        $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)) {
                           } else {
                             var preRhsIndex$macro$4$4 = evidence$1.c;
                             f();
-                            var rhsAggregate$macro$7$1 = evidence$1.v;
-                            var rhsMsg$macro$8$1 = evidence$1.G;
+                            var rhsAggregate$macro$7$1 = evidence$1.s;
+                            var rhsMsg$macro$8$1 = evidence$1.F;
                             if ((!evidence$1.d)) {
                               var res$macro$14$1 = evidence$1;
                             } else {
@@ -297,12 +297,12 @@ $p.ahB = (function(evidence$1) {
                               var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$4);
                               var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$4.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$1);
                               if (rhsMadeProgress$macro$10$1) {
-                                evidence$1.Q();
+                                evidence$1.P();
                               }
                               var res$macro$14$1 = evidence$1.ab(evidence$1.E, nextIndex$macro$13$1);
                             }
-                            if (evidence$1.D) {
-                              evidence$1.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$1.S));
+                            if (evidence$1.C) {
+                              evidence$1.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$1.S));
                             }
                           }
                         }
@@ -311,13 +311,13 @@ $p.ahB = (function(evidence$1) {
                         var x1$8$1 = evidence$1;
                       } else {
                         var postLhsIndex$macro$18$1 = evidence$1.c;
-                        var lhsAggregate$macro$21$1 = evidence$1.v;
-                        var lhsMsg$macro$24$1 = evidence$1.G;
+                        var lhsAggregate$macro$21$1 = evidence$1.s;
+                        var lhsMsg$macro$24$1 = evidence$1.F;
                         if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                          evidence$1.Q();
+                          evidence$1.P();
                         }
                         var lhsValue$macro$27$1 = evidence$1.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+                        $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)) {
                             var x1$8$1 = evidence$1;
@@ -326,15 +326,15 @@ $p.ahB = (function(evidence$1) {
                             var input$2$1 = evidence$1.T;
                             var index$2$1 = evidence$1.c;
                             if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                              evidence$1.aK(((1 + index$2$1) | 0));
+                              evidence$1.aI(((1 + index$2$1) | 0));
                             } else {
-                              evidence$1.aH();
+                              evidence$1.aG();
                             }
-                            if (evidence$1.D) {
+                            if (evidence$1.C) {
                               evidence$1.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$1.v;
-                            var rhsMsg$macro$23$1 = evidence$1.G;
+                            var rhsAggregate$macro$22$1 = evidence$1.s;
+                            var rhsMsg$macro$23$1 = evidence$1.F;
                             if ((!evidence$1.d)) {
                               var res$macro$29$1 = evidence$1;
                             } else {
@@ -342,12 +342,12 @@ $p.ahB = (function(evidence$1) {
                               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);
                               if (rhsMadeProgress$macro$25$1) {
-                                evidence$1.Q();
+                                evidence$1.P();
                               }
                               var res$macro$29$1 = evidence$1.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                             }
-                            if (evidence$1.D) {
-                              evidence$1.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$1.S));
+                            if (evidence$1.C) {
+                              evidence$1.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$1.S));
                             }
                             var x1$8$1 = res$macro$29$1;
                           }
@@ -358,24 +358,24 @@ $p.ahB = (function(evidence$1) {
                       if (instrument$5) {
                         evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (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.v, forceAggregate$1);
+                        x1$8$1.K(newshortMsg$1, x1$8$1.s, 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$1.G;
+                      var rhsMsg = evidence$1.F;
                       var rhsCut = evidence$1.p;
                       var endCut = (!(!(rhsCut | oldCut)));
                       if (((!evidence$1.d) && (!rhsCut))) {
-                        evidence$1.d3(startPos);
+                        evidence$1.cZ(startPos);
                       }
                       evidence$1.p = endCut;
                       if (verboseFailures) {
                         var $x_1 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$1.v;
+                        var rassoc$3 = evidence$1.s;
                         evidence$1.K($x_1, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$3 = evidence$1;
@@ -383,34 +383,34 @@ $p.ahB = (function(evidence$1) {
                     if (instrument$3) {
                       evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                     }
-                    if (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.v, forceAggregate$2);
+                      x1$3$3.K(newshortMsg$3, x1$3$3.s, 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$1.v;
-                    var rhsMsg$macro$8$2 = evidence$1.G;
+                    var rhsAggregate$macro$7$2 = evidence$1.s;
+                    var rhsMsg$macro$8$2 = evidence$1.F;
                     if ((!evidence$1.d)) {
                     } else {
                       var postRhsIndex$macro$5$2 = evidence$1.c;
                       var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$2);
                       var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$2.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$2);
                       if (rhsMadeProgress$macro$10$2) {
-                        evidence$1.Q();
+                        evidence$1.P();
                       }
                       evidence$1.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$1.E), nextIndex$macro$13$2);
                     }
-                    if (evidence$1.D) {
-                      evidence$1.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$1.S));
+                    if (evidence$1.C) {
+                      evidence$1.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$1.S));
                     }
                   }
                 }
               }
-              var rhsAggregate$macro$7$3 = evidence$1.v;
-              var rhsMsg$macro$8$3 = evidence$1.G;
+              var rhsAggregate$macro$7$3 = evidence$1.s;
+              var rhsMsg$macro$8$3 = evidence$1.F;
               if ((!evidence$1.d)) {
                 evidence$1.p = true;
                 var res$macro$14$3 = evidence$1;
@@ -419,12 +419,12 @@ $p.ahB = (function(evidence$1) {
                 var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$1.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$3);
                 if (rhsMadeProgress$macro$10$3) {
-                  evidence$1.Q();
+                  evidence$1.P();
                 }
                 var res$macro$14$3 = evidence$1.ab(evidence$1.E, nextIndex$macro$13$3);
               }
-              if (evidence$1.D) {
-                evidence$1.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$1.S));
+              if (evidence$1.C) {
+                evidence$1.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$1.S));
               }
               var x1$4$1 = res$macro$14$3;
             }
@@ -435,16 +435,16 @@ $p.ahB = (function(evidence$1) {
         if (instrument$2) {
           evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (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.v, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.s, 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$4 = evidence$1.v;
-        var rhsMsg$macro$8$4 = evidence$1.G;
+        var rhsAggregate$macro$7$4 = evidence$1.s;
+        var rhsMsg$macro$8$4 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14$4 = evidence$1;
         } else {
@@ -452,12 +452,12 @@ $p.ahB = (function(evidence$1) {
           var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4);
           var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$4);
           if (rhsMadeProgress$macro$10$4) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$14$4 = evidence$1.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$1.E), nextIndex$macro$13$4);
         }
-        if (evidence$1.D) {
-          evidence$1.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$1.S));
+        if (evidence$1.C) {
+          evidence$1.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$1.S));
         }
       }
     }
@@ -466,21 +466,21 @@ $p.ahB = (function(evidence$1) {
     var parse0$6 = evidence$1;
   } else {
     var postLhsIndex$macro$18$2 = evidence$1.c;
-    var lhsAggregate$macro$21$2 = evidence$1.v;
-    var lhsMsg$macro$24$2 = evidence$1.G;
+    var lhsAggregate$macro$21$2 = evidence$1.s;
+    var lhsMsg$macro$24$2 = evidence$1.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$27$2 = evidence$1.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
+    $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)) {
         var parse0$6 = evidence$1;
       } else {
         var preRhsIndex$macro$19$2 = 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$2 = evidence$1.v;
-        var rhsMsg$macro$23$2 = evidence$1.G;
+        var rhsAggregate$macro$22$2 = evidence$1.s;
+        var rhsMsg$macro$23$2 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29$2 = evidence$1;
         } else {
@@ -488,12 +488,12 @@ $p.ahB = (function(evidence$1) {
           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);
           if (rhsMadeProgress$macro$25$2) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$29$2 = evidence$1.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$1.E | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$1.D) {
-          evidence$1.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$1.S));
+        if (evidence$1.C) {
+          evidence$1.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$1.S));
         }
         var parse0$6 = res$macro$29$2;
       }
@@ -509,20 +509,20 @@ $p.ahB = (function(evidence$1) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 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$().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 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$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.fu, begin, end), value);
     var x1$2$2 = parse0$6;
   }
   if (instrument$1) {
     evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
-  if (x1$2$2.D) {
+  if (x1$2$2.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$2.S);
-    x1$2$2.K(newshortMsg$5, x1$2$2.v, forceAggregate$4);
+    x1$2$2.K(newshortMsg$5, x1$2$2.s, forceAggregate$4);
     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("withMeta").B, startIndex$1), x1$2$2.Y);
     }
@@ -534,7 +534,7 @@ $p.ahB = (function(evidence$1) {
     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.C()), 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.D()), x0$1.z());
     var parse0$7 = x1$2$2;
   }
   if ((!parse0$7.d)) {
@@ -544,10 +544,10 @@ $p.ahB = (function(evidence$1) {
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.C();
+        var m = x0$2.D();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.C(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -559,10 +559,10 @@ $p.ahB = (function(evidence$1) {
   if (instrument) {
     evidence$1.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("service").B, x1$2$3.c, x1$2$3.d);
   }
-  if (x1$2$3.D) {
+  if (x1$2$3.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("service").B)));
     var forceAggregate$5 = (startIndex < x1$2$3.S);
-    x1$2$3.K(newshortMsg$6, x1$2$3.v, forceAggregate$5);
+    x1$2$3.K(newshortMsg$6, x1$2$3.s, forceAggregate$5);
     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("service").B, startIndex), x1$2$3.Y);
     }
@@ -575,17 +575,17 @@ $p.ahB = (function(evidence$1) {
       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$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.bk), x0$3.br, meta);
+    x1$2$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(x0$3.bm), x0$3.bs, meta);
     return x1$2$3;
   }
 });
-$p.aKv = (function(evidence$2) {
+$p.aKK = (function(evidence$2) {
   var startIndex = evidence$2.c;
   var instrument = (evidence$2.L !== null);
   if (instrument) {
     evidence$2.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("methods").B, startIndex);
   }
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
   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();
@@ -598,31 +598,31 @@ $p.aKv = (function(evidence$2) {
   var x1$2;
   while (true) {
     evidence$2.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aKu(evidence$2);
-    var parsedMsg = evidence$2.G;
-    var parsedAgg = evidence$2.v;
+    this.aKJ(evidence$2);
+    var parsedMsg = evidence$2.F;
+    var parsedAgg = evidence$2.s;
     var postCut = evidence$2.p;
-    var verboseFailures = evidence$2.D;
+    var verboseFailures = evidence$2.C;
     if ((!evidence$2.d)) {
       var res = (postCut ? evidence$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, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, evidence$2, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, evidence$2, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$2, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       var x1$2 = res;
       break;
     } else {
       var beforeSepIndex = evidence$2.c;
-      acc.al(evidence$2.E);
+      acc.am(evidence$2.E);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$2, repeater, acc);
         if (verboseFailures) {
-          evidence$2.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
+          evidence$2.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(parsedMsg.dL) + ".rep")))(parsedMsg))));
         }
         var x1$2 = res$2;
         break;
       } else {
-        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(whitespace, evidence$2), (!((!evidence$2.d) && evidence$2.p))))) {
+        if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$2), (!((!evidence$2.d) && evidence$2.p))))) {
           evidence$2.p = false;
           var sepCut = evidence$2.p;
           var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
@@ -642,29 +642,29 @@ $p.aKv = (function(evidence$2) {
   if (instrument) {
     evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("methods").B, x1$2.c, x1$2.d);
   }
-  if (x1$2.D) {
+  if (x1$2.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("methods").B)));
     var forceAggregate = (startIndex < x1$2.S);
-    x1$2.K(newshortMsg, x1$2.v, forceAggregate);
+    x1$2.K(newshortMsg, x1$2.s, forceAggregate);
     if ((!x1$2.d)) {
       x1$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("methods").B, startIndex), x1$2.Y);
     }
   }
   return x1$2;
 });
-$p.aKu = (function(evidence$3) {
+$p.aKJ = (function(evidence$3) {
   var startIndex = evidence$3.c;
   var instrument = (evidence$3.L !== null);
   if (instrument) {
     evidence$3.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("method").B, startIndex);
   }
-  var this$1 = this.UF;
+  var this$1 = this.UO;
   var startIndex$1 = evidence$3.c;
   var instrument$1 = (evidence$3.L !== null);
   if (instrument$1) {
     evidence$3.L.av(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$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   var preLhsIndex$macro$17 = evidence$3.c;
   var input$macro$26 = evidence$3.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$());
@@ -674,13 +674,13 @@ $p.aKu = (function(evidence$3) {
   if ((!evidence$3.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.v;
-    var lhsMsg$macro$9 = evidence$3.G;
+    var lhsAggregate$macro$6 = evidence$3.s;
+    var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$12 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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 {
@@ -713,24 +713,24 @@ $p.aKu = (function(evidence$3) {
           var $x_1 = false;
         }
         if ($x_1) {
-          evidence$3.aK(end);
+          evidence$3.aI(end);
         } else {
-          evidence$3.aH();
+          evidence$3.aG();
         }
-        if (evidence$3.D) {
+        if (evidence$3.C) {
           evidence$3.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"def\""))));
         }
         if ((!evidence$3.d)) {
           var x1$4$1 = evidence$3;
         } else {
           var postLhsIndex$macro$3$1 = evidence$3.c;
-          var lhsAggregate$macro$6$1 = evidence$3.v;
-          var lhsMsg$macro$9$1 = evidence$3.G;
+          var lhsAggregate$macro$6$1 = evidence$3.s;
+          var lhsMsg$macro$9$1 = evidence$3.F;
           evidence$3.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$3.Q();
+            evidence$3.P();
           }
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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;
@@ -742,18 +742,18 @@ $p.aKu = (function(evidence$3) {
               $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$3);
               if (evidence$3.d) {
                 var postLhsIndex$macro$3$2 = evidence$3.c;
-                var lhsAggregate$macro$6$2 = evidence$3.v;
-                var lhsMsg$macro$9$2 = evidence$3.G;
+                var lhsAggregate$macro$6$2 = evidence$3.s;
+                var lhsMsg$macro$9$2 = evidence$3.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-                  evidence$3.Q();
+                  evidence$3.P();
                 }
                 var lhsValue$macro$12$2 = evidence$3.E;
-                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+                $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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 preRhsIndex$macro$4$2 = evidence$3.c;
                     var f = (() => {
-                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+                      var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
                       var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
                       var this$19 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
                       var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
@@ -765,28 +765,28 @@ $p.aKu = (function(evidence$3) {
                       var lastAgg = null;
                       while (true) {
                         evidence$3.p = (!(!(precut | ((count < 0) && outerCut))));
-                        this.aND(evidence$3);
-                        var parsedMsg = evidence$3.G;
-                        var parsedAgg = evidence$3.v;
+                        this.aNS(evidence$3);
+                        var parsedMsg = evidence$3.F;
+                        var parsedAgg = evidence$3.s;
                         var postCut = evidence$3.p;
-                        var verboseFailures = evidence$3.D;
+                        var verboseFailures = evidence$3.C;
                         if ((!evidence$3.d)) {
                           var res$1 = (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$19, startIndex$3, startIndex$3, count, (!(!(outerCut | postCut))), 0, evidence$3, repeater, acc));
                           if (verboseFailures) {
-                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$3, 0, evidence$3, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+                            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$3, 0, evidence$3, sepMsg, parsedMsg, lastAgg, (precut || postCut));
                           }
                           return res$1;
                         } else {
                           var beforeSepIndex = evidence$3.c;
-                          acc.al(evidence$3.E);
+                          acc.am(evidence$3.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$19, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$3, repeater, acc);
                             if (verboseFailures) {
-                              evidence$3.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))));
+                              evidence$3.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$().g1(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$().ad(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.p)))))) {
                             return evidence$3;
                           } else {
                             evidence$3.p = false;
@@ -815,7 +815,7 @@ $p.aKu = (function(evidence$3) {
                     if (instrument$4) {
                       evidence$3.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$5);
                     }
-                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                    $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                     var preLhsIndex$macro$17$1 = evidence$3.c;
                     var input$macro$26$1 = evidence$3.T;
                     $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -824,29 +824,29 @@ $p.aKu = (function(evidence$3) {
                     var input$1 = evidence$3.T;
                     var index$3 = evidence$3.c;
                     if ((input$1.U(index$3) && (input$1.as.charCodeAt(index$3) === 123))) {
-                      evidence$3.aK(((1 + index$3) | 0));
+                      evidence$3.aI(((1 + index$3) | 0));
                     } else {
-                      evidence$3.aH();
+                      evidence$3.aG();
                     }
-                    if (evidence$3.D) {
+                    if (evidence$3.C) {
                       evidence$3.aw(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                     }
                     if ((!evidence$3.d)) {
                     } else {
                       var postLhsIndex$macro$3$3 = evidence$3.c;
-                      var lhsAggregate$macro$6$3 = evidence$3.v;
-                      var lhsMsg$macro$9$3 = evidence$3.G;
+                      var lhsAggregate$macro$6$3 = evidence$3.s;
+                      var lhsMsg$macro$9$3 = evidence$3.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$3.Q();
+                        evidence$3.P();
                       }
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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 {
                           var preRhsIndex$macro$4$3 = evidence$3.c;
                           f();
-                          var rhsAggregate$macro$7 = evidence$3.v;
-                          var rhsMsg$macro$8 = evidence$3.G;
+                          var rhsAggregate$macro$7 = evidence$3.s;
+                          var rhsMsg$macro$8 = evidence$3.F;
                           if ((!evidence$3.d)) {
                             var res$macro$14 = evidence$3;
                           } else {
@@ -854,12 +854,12 @@ $p.aKu = (function(evidence$3) {
                             var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$3.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5);
                             if (rhsMadeProgress$macro$10) {
-                              evidence$3.Q();
+                              evidence$3.P();
                             }
                             var res$macro$14 = evidence$3.ab(evidence$3.E, nextIndex$macro$13);
                           }
-                          if (evidence$3.D) {
-                            evidence$3.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$3.S));
+                          if (evidence$3.C) {
+                            evidence$3.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$3.S));
                           }
                         }
                       }
@@ -868,13 +868,13 @@ $p.aKu = (function(evidence$3) {
                       var x1$8 = evidence$3;
                     } else {
                       var postLhsIndex$macro$18 = evidence$3.c;
-                      var lhsAggregate$macro$21 = evidence$3.v;
-                      var lhsMsg$macro$24 = evidence$3.G;
+                      var lhsAggregate$macro$21 = evidence$3.s;
+                      var lhsMsg$macro$24 = evidence$3.F;
                       if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-                        evidence$3.Q();
+                        evidence$3.P();
                       }
                       var lhsValue$macro$27 = evidence$3.E;
-                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+                      $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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$8 = evidence$3;
@@ -883,15 +883,15 @@ $p.aKu = (function(evidence$3) {
                           var input$2 = evidence$3.T;
                           var index$2$1 = evidence$3.c;
                           if ((input$2.U(index$2$1) && (input$2.as.charCodeAt(index$2$1) === 125))) {
-                            evidence$3.aK(((1 + index$2$1) | 0));
+                            evidence$3.aI(((1 + index$2$1) | 0));
                           } else {
-                            evidence$3.aH();
+                            evidence$3.aG();
                           }
-                          if (evidence$3.D) {
+                          if (evidence$3.C) {
                             evidence$3.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 = evidence$3.v;
-                          var rhsMsg$macro$23 = evidence$3.G;
+                          var rhsAggregate$macro$22 = evidence$3.s;
+                          var rhsMsg$macro$23 = evidence$3.F;
                           if ((!evidence$3.d)) {
                             var res$macro$29 = evidence$3;
                           } else {
@@ -899,12 +899,12 @@ $p.aKu = (function(evidence$3) {
                             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);
                             if (rhsMadeProgress$macro$25) {
-                              evidence$3.Q();
+                              evidence$3.P();
                             }
                             var res$macro$29 = evidence$3.ab(lhsValue$macro$27, nextIndex$macro$28);
                           }
-                          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));
+                          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));
                           }
                           var x1$8 = res$macro$29;
                         }
@@ -915,26 +915,26 @@ $p.aKu = (function(evidence$3) {
                     if (instrument$4) {
                       evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                     }
-                    if (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$5 < x1$8.S);
-                      x1$8.K(newshortMsg, x1$8.v, forceAggregate);
+                      x1$8.K(newshortMsg, x1$8.s, 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$5), x1$8.Y);
                       }
                     }
-                    var lhsMsg = evidence$3.G;
-                    var lhsAggregate = evidence$3.v;
+                    var lhsMsg = evidence$3.F;
+                    var lhsAggregate = evidence$3.s;
                     if (evidence$3.d) {
                       evidence$3.p = (!(!(evidence$3.p | oldCut)));
                       var x1$3$3 = evidence$3;
                     } else if (evidence$3.p) {
                       var x1$3$3 = evidence$3;
                     } else {
-                      var verboseFailures$1 = evidence$3.D;
+                      var verboseFailures$1 = evidence$3.C;
                       evidence$3.c = startPos;
                       if (verboseFailures$1) {
-                        evidence$3.K(lhsMsg, evidence$3.v, false);
+                        evidence$3.K(lhsMsg, evidence$3.s, false);
                       }
                       evidence$3.p = false;
                       var startIndex$6 = evidence$3.c;
@@ -942,7 +942,7 @@ $p.aKu = (function(evidence$3) {
                       if (instrument$5) {
                         evidence$3.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$6);
                       }
-                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                      $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                       var preLhsIndex$macro$17$2 = evidence$3.c;
                       var input$macro$26$2 = evidence$3.T;
                       $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -951,29 +951,29 @@ $p.aKu = (function(evidence$3) {
                       var input$3 = evidence$3.T;
                       var index$4 = evidence$3.c;
                       if ((input$3.U(index$4) && (input$3.as.charCodeAt(index$4) === 40))) {
-                        evidence$3.aK(((1 + index$4) | 0));
+                        evidence$3.aI(((1 + index$4) | 0));
                       } else {
-                        evidence$3.aH();
+                        evidence$3.aG();
                       }
-                      if (evidence$3.D) {
+                      if (evidence$3.C) {
                         evidence$3.aw(index$4, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                       }
                       if ((!evidence$3.d)) {
                       } else {
                         var postLhsIndex$macro$3$4 = evidence$3.c;
-                        var lhsAggregate$macro$6$4 = evidence$3.v;
-                        var lhsMsg$macro$9$4 = evidence$3.G;
+                        var lhsAggregate$macro$6$4 = evidence$3.s;
+                        var lhsMsg$macro$9$4 = evidence$3.F;
                         if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                          evidence$3.Q();
+                          evidence$3.P();
                         }
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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 {
                             var preRhsIndex$macro$4$4 = evidence$3.c;
                             f();
-                            var rhsAggregate$macro$7$1 = evidence$3.v;
-                            var rhsMsg$macro$8$1 = evidence$3.G;
+                            var rhsAggregate$macro$7$1 = evidence$3.s;
+                            var rhsMsg$macro$8$1 = evidence$3.F;
                             if ((!evidence$3.d)) {
                               var res$macro$14$1 = evidence$3;
                             } else {
@@ -981,12 +981,12 @@ $p.aKu = (function(evidence$3) {
                               var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$4);
                               var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$4.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5$1);
                               if (rhsMadeProgress$macro$10$1) {
-                                evidence$3.Q();
+                                evidence$3.P();
                               }
                               var res$macro$14$1 = evidence$3.ab(evidence$3.E, nextIndex$macro$13$1);
                             }
-                            if (evidence$3.D) {
-                              evidence$3.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$3.S));
+                            if (evidence$3.C) {
+                              evidence$3.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$3.S));
                             }
                           }
                         }
@@ -995,13 +995,13 @@ $p.aKu = (function(evidence$3) {
                         var x1$8$1 = evidence$3;
                       } else {
                         var postLhsIndex$macro$18$1 = evidence$3.c;
-                        var lhsAggregate$macro$21$1 = evidence$3.v;
-                        var lhsMsg$macro$24$1 = evidence$3.G;
+                        var lhsAggregate$macro$21$1 = evidence$3.s;
+                        var lhsMsg$macro$24$1 = evidence$3.F;
                         if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                          evidence$3.Q();
+                          evidence$3.P();
                         }
                         var lhsValue$macro$27$1 = evidence$3.E;
-                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+                        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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$8$1 = evidence$3;
@@ -1010,15 +1010,15 @@ $p.aKu = (function(evidence$3) {
                             var input$2$1 = evidence$3.T;
                             var index$2$2 = evidence$3.c;
                             if ((input$2$1.U(index$2$2) && (input$2$1.as.charCodeAt(index$2$2) === 41))) {
-                              evidence$3.aK(((1 + index$2$2) | 0));
+                              evidence$3.aI(((1 + index$2$2) | 0));
                             } else {
-                              evidence$3.aH();
+                              evidence$3.aG();
                             }
-                            if (evidence$3.D) {
+                            if (evidence$3.C) {
                               evidence$3.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$1 = evidence$3.v;
-                            var rhsMsg$macro$23$1 = evidence$3.G;
+                            var rhsAggregate$macro$22$1 = evidence$3.s;
+                            var rhsMsg$macro$23$1 = evidence$3.F;
                             if ((!evidence$3.d)) {
                               var res$macro$29$1 = evidence$3;
                             } else {
@@ -1026,12 +1026,12 @@ $p.aKu = (function(evidence$3) {
                               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);
                               if (rhsMadeProgress$macro$25$1) {
-                                evidence$3.Q();
+                                evidence$3.P();
                               }
                               var res$macro$29$1 = evidence$3.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                             }
-                            if (evidence$3.D) {
-                              evidence$3.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$3.S));
+                            if (evidence$3.C) {
+                              evidence$3.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$3.S));
                             }
                             var x1$8$1 = res$macro$29$1;
                           }
@@ -1042,24 +1042,24 @@ $p.aKu = (function(evidence$3) {
                       if (instrument$5) {
                         evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                       }
-                      if (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$6 < x1$8$1.S);
-                        x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
+                        x1$8$1.K(newshortMsg$1, x1$8$1.s, 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$6), x1$8$1.Y);
                         }
                       }
-                      var rhsMsg = evidence$3.G;
+                      var rhsMsg = evidence$3.F;
                       var rhsCut = evidence$3.p;
                       var endCut$1 = (!(!(rhsCut | oldCut)));
                       if (((!evidence$3.d) && (!rhsCut))) {
-                        evidence$3.d3(startPos);
+                        evidence$3.cZ(startPos);
                       }
                       evidence$3.p = endCut$1;
                       if (verboseFailures$1) {
                         var $x_3 = lhsMsg.W(rhsMsg);
-                        var rassoc$3 = evidence$3.v;
+                        var rassoc$3 = evidence$3.s;
                         evidence$3.K($x_3, lhsAggregate.W(rassoc$3), false);
                       }
                       var x1$3$3 = evidence$3;
@@ -1067,34 +1067,34 @@ $p.aKu = (function(evidence$3) {
                     if (instrument$3) {
                       evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                     }
-                    if (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$4 < x1$3$3.S);
-                      x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
+                      x1$3$3.K(newshortMsg$3, x1$3$3.s, 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$4), x1$3$3.Y);
                       }
                     }
-                    var rhsAggregate$macro$7$2 = evidence$3.v;
-                    var rhsMsg$macro$8$2 = evidence$3.G;
+                    var rhsAggregate$macro$7$2 = evidence$3.s;
+                    var rhsMsg$macro$8$2 = evidence$3.F;
                     if ((!evidence$3.d)) {
                     } else {
                       var postRhsIndex$macro$5$2 = evidence$3.c;
                       var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$2);
                       var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$2.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$2);
                       if (rhsMadeProgress$macro$10$2) {
-                        evidence$3.Q();
+                        evidence$3.P();
                       }
                       evidence$3.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$3.E), nextIndex$macro$13$2);
                     }
-                    if (evidence$3.D) {
-                      evidence$3.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$3.S));
+                    if (evidence$3.C) {
+                      evidence$3.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$3.S));
                     }
                   }
                 }
               }
-              var rhsAggregate$macro$7$3 = evidence$3.v;
-              var rhsMsg$macro$8$3 = evidence$3.G;
+              var rhsAggregate$macro$7$3 = evidence$3.s;
+              var rhsMsg$macro$8$3 = evidence$3.F;
               if ((!evidence$3.d)) {
                 evidence$3.p = true;
                 var res$macro$14$3 = evidence$3;
@@ -1103,12 +1103,12 @@ $p.aKu = (function(evidence$3) {
                 var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$1.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$3);
                 if (rhsMadeProgress$macro$10$3) {
-                  evidence$3.Q();
+                  evidence$3.P();
                 }
                 var res$macro$14$3 = evidence$3.ab(evidence$3.E, nextIndex$macro$13$3);
               }
-              if (evidence$3.D) {
-                evidence$3.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$3.S));
+              if (evidence$3.C) {
+                evidence$3.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$3.S));
               }
               var x1$4$1 = res$macro$14$3;
             }
@@ -1119,16 +1119,16 @@ $p.aKu = (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.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.v, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.s, 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$4 = evidence$3.v;
-        var rhsMsg$macro$8$4 = evidence$3.G;
+        var rhsAggregate$macro$7$4 = evidence$3.s;
+        var rhsMsg$macro$8$4 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14$4 = evidence$3;
         } else {
@@ -1136,12 +1136,12 @@ $p.aKu = (function(evidence$3) {
           var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4);
           var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$4);
           if (rhsMadeProgress$macro$10$4) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$14$4 = evidence$3.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$3.E), nextIndex$macro$13$4);
         }
-        if (evidence$3.D) {
-          evidence$3.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$3.S));
+        if (evidence$3.C) {
+          evidence$3.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$3.S));
         }
       }
     }
@@ -1150,21 +1150,21 @@ $p.aKu = (function(evidence$3) {
     var parse0$5 = evidence$3;
   } else {
     var postLhsIndex$macro$18$2 = evidence$3.c;
-    var lhsAggregate$macro$21$2 = evidence$3.v;
-    var lhsMsg$macro$24$2 = evidence$3.G;
+    var lhsAggregate$macro$21$2 = evidence$3.s;
+    var lhsMsg$macro$24$2 = evidence$3.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$27$2 = evidence$3.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($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$5 = evidence$3;
       } else {
         var preRhsIndex$macro$19$2 = evidence$3.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$3);
-        var rhsAggregate$macro$22$2 = evidence$3.v;
-        var rhsMsg$macro$23$2 = evidence$3.G;
+        var rhsAggregate$macro$22$2 = evidence$3.s;
+        var rhsMsg$macro$23$2 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$29$2 = evidence$3;
         } else {
@@ -1172,12 +1172,12 @@ $p.aKu = (function(evidence$3) {
           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);
           if (rhsMadeProgress$macro$25$2) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$29$2 = evidence$3.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$3.E | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$3.D) {
-          evidence$3.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$3.S));
+        if (evidence$3.C) {
+          evidence$3.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$3.S));
         }
         var parse0$5 = res$macro$29$2;
       }
@@ -1193,20 +1193,20 @@ $p.aKu = (function(evidence$3) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 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$().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$5.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end$1), value);
+    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$1 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$5.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fu, begin, end$1), value);
     var x1$2$2 = parse0$5;
   }
   if (instrument$1) {
     evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
-  if (x1$2$2.D) {
+  if (x1$2$2.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$2.S);
-    x1$2$2.K(newshortMsg$5, x1$2$2.v, forceAggregate$4);
+    x1$2$2.K(newshortMsg$5, x1$2$2.s, forceAggregate$4);
     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("withMeta").B, startIndex$1), x1$2$2.Y);
     }
@@ -1218,7 +1218,7 @@ $p.aKu = (function(evidence$3) {
     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.C()), 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.D()), x0$1.z());
     var parse0$6 = x1$2$2;
   }
   if ((!parse0$6.d)) {
@@ -1228,10 +1228,10 @@ $p.aKu = (function(evidence$3) {
     matchEnd4$1: {
       var $x_4;
       if ((x0$2 !== null)) {
-        var m = x0$2.C();
+        var m = x0$2.D();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_4 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.C(), p2.z());
+          var $x_4 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -1243,10 +1243,10 @@ $p.aKu = (function(evidence$3) {
   if (instrument) {
     evidence$3.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("method").B, x1$2$3.c, x1$2$3.d);
   }
-  if (x1$2$3.D) {
+  if (x1$2$3.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("method").B)));
     var forceAggregate$5 = (startIndex < x1$2$3.S);
-    x1$2$3.K(newshortMsg$6, x1$2$3.v, forceAggregate$5);
+    x1$2$3.K(newshortMsg$6, x1$2$3.s, forceAggregate$5);
     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("method").B, startIndex), x1$2$3.Y);
     }
@@ -1259,53 +1259,53 @@ $p.aKu = (function(evidence$3) {
       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$002dFunc.$c_Lio_septimalmind_baboon_parser_model_RawFunc(x0$3.bk, x0$3.br, meta);
+    x1$2$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc.$c_Lio_septimalmind_baboon_parser_model_RawFunc(x0$3.bm, x0$3.bs, meta);
     return x1$2$3;
   }
 });
-$p.aND = (function(evidence$4) {
+$p.aNS = (function(evidence$4) {
   var oldCut = evidence$4.p;
   evidence$4.p = false;
   var startPos = evidence$4.c;
-  this.aNE(evidence$4);
-  var lhsMsg = evidence$4.G;
-  var lhsAggregate = evidence$4.v;
+  this.aNT(evidence$4);
+  var lhsMsg = evidence$4.F;
+  var lhsAggregate = evidence$4.s;
   if (evidence$4.d) {
     evidence$4.p = (!(!(evidence$4.p | oldCut)));
     return evidence$4;
   } else if (evidence$4.p) {
     return evidence$4;
   } else {
-    var verboseFailures = evidence$4.D;
+    var verboseFailures = evidence$4.C;
     evidence$4.c = startPos;
     if (verboseFailures) {
-      evidence$4.K(lhsMsg, evidence$4.v, false);
+      evidence$4.K(lhsMsg, evidence$4.s, false);
     }
     evidence$4.p = false;
-    this.aIO(evidence$4);
-    var rhsMsg = evidence$4.G;
+    this.aJ2(evidence$4);
+    var rhsMsg = evidence$4.F;
     var rhsCut = evidence$4.p;
     var endCut = (!(!(rhsCut | oldCut)));
     if (((!evidence$4.d) && (!rhsCut))) {
-      evidence$4.d3(startPos);
+      evidence$4.cZ(startPos);
     }
     evidence$4.p = endCut;
     if (verboseFailures) {
       var $x_1 = lhsMsg.W(rhsMsg);
-      var rassoc$3 = evidence$4.v;
+      var rassoc$3 = evidence$4.s;
       evidence$4.K($x_1, lhsAggregate.W(rassoc$3), false);
     }
     return evidence$4;
   }
 });
-$p.aNE = (function(evidence$5) {
-  var this$1 = this.UF;
+$p.aNT = (function(evidence$5) {
+  var this$1 = this.UO;
   var startIndex = evidence$5.c;
   var instrument = (evidence$5.L !== null);
   if (instrument) {
     evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   var preLhsIndex$macro$17 = evidence$5.c;
   var input$macro$26 = evidence$5.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$());
@@ -1315,13 +1315,13 @@ $p.aNE = (function(evidence$5) {
   if ((!evidence$5.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$5.c;
-    var lhsAggregate$macro$6 = evidence$5.v;
-    var lhsMsg$macro$9 = evidence$5.G;
+    var lhsAggregate$macro$6 = evidence$5.s;
+    var lhsMsg$macro$9 = evidence$5.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$12 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
       } else {
@@ -1329,20 +1329,20 @@ $p.aNE = (function(evidence$5) {
         var x1$2$1 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
         var preLhsIndex$macro$17$1 = evidence$5.c;
         var input$macro$26$1 = evidence$5.T;
-        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+        $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
         var preLhsIndex$macro$2$1 = evidence$5.c;
         var input$macro$11$1 = evidence$5.T;
-        this.aKo(evidence$5);
+        this.aKD(evidence$5);
         if ((!evidence$5.d)) {
         } else {
           var postLhsIndex$macro$3$1 = evidence$5.c;
-          var lhsAggregate$macro$6$1 = evidence$5.v;
-          var lhsMsg$macro$9$1 = evidence$5.G;
+          var lhsAggregate$macro$6$1 = evidence$5.s;
+          var lhsMsg$macro$9$1 = evidence$5.F;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var lhsValue$macro$12$1 = evidence$5.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
             if (((!evidence$5.d) && evidence$5.p)) {
             } else {
@@ -1350,15 +1350,15 @@ $p.aNE = (function(evidence$5) {
               var input = evidence$5.T;
               var index = evidence$5.c;
               if ((input.U(index) && (input.as.charCodeAt(index) === 61))) {
-                evidence$5.aK(((1 + index) | 0));
+                evidence$5.aI(((1 + index) | 0));
               } else {
-                evidence$5.aH();
+                evidence$5.aG();
               }
-              if (evidence$5.D) {
+              if (evidence$5.C) {
                 evidence$5.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"=\""))));
               }
-              var rhsAggregate$macro$7 = evidence$5.v;
-              var rhsMsg$macro$8 = evidence$5.G;
+              var rhsAggregate$macro$7 = evidence$5.s;
+              var rhsMsg$macro$8 = evidence$5.F;
               if ((!evidence$5.d)) {
                 var res$macro$14 = evidence$5;
               } else {
@@ -1366,49 +1366,49 @@ $p.aNE = (function(evidence$5) {
                 var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$1.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5);
                 if (rhsMadeProgress$macro$10) {
-                  evidence$5.Q();
+                  evidence$5.P();
                 }
                 var res$macro$14 = evidence$5.ab(lhsValue$macro$12$1, nextIndex$macro$13);
               }
-              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));
+              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) {
           var postLhsIndex$macro$18 = evidence$5.c;
-          var lhsAggregate$macro$21 = evidence$5.v;
-          var lhsMsg$macro$24 = evidence$5.G;
+          var lhsAggregate$macro$21 = evidence$5.s;
+          var lhsMsg$macro$24 = evidence$5.F;
           if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var lhsValue$macro$27 = evidence$5.E;
-          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+          $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
             if ((!((!evidence$5.d) && evidence$5.p))) {
               var preRhsIndex$macro$19 = evidence$5.c;
-              this.a2G.ahZ(evidence$5);
-              var rhsAggregate$macro$22 = evidence$5.v;
-              var rhsMsg$macro$23 = evidence$5.G;
+              this.a2P.aib(evidence$5);
+              var rhsAggregate$macro$22 = evidence$5.s;
+              var rhsMsg$macro$23 = evidence$5.F;
               if ((!evidence$5.d)) {
               } else {
                 var postRhsIndex$macro$20 = evidence$5.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);
                 if (rhsMadeProgress$macro$25) {
-                  evidence$5.Q();
+                  evidence$5.P();
                 }
                 evidence$5.ab(x1$2$1.aF(lhsValue$macro$27, evidence$5.E), nextIndex$macro$28);
               }
-              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));
+              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));
               }
             }
           }
         }
-        var rhsAggregate$macro$7$1 = evidence$5.v;
-        var rhsMsg$macro$8$1 = evidence$5.G;
+        var rhsAggregate$macro$7$1 = evidence$5.s;
+        var rhsMsg$macro$8$1 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$14$1 = evidence$5;
         } else {
@@ -1416,12 +1416,12 @@ $p.aNE = (function(evidence$5) {
           var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4);
           var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$1);
           if (rhsMadeProgress$macro$10$1) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           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.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));
+        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));
         }
       }
     }
@@ -1430,21 +1430,21 @@ $p.aNE = (function(evidence$5) {
     var parse0$4 = evidence$5;
   } else {
     var postLhsIndex$macro$18$1 = evidence$5.c;
-    var lhsAggregate$macro$21$1 = evidence$5.v;
-    var lhsMsg$macro$24$1 = evidence$5.G;
+    var lhsAggregate$macro$21$1 = evidence$5.s;
+    var lhsMsg$macro$24$1 = evidence$5.F;
     if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$27$1 = evidence$5.E;
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
     if (evidence$5.d) {
       if (((!evidence$5.d) && evidence$5.p)) {
         var parse0$4 = evidence$5;
       } else {
         var preRhsIndex$macro$19$1 = evidence$5.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$5);
-        var rhsAggregate$macro$22$1 = evidence$5.v;
-        var rhsMsg$macro$23$1 = evidence$5.G;
+        var rhsAggregate$macro$22$1 = evidence$5.s;
+        var rhsMsg$macro$23$1 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$29$1 = evidence$5;
         } else {
@@ -1452,12 +1452,12 @@ $p.aNE = (function(evidence$5) {
           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.U(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
           if (rhsMadeProgress$macro$25$1) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var res$macro$29$1 = evidence$5.ab(x1$2.aF(lhsValue$macro$27$1, (evidence$5.E | 0)), nextIndex$macro$28$1);
         }
-        if (evidence$5.D) {
-          evidence$5.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$5.S));
+        if (evidence$5.C) {
+          evidence$5.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$5.S));
         }
         var parse0$4 = res$macro$29$1;
       }
@@ -1473,20 +1473,20 @@ $p.aNE = (function(evidence$5) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 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$().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$4.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 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$4.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 x1$2$2 = parse0$4;
   }
   if (instrument) {
     evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$2.c, x1$2$2.d);
   }
-  if (x1$2$2.D) {
+  if (x1$2$2.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate = (startIndex < x1$2$2.S);
-    x1$2$2.K(newshortMsg, x1$2$2.v, forceAggregate);
+    x1$2$2.K(newshortMsg, x1$2$2.s, forceAggregate);
     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("withMeta").B, startIndex), x1$2$2.Y);
     }
@@ -1498,7 +1498,7 @@ $p.aNE = (function(evidence$5) {
     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.C()), 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.D()), x0$1.z());
     var parse0$5 = x1$2$2;
   }
   if ((!parse0$5.d)) {
@@ -1508,10 +1508,10 @@ $p.aNE = (function(evidence$5) {
     matchEnd4: {
       var $x_1;
       if ((x0$2 !== null)) {
-        var meta = x0$2.C();
+        var meta = x0$2.D();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var marker = p2.C();
+          var marker = p2.D();
           var $x_1 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Ref(p2.z(), marker, meta);
           break matchEnd4;
         }
@@ -1522,65 +1522,65 @@ $p.aNE = (function(evidence$5) {
     return parse0$5;
   }
 });
-$p.aIO = (function(evidence$6) {
+$p.aJ2 = (function(evidence$6) {
   var oldCut = evidence$6.p;
   evidence$6.p = false;
   var startPos = evidence$6.c;
   var oldCut$2 = evidence$6.p;
   evidence$6.p = false;
   var startPos$2 = evidence$6.c;
-  this.a2G.afn(evidence$6);
-  var lhsMsg = evidence$6.G;
-  var lhsAggregate = evidence$6.v;
+  this.a2P.afy(evidence$6);
+  var lhsMsg = evidence$6.F;
+  var lhsAggregate = evidence$6.s;
   if (evidence$6.d) {
     evidence$6.p = (!(!(evidence$6.p | oldCut$2)));
   } else if (evidence$6.p) {
   } else {
-    var verboseFailures = evidence$6.D;
+    var verboseFailures = evidence$6.C;
     evidence$6.c = startPos$2;
     if (verboseFailures) {
-      evidence$6.K(lhsMsg, evidence$6.v, false);
+      evidence$6.K(lhsMsg, evidence$6.s, false);
     }
     evidence$6.p = false;
-    this.ajp.auC(evidence$6);
-    var rhsMsg = evidence$6.G;
+    this.ajB.auP(evidence$6);
+    var rhsMsg = evidence$6.F;
     var rhsCut = evidence$6.p;
     var endCut = (!(!(rhsCut | oldCut$2)));
     if (((!evidence$6.d) && (!rhsCut))) {
-      evidence$6.d3(startPos$2);
+      evidence$6.cZ(startPos$2);
     }
     evidence$6.p = endCut;
     if (verboseFailures) {
       var $x_1 = lhsMsg.W(rhsMsg);
-      var rassoc$3 = evidence$6.v;
+      var rassoc$3 = evidence$6.s;
       evidence$6.K($x_1, lhsAggregate.W(rassoc$3), false);
     }
   }
-  var lhsMsg$2 = evidence$6.G;
-  var lhsAggregate$2 = evidence$6.v;
+  var lhsMsg$2 = evidence$6.F;
+  var lhsAggregate$2 = evidence$6.s;
   if (evidence$6.d) {
     evidence$6.p = (!(!(evidence$6.p | oldCut)));
     var parse0$2 = evidence$6;
   } else if (evidence$6.p) {
     var parse0$2 = evidence$6;
   } else {
-    var verboseFailures$2 = evidence$6.D;
+    var verboseFailures$2 = evidence$6.C;
     evidence$6.c = startPos;
     if (verboseFailures$2) {
-      evidence$6.K(lhsMsg$2, evidence$6.v, false);
+      evidence$6.K(lhsMsg$2, evidence$6.s, false);
     }
     evidence$6.p = false;
-    this.ajq.aw6(evidence$6);
-    var rhsMsg$2 = evidence$6.G;
+    this.ajC.awj(evidence$6);
+    var rhsMsg$2 = evidence$6.F;
     var rhsCut$2 = evidence$6.p;
     var endCut$2 = (!(!(rhsCut$2 | oldCut)));
     if (((!evidence$6.d) && (!rhsCut$2))) {
-      evidence$6.d3(startPos);
+      evidence$6.cZ(startPos);
     }
     evidence$6.p = endCut$2;
     if (verboseFailures$2) {
       var $x_2 = lhsMsg$2.W(rhsMsg$2);
-      var rassoc$3$2 = evidence$6.v;
+      var rassoc$3$2 = evidence$6.s;
       evidence$6.K($x_2, lhsAggregate$2.W(rassoc$3$2), false);
     }
     var parse0$2 = evidence$6;
@@ -1592,10 +1592,10 @@ $p.aIO = (function(evidence$6) {
     return parse0$2;
   }
 });
-$p.aKo = (function(evidence$7) {
+$p.aKD = (function(evidence$7) {
   var startPos = evidence$7.c;
-  var oldCapturing = evidence$7.gC;
-  evidence$7.gC = true;
+  var oldCapturing = evidence$7.gE;
+  evidence$7.gE = true;
   var oldCut = evidence$7.p;
   evidence$7.p = false;
   var startPos$2 = evidence$7.c;
@@ -1616,23 +1616,23 @@ $p.aKo = (function(evidence$7) {
     var $x_1 = false;
   }
   if ($x_1) {
-    evidence$7.aK(end);
+    evidence$7.aI(end);
   } else {
-    evidence$7.aH();
+    evidence$7.aG();
   }
-  if (evidence$7.D) {
+  if (evidence$7.C) {
     evidence$7.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"in\""))));
   }
-  var lhsMsg = evidence$7.G;
-  var lhsAggregate = evidence$7.v;
+  var lhsMsg = evidence$7.F;
+  var lhsAggregate = evidence$7.s;
   if (evidence$7.d) {
     evidence$7.p = (!(!(evidence$7.p | oldCut$2)));
   } else if (evidence$7.p) {
   } else {
-    var verboseFailures = evidence$7.D;
+    var verboseFailures = evidence$7.C;
     evidence$7.c = startPos$3;
     if (verboseFailures) {
-      evidence$7.K(lhsMsg, evidence$7.v, false);
+      evidence$7.K(lhsMsg, evidence$7.s, false);
     }
     evidence$7.p = false;
     var index$2 = evidence$7.c;
@@ -1655,36 +1655,36 @@ $p.aKo = (function(evidence$7) {
       var $x_2 = false;
     }
     if ($x_2) {
-      evidence$7.aK(end$2);
+      evidence$7.aI(end$2);
     } else {
-      evidence$7.aH();
+      evidence$7.aG();
     }
-    if (evidence$7.D) {
+    if (evidence$7.C) {
       evidence$7.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"out\""))));
     }
-    var rhsMsg = evidence$7.G;
+    var rhsMsg = evidence$7.F;
     var rhsCut = evidence$7.p;
     var endCut = (!(!(rhsCut | oldCut$2)));
     if (((!evidence$7.d) && (!rhsCut))) {
-      evidence$7.d3(startPos$3);
+      evidence$7.cZ(startPos$3);
     }
     evidence$7.p = endCut;
     if (verboseFailures) {
       var $x_4 = lhsMsg.W(rhsMsg);
-      var rassoc$3 = evidence$7.v;
+      var rassoc$3 = evidence$7.s;
       evidence$7.K($x_4, lhsAggregate.W(rassoc$3), false);
     }
   }
-  var lhsMsg$2 = evidence$7.G;
-  var lhsAggregate$2 = evidence$7.v;
+  var lhsMsg$2 = evidence$7.F;
+  var lhsAggregate$2 = evidence$7.s;
   if (evidence$7.d) {
     evidence$7.p = (!(!(evidence$7.p | oldCut)));
   } else if (evidence$7.p) {
   } else {
-    var verboseFailures$2 = evidence$7.D;
+    var verboseFailures$2 = evidence$7.C;
     evidence$7.c = startPos$2;
     if (verboseFailures$2) {
-      evidence$7.K(lhsMsg$2, evidence$7.v, false);
+      evidence$7.K(lhsMsg$2, evidence$7.s, false);
     }
     evidence$7.p = false;
     var index$3$1 = evidence$7.c;
@@ -1707,31 +1707,31 @@ $p.aKo = (function(evidence$7) {
       var $x_5 = false;
     }
     if ($x_5) {
-      evidence$7.aK(end$3);
+      evidence$7.aI(end$3);
     } else {
-      evidence$7.aH();
+      evidence$7.aG();
     }
-    if (evidence$7.D) {
+    if (evidence$7.C) {
       evidence$7.aw(index$3$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"err\""))));
     }
-    var rhsMsg$2 = evidence$7.G;
+    var rhsMsg$2 = evidence$7.F;
     var rhsCut$2 = evidence$7.p;
     var endCut$2 = (!(!(rhsCut$2 | oldCut)));
     if (((!evidence$7.d) && (!rhsCut$2))) {
-      evidence$7.d3(startPos$2);
+      evidence$7.cZ(startPos$2);
     }
     evidence$7.p = endCut$2;
     if (verboseFailures$2) {
       var $x_7 = lhsMsg$2.W(rhsMsg$2);
-      var rassoc$3$2 = evidence$7.v;
+      var rassoc$3$2 = evidence$7.s;
       evidence$7.K($x_7, lhsAggregate$2.W(rassoc$3$2), false);
     }
   }
-  evidence$7.gC = oldCapturing;
-  return ((!evidence$7.d) ? evidence$7 : evidence$7.jY(evidence$7.T.IA(startPos, evidence$7.c)));
+  evidence$7.gE = oldCapturing;
+  return ((!evidence$7.d) ? evidence$7 : evidence$7.jY(evidence$7.T.II(startPos, evidence$7.c)));
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefService = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefService, "io.septimalmind.baboon.parser.defns.DefService", ({
-  vy: 1
+  vB: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefService as $d_Lio_septimalmind_baboon_parser_defns_DefService };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Service.js.map