@7mind.io/baboon 0.0.167 → 0.0.168

package/io.septimalmind.baboon.typer.-Baboon-Translator.js

@@ -69,22 +69,22 @@ import * as $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView from "./s
 import * as $j_scala$002ecollection$002eimmutable$002e$002dQueue from "./scala.collection.immutable.-Queue.js";
 var $p;
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_ExtendedRawDefn__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, defn, thisScope) {
-  var root = defn.iD.EK;
+  var root = defn.iD.EJ;
   var x1 = defn.iD.iE;
   if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto)) {
-    var col = x1.st;
+    var col = x1.su;
     var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
     var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-    var iterator = col.o();
+    var iterator = col.p();
     var good = init;
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
       if ((x0 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef)) {
         if ((x1 !== null)) {
-          var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Td(x0, x1.la, x0.qO), $thiz.bh);
+          var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Ta(x0, x1.la, x0.qP), $thiz.bi);
           var r = this$7.a1;
           if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b = r.H;
@@ -92,7 +92,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             var h = null;
             var t = null;
             while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-              var it = rest.i().ph.o();
+              var it = rest.i().pi.p();
               while (it.f()) {
                 var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                 if ((t === null)) {
@@ -115,7 +115,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
           var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
         }
       } else {
-        var $x_1 = ((x0 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0.Di, x0.Dj) : ((x0 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0.y0, x1.la, x0.Dl) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
+        var $x_1 = ((x0 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0.Dh, x0.Di) : ((x0 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0.y0, x1.la, x0.Dk) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
       }
       var x1$1 = $x_1;
       if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
@@ -124,94 +124,94 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
       } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var v = x1$1.H;
-        good = good.fs(v);
+        good = good.ft(v);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
     }
-    var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+    var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
     var r$1 = this$15.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
-      var col$1 = x1.st;
+      var col$1 = x1.su;
       var buildR$1 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
       var buildL$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
       var init$1 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
       var bad$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$1);
-      var iterator$1 = col$1.o();
+      var iterator$1 = col$1.p();
       var good$1 = init$1;
       var allGood$1 = true;
       while (iterator$1.f()) {
         var x0$4 = iterator$1.e();
-        var x1$2 = ((x0$4 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$4.Dm, x0$4.Dn) : ((x0$4 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$4.y1, x1.la, x0$4.Do) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
+        var x1$2 = ((x0$4 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$4.Dl, x0$4.Dm) : ((x0$4 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$4.y1, x1.la, x0$4.Dn) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
         if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
           var e$1 = x1$2.aj;
           allGood$1 = false;
           $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$1, e$1.ay);
         } else if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var v$1 = x1$2.H;
-          good$1 = good$1.fs(v$1);
+          good$1 = good$1.ft(v$1);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
         }
       }
-      var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.bh);
+      var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.bi);
       var r$2 = this$26.a1;
       if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$2 = r$2.H;
-        var col$2 = x1.st;
+        var col$2 = x1.su;
         var buildR$2 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
         var buildL$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
         var init$2 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
         var bad$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$2);
-        var iterator$2 = col$2.o();
+        var iterator$2 = col$2.p();
         var good$2 = init$2;
         var allGood$2 = true;
         while (iterator$2.f()) {
           var x0$7 = iterator$2.e();
-          var x1$3 = ((x0$7 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$7.xZ, x1.la, x0$7.Dk) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
+          var x1$3 = ((x0$7 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$7.xZ, x1.la, x0$7.Dj) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
           if ((x1$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
             var e$2 = x1$3.aj;
             allGood$2 = false;
             $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$2.ay);
           } else if ((x1$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var v$2 = x1$3.H;
-            good$2 = good$2.fs(v$2);
+            good$2 = good$2.ft(v$2);
           } else {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$3);
           }
         }
-        var this$37 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aS(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.bh);
+        var this$37 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aS(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.bi);
         var r$3 = this$37.a1;
         if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$3 = r$3.H;
           if ((x1 !== null)) {
             var x1$2$1 = id.c8;
             if ((x1$2$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt)) {
-              var xid = x1$2$1.fA;
-              var x1$3$1 = $thiz.NE.x(xid);
+              var xid = x1$2$1.fB;
+              var x1$3$1 = $thiz.ND.x(xid);
               matchEnd8: {
                 var $x_3;
                 if ((x1$3$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
                   var defn$1 = x1$3$1.a3;
                   if ((defn$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt)) {
-                    var col$3 = defn$1.pn;
+                    var col$3 = defn$1.po;
                     var buildR$3 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
                     var buildL$3 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
                     var init$3 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
                     var bad$3 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$3);
-                    var iterator$3 = col$3.o();
+                    var iterator$3 = col$3.p();
                     var good$3 = init$3;
                     var allGood$3 = true;
                     while (iterator$3.f()) {
-                      var x1$4 = $thiz.a1Z(iterator$3.e(), x1.la);
+                      var x1$4 = $thiz.a1X(iterator$3.e(), x1.la);
                       if ((x1$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
                         var e$3 = x1$4.aj;
                         allGood$3 = false;
                         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$3, e$3.ay);
                       } else if ((x1$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                         var v$3 = x1$4.H;
-                        good$3 = good$3.fs(v$3);
+                        good$3 = good$3.ft(v$3);
                       } else {
                         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$4);
                       }
@@ -231,33 +231,33 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             }
             var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
           }
-          var this$52 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, $thiz.bh);
+          var this$52 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, $thiz.bi);
           var r$4 = this$52.a1;
           if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$4 = r$4.H;
-            var col$4 = x1.st;
+            var col$4 = x1.su;
             var buildR$4 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
             var buildL$4 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
             var init$4 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
             var bad$4 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$4);
-            var iterator$4 = col$4.o();
+            var iterator$4 = col$4.p();
             var good$4 = init$4;
             var allGood$4 = true;
             while (iterator$4.f()) {
               var x0$13 = iterator$4.e();
-              var x1$5 = ((x0$13 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef) ? $thiz.Td(x0$13, x1.la, x0$13.qO) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
+              var x1$5 = ((x0$13 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef) ? $thiz.Ta(x0$13, x1.la, x0$13.qP) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
               if ((x1$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
                 var e$4 = x1$5.aj;
                 allGood$4 = false;
                 $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$4, e$4.ay);
               } else if ((x1$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var v$4 = x1$5.H;
-                good$4 = good$4.fs(v$4);
+                good$4 = good$4.ft(v$4);
               } else {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$5);
               }
             }
-            var this$63 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$4 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$4.aS(good$4)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$4.bc()))), $thiz.bh);
+            var this$63 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$4 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$4.aS(good$4)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$4.bc()))), $thiz.bi);
             var r$5 = this$63.a1;
             if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$5 = r$5.H;
@@ -266,7 +266,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
               var h$1 = null;
               var t$1 = null;
               while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var it$1 = rest$1.i().ph.o();
+                var it$1 = rest$1.i().pi.p();
                 while (it$1.f()) {
                   var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$1.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                   if ((t$1 === null)) {
@@ -285,7 +285,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
               var h$2 = null;
               var t$2 = null;
               while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var it$2 = rest$2.i().ph.o();
+                var it$2 = rest$2.i().pi.p();
                 while (it$2.f()) {
                   var nx$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$2.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                   if ((t$2 === null)) {
@@ -435,7 +435,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             } else {
               var $x_4 = r$5;
             }
-            var this$69 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_4, $thiz.bh);
+            var this$69 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_4, $thiz.bi);
             var r$6 = this$69.a1;
             if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$6 = r$6.H;
@@ -453,7 +453,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 }
                 var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0));
               }
-              var this$75 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, $thiz.bh);
+              var this$75 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, $thiz.bi);
               var r$7 = this$75.a1;
               if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var f$2 = ((m$2$2) => {
@@ -477,14 +477,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   var xs = h$5;
                 }
                 var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-                var it$3 = xs.o();
+                var it$3 = xs.p();
                 while (it$3.f()) {
                   var elem = it$3.e();
                   var key = elem.E();
                   m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
                 }
                 var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-                var mapIt = m.o();
+                var mapIt = m.p();
                 while (mapIt.f()) {
                   var x1$6 = mapIt.e();
                   if ((x1$6 === null)) {
@@ -496,7 +496,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 }
                 var grouped = result$2;
                 var bad$5 = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-                var this$88 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$5.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dFields.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueFields(id, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$5), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), x1.la), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+                var this$88 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$5.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dFields.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueFields(id, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$5), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), x1.la), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
                 var r$8 = this$88.a1;
                 if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                   var $x_9 = r$8.H;
@@ -504,7 +504,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   var h$6 = null;
                   var t$6 = null;
                   while ((rest$4 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                    var it$4 = rest$4.i().Eu.o();
+                    var it$4 = rest$4.i().Et.p();
                     while (it$4.f()) {
                       var nx$4 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$4.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                       if ((t$6 === null)) {
@@ -520,7 +520,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 } else {
                   var $x_8 = r$8;
                 }
-                var this$92 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_8, $thiz.bh);
+                var this$92 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_8, $thiz.bi);
                 var r$9 = this$92.a1;
                 if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                   var b$9 = r$9.H;
@@ -529,7 +529,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   }
                   var $x_11 = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dDto.$c_Lio_septimalmind_baboon_typer_model_Typedef$Dto(id, finalFields$1, b$9.z());
                   if ((x1 !== null)) {
-                    var $x_10 = x1.Dh;
+                    var $x_10 = x1.Dg;
                   } else {
                     if ((!(x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContract.$c_Lio_septimalmind_baboon_parser_model_RawContract))) {
                       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
@@ -558,35 +558,35 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
     } else {
       var $x_2 = r$1;
     }
-    var this$96 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bh);
+    var this$96 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bi);
     var r$10 = this$96.a1;
     return ((r$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [r$10.H]))) : r$10);
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum.$c_Lio_septimalmind_baboon_parser_model_RawEnum)) {
-    var this$103 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawEnum__O($thiz, id, root, x1), $thiz.bh);
+    var this$103 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawEnum__O($thiz, id, root, x1), $thiz.bi);
     var r$11 = this$103.a1;
     return ((r$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [r$11.H]))) : r$11);
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) {
-    var this$110 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawAdt__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, root, x1, thisScope), $thiz.bh);
+    var this$110 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawAdt__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, root, x1, thisScope), $thiz.bi);
     var r$12 = this$110.a1;
     return ((r$12 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$12.H.ay) : r$12);
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign.$c_Lio_septimalmind_baboon_parser_model_RawForeign)) {
-    var this$113 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawForeign__O($thiz, id, root, x1), $thiz.bh);
+    var this$113 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawForeign__O($thiz, id, root, x1), $thiz.bi);
     var r$13 = this$113.a1;
     return ((r$13 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$13.H.ay) : r$13);
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dContract.$c_Lio_septimalmind_baboon_parser_model_RawContract)) {
-    var col$5 = x1.ss;
+    var col$5 = x1.st;
     var buildR$5 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
     var buildL$5 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init$5 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad$6 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$5);
-    var iterator$5 = col$5.o();
+    var iterator$5 = col$5.p();
     var good$5 = init$5;
     var allGood$5 = true;
     while (iterator$5.f()) {
       var x0$22 = iterator$5.e();
       if ((x0$22 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef)) {
         if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto)) {
-          var this$121 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Td(x0$22, x1.l9, x0$22.qO), $thiz.bh);
+          var this$121 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Ta(x0$22, x1.l9, x0$22.qP), $thiz.bi);
           var r$14 = this$121.a1;
           if ((r$14 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$14 = r$14.H;
@@ -594,7 +594,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             var h$7 = null;
             var t$7 = null;
             while ((rest$5 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-              var it$5 = rest$5.i().ph.o();
+              var it$5 = rest$5.i().pi.p();
               while (it$5.f()) {
                 var nx$5 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$5.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                 if ((t$7 === null)) {
@@ -617,7 +617,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
           var $x_12 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
         }
       } else {
-        var $x_12 = ((x0$22 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$22.Di, x0$22.Dj) : ((x0$22 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$22.y0, x1.l9, x0$22.Dl) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
+        var $x_12 = ((x0$22 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dField$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$FieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$22.Dh, x0$22.Di) : ((x0$22 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dParent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ParentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$22.y0, x1.l9, x0$22.Dk) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
       }
       var x1$7 = $x_12;
       if ((x1$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
@@ -626,94 +626,94 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$6, e$5.ay);
       } else if ((x1$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var v$6 = x1$7.H;
-        good$5 = good$5.fs(v$6);
+        good$5 = good$5.ft(v$6);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$7);
       }
     }
-    var this$129 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$5 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$5.aS(good$5)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$6.bc()))), $thiz.bh);
+    var this$129 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$5 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$5.aS(good$5)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$6.bc()))), $thiz.bi);
     var r$15 = this$129.a1;
     if ((r$15 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$15 = r$15.H;
-      var col$6 = x1.ss;
+      var col$6 = x1.st;
       var buildR$6 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
       var buildL$6 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
       var init$6 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
       var bad$7 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$6);
-      var iterator$6 = col$6.o();
+      var iterator$6 = col$6.p();
       var good$6 = init$6;
       var allGood$6 = true;
       while (iterator$6.f()) {
         var x0$26 = iterator$6.e();
-        var x1$8 = ((x0$26 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$26.Dm, x0$26.Dn) : ((x0$26 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$26.y1, x1.l9, x0$26.Do) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
+        var x1$8 = ((x0$26 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnfield$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnfieldDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$26.Dl, x0$26.Dm) : ((x0$26 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dUnparent$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$UnparentDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$26.y1, x1.l9, x0$26.Dn) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN())));
         if ((x1$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
           var e$6 = x1$8.aj;
           allGood$6 = false;
           $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$7, e$6.ay);
         } else if ((x1$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var v$7 = x1$8.H;
-          good$6 = good$6.fs(v$7);
+          good$6 = good$6.ft(v$7);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$8);
         }
       }
-      var this$140 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$6 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$6.aS(good$6)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$7.bc()))), $thiz.bh);
+      var this$140 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$6 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$6.aS(good$6)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$7.bc()))), $thiz.bi);
       var r$16 = this$140.a1;
       if ((r$16 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$16 = r$16.H;
-        var col$7 = x1.ss;
+        var col$7 = x1.st;
         var buildR$7 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
         var buildL$7 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
         var init$7 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
         var bad$8 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$7);
-        var iterator$7 = col$7.o();
+        var iterator$7 = col$7.p();
         var good$7 = init$7;
         var allGood$7 = true;
         while (iterator$7.f()) {
           var x0$29 = iterator$7.e();
-          var x1$9 = ((x0$29 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$29.xZ, x1.l9, x0$29.Dk) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
+          var x1$9 = ((x0$29 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dIntersection$002dDef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$IntersectionDef) ? $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, x0$29.xZ, x1.l9, x0$29.Dj) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
           if ((x1$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
             var e$7 = x1$9.aj;
             allGood$7 = false;
             $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$8, e$7.ay);
           } else if ((x1$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var v$8 = x1$9.H;
-            good$7 = good$7.fs(v$8);
+            good$7 = good$7.ft(v$8);
           } else {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$9);
           }
         }
-        var this$151 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$7 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$7.aS(good$7)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$8.bc()))), $thiz.bh);
+        var this$151 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$7 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$7.aS(good$7)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$8.bc()))), $thiz.bi);
         var r$17 = this$151.a1;
         if ((r$17 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$17 = r$17.H;
           if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto)) {
             var x1$2$2 = id.c8;
             if ((x1$2$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt)) {
-              var xid$1 = x1$2$2.fA;
-              var x1$3$2 = $thiz.NE.x(xid$1);
+              var xid$1 = x1$2$2.fB;
+              var x1$3$2 = $thiz.ND.x(xid$1);
               matchEnd8$1: {
                 var $x_14;
                 if ((x1$3$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
                   var defn$2 = x1$3$2.a3;
                   if ((defn$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt)) {
-                    var col$8 = defn$2.pn;
+                    var col$8 = defn$2.po;
                     var buildR$8 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
                     var buildL$8 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
                     var init$8 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
                     var bad$9 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$8);
-                    var iterator$8 = col$8.o();
+                    var iterator$8 = col$8.p();
                     var good$8 = init$8;
                     var allGood$8 = true;
                     while (iterator$8.f()) {
-                      var x1$10 = $thiz.a1Z(iterator$8.e(), x1.l9);
+                      var x1$10 = $thiz.a1X(iterator$8.e(), x1.l9);
                       if ((x1$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
                         var e$8 = x1$10.aj;
                         allGood$8 = false;
                         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$9, e$8.ay);
                       } else if ((x1$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                         var v$9 = x1$10.H;
-                        good$8 = good$8.fs(v$9);
+                        good$8 = good$8.ft(v$9);
                       } else {
                         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$10);
                       }
@@ -733,33 +733,33 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             }
             var $x_14 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
           }
-          var this$166 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_14, $thiz.bh);
+          var this$166 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_14, $thiz.bi);
           var r$18 = this$166.a1;
           if ((r$18 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$18 = r$18.H;
-            var col$9 = x1.ss;
+            var col$9 = x1.st;
             var buildR$9 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
             var buildL$9 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
             var init$9 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
             var bad$10 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$9);
-            var iterator$9 = col$9.o();
+            var iterator$9 = col$9.p();
             var good$9 = init$9;
             var allGood$9 = true;
             while (iterator$9.f()) {
               var x0$35 = iterator$9.e();
-              var x1$11 = ((x0$35 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef) ? $thiz.Td(x0$35, x1.l9, x0$35.qO) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
+              var x1$11 = ((x0$35 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto$002dMember$0024$002dContract$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawDtoMember$ContractRef) ? $thiz.Ta(x0$35, x1.l9, x0$35.qP) : new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().bN()));
               if ((x1$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
                 var e$9 = x1$11.aj;
                 allGood$9 = false;
                 $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$10, e$9.ay);
               } else if ((x1$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var v$10 = x1$11.H;
-                good$9 = good$9.fs(v$10);
+                good$9 = good$9.ft(v$10);
               } else {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$11);
               }
             }
-            var this$177 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$9 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$9.aS(good$9)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$10.bc()))), $thiz.bh);
+            var this$177 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$9 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$9.aS(good$9)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$10.bc()))), $thiz.bi);
             var r$19 = this$177.a1;
             if ((r$19 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$19 = r$19.H;
@@ -768,7 +768,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
               var h$8 = null;
               var t$8 = null;
               while ((rest$6 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var it$6 = rest$6.i().ph.o();
+                var it$6 = rest$6.i().pi.p();
                 while (it$6.f()) {
                   var nx$6 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$6.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                   if ((t$8 === null)) {
@@ -787,7 +787,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
               var h$9 = null;
               var t$9 = null;
               while ((rest$7 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var it$7 = rest$7.i().ph.o();
+                var it$7 = rest$7.i().pi.p();
                 while (it$7.f()) {
                   var nx$7 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$7.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                   if ((t$9 === null)) {
@@ -937,7 +937,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
             } else {
               var $x_15 = r$19;
             }
-            var this$183 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_15, $thiz.bh);
+            var this$183 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_15, $thiz.bi);
             var r$20 = this$183.a1;
             if ((r$20 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$20 = r$20.H;
@@ -955,7 +955,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 }
                 var $x_18 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0));
               }
-              var this$189 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_18, $thiz.bh);
+              var this$189 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_18, $thiz.bi);
               var r$21 = this$189.a1;
               if ((r$21 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var f$6 = ((m$2$2$1) => {
@@ -979,14 +979,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   var xs$1 = h$12;
                 }
                 var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-                var it$8 = xs$1.o();
+                var it$8 = xs$1.p();
                 while (it$8.f()) {
                   var elem$1 = it$8.e();
                   var key$1 = elem$1.E();
                   m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem$1);
                 }
                 var result$5 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-                var mapIt$1 = m$1.o();
+                var mapIt$1 = m$1.p();
                 while (mapIt$1.f()) {
                   var x1$12 = mapIt$1.e();
                   if ((x1$12 === null)) {
@@ -998,7 +998,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 }
                 var grouped$1 = result$5;
                 var bad$11 = grouped$1.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2$1) => (x$4$2$2$1.z().a2() > 1))), false);
-                var this$202 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$11.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dFields.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueFields(id, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$11), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$1) => x$5$2$2$1.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$1) => x$6$2$2$1.z()))).aC())))), x1.l9), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+                var this$202 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$11.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dFields.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueFields(id, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$11), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$1) => x$5$2$2$1.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$1) => x$6$2$2$1.z()))).aC())))), x1.l9), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
                 var r$22 = this$202.a1;
                 if ((r$22 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                   var $x_20 = r$22.H;
@@ -1006,7 +1006,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   var h$13 = null;
                   var t$13 = null;
                   while ((rest$9 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                    var it$9 = rest$9.i().Eu.o();
+                    var it$9 = rest$9.i().Et.p();
                     while (it$9.f()) {
                       var nx$9 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$9.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                       if ((t$13 === null)) {
@@ -1022,7 +1022,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                 } else {
                   var $x_19 = r$22;
                 }
-                var this$206 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_19, $thiz.bh);
+                var this$206 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_19, $thiz.bi);
                 var r$23 = this$206.a1;
                 if ((r$23 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                   var b$23 = r$23.H;
@@ -1031,7 +1031,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
                   }
                   var $x_22 = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dContract.$c_Lio_septimalmind_baboon_typer_model_Typedef$Contract(id, finalFields$3, b$23.z());
                   if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto)) {
-                    var $x_21 = x1.Dh;
+                    var $x_21 = x1.Dg;
                   } else {
                     if ((x1 === null)) {
                       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
@@ -1060,13 +1060,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
     } else {
       var $x_13 = r$15;
     }
-    var this$210 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_13, $thiz.bh);
+    var this$210 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_13, $thiz.bi);
     var r$24 = this$210.a1;
     return ((r$24 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [r$24.H]))) : r$24);
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace)) {
     return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
   } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService)) {
-    var this$219 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, root, x1, thisScope), $thiz.bh);
+    var this$219 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, root, x1, thisScope), $thiz.bi);
     var r$25 = this$219.a1;
     return ((r$25 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$25.H.ay) : r$25);
   } else {
@@ -1075,13 +1075,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_s
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_ExtendedRawDefn__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_ExtendedRawDefn__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawForeign__O($thiz, id, isRoot, f) {
-  var this$3 = f.JY;
+  var this$3 = f.JX;
   var f$2 = ((e$2$2) => {
-    var $x_4 = e$2$2.Dr;
-    var $x_3 = e$2$2.Dr;
-    var $x_2 = e$2$2.K2;
-    var this$2 = e$2$2.K1.K5;
-    var f$1 = ((a$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign$002dEntry$002dAttr.$c_Lio_septimalmind_baboon_typer_model_Typedef$ForeignEntryAttr(a$2$2.K3, a$2$2.K4));
+    var $x_4 = e$2$2.Dq;
+    var $x_3 = e$2$2.Dq;
+    var $x_2 = e$2$2.K1;
+    var this$2 = e$2$2.K0.K4;
+    var f$1 = ((a$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign$002dEntry$002dAttr.$c_Lio_septimalmind_baboon_typer_model_Typedef$ForeignEntryAttr(a$2$2.K2, a$2$2.K3));
     if ((this$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -1117,14 +1117,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_
     var xs = h$1;
   }
   var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-  var it = xs.o();
+  var it = xs.p();
   while (it.f()) {
     var elem = it.e();
     var key = elem.E();
     m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
   }
   var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-  var mapIt = m.o();
+  var mapIt = m.p();
   while (mapIt.f()) {
     var x1 = mapIt.e();
     if ((x1 === null)) {
@@ -1136,27 +1136,27 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_
   }
   var grouped = result;
   var bad = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-  var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dForeign$002dEntries.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueForeignEntries($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), id, f.y2), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+  var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dForeign$002dEntries.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueForeignEntries($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), id, f.y2), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
   var r = this$13.a1;
-  return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign.$c_Lio_septimalmind_baboon_typer_model_Typedef$Foreign(id, r.H), f.JZ, f.y2), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : r);
+  return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign.$c_Lio_septimalmind_baboon_typer_model_Typedef$Foreign(id, r.H), f.JY, f.y2), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : r);
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawForeign__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertForeign__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawForeign__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawEnum__O($thiz, id, isRoot, choice) {
-  var col = choice.JR;
+  var col = choice.JQ;
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
     var x0 = iterator.e();
-    var name = x0.Dq;
-    var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQL(name, x0.JU, $thiz.bh), $thiz.bh);
+    var name = x0.Dp;
+    var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQE(name, x0.JT, $thiz.bi), $thiz.bi);
     var r = this$7.a1;
     if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var this$9 = x0.JT;
+      var this$9 = x0.JS;
       if (this$9.m()) {
         var $x_1 = $j_java$002elang$002e$002dObject.$m_s_None$();
       } else {
@@ -1164,7 +1164,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
         if ((!(x0$1 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum$002dConst$0024$002dRaw$002dInt.$c_Lio_septimalmind_baboon_parser_model_RawEnumConst$RawInt))) {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
         }
-        var t = x0$1.Dp;
+        var t = x0$1.Do;
         var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_java$002elang$002e$002dObject.$c_RTLong(t.g, t.j));
       }
       var x1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dMember.$c_Lio_septimalmind_baboon_typer_model_EnumMember(name, $x_1));
@@ -1182,7 +1182,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
   }
-  var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+  var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
   var r$1 = this$13.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -1191,14 +1191,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
       return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$16.toLowerCase(), m$2$2);
     })));
     var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-    var it = xs.o();
+    var it = xs.p();
     while (it.f()) {
       var elem = it.e();
       var key = elem.E();
       m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$19) => (() => this$19.dU()))(xs))).am(elem);
     }
     var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-    var mapIt = m.o();
+    var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
@@ -1210,7 +1210,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
     }
     var grouped = result;
     var bad$1 = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-    var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dEnum$002dBranches.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueEnumBranches($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), id, choice.uR), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+    var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dEnum$002dBranches.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueEnumBranches($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), id, choice.uR), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
     var r$2 = this$26.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var list = b$1.aC();
@@ -1223,9 +1223,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
         }
         var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dEmpty$002dEnum.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$EmptyEnum(id, choice.uR), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
       }
-      var this$31 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bh);
+      var this$31 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bi);
       var r$3 = this$31.a1;
-      return ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dEnum.$c_Lio_septimalmind_baboon_typer_model_Typedef$Enum(id, r$3.H.ay), choice.JQ, choice.uR)) : r$3);
+      return ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dEnum.$c_Lio_septimalmind_baboon_typer_model_Typedef$Enum(id, r$3.H.ay), choice.JP, choice.uR)) : r$3);
     } else {
       return r$2;
     }
@@ -1235,14 +1235,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_sept
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawEnum__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__converEnum__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawEnum__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, field, meta) {
-  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dField$002dName.$c_Lio_septimalmind_baboon_typer_model_FieldName(field.JV.JX)), $thiz.bh);
+  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dField$002dName.$c_Lio_septimalmind_baboon_typer_model_FieldName(field.JU.JW)), $thiz.bi);
   var r = this$3.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var this$6 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQM(b, meta, $thiz.bh), $thiz.bh);
+    var this$6 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQF(b, meta, $thiz.bi), $thiz.bi);
     var r$1 = this$6.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, field.JW, meta), $thiz.bh);
+      var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, field.JV, meta), $thiz.bi);
       var r$2 = this$9.a1;
       return ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Seq$().aA($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dField.$c_Lio_septimalmind_baboon_typer_model_Field(b, r$2.H)]))) : r$2);
     } else {
@@ -1254,15 +1254,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoFieldToDefs__Lio_septimalmind_baboon_parser_model_RawField__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, parent, meta, refMeta) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.a28(parent, $thiz.sB, $thiz.v3, refMeta), $thiz.bh);
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.a26(parent, $thiz.sC, $thiz.v3, refMeta), $thiz.bi);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, $thiz.NE.x(b)));
+    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, $thiz.ND.x(b)));
   } else {
     var $x_1 = r;
   }
-  var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bh);
+  var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bi);
   var r$1 = this$5.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -1282,7 +1282,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio
       }
       var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dWrong$002dParent.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$WrongParent(id, parentDef$1.eV(), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
     }
-    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bh);
+    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.bi);
     var r$2 = this$10.a1;
     return ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$2.H) : r$2);
   } else {
@@ -1291,12 +1291,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__dtoParentToDefs__Lio_septimalmind_baboon_parser_model_ScopedRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawAdt__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, isRoot, adt, thisScope) {
-  var col = adt.Df.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTranslator$0024$0024anonfun$0024convert$002dAdt$00241.$c_Lio_septimalmind_baboon_typer_BaboonTranslator$$anonfun$convertAdt$1($thiz)).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((member$2$2) => $thiz.v4.a29(member$2$2.ag3().kY(), thisScope, $thiz.v3, member$2$2.kW()))));
+  var col = adt.De.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTranslator$0024$0024anonfun$0024convert$002dAdt$00241.$c_Lio_septimalmind_baboon_typer_BaboonTranslator$$anonfun$convertAdt$1($thiz)).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((member$2$2) => $thiz.v4.a27(member$2$2.ag0().kY(), thisScope, $thiz.v3, member$2$2.kW()))));
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -1312,7 +1312,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
   }
-  var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+  var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
   var r = this$11.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
@@ -1324,9 +1324,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
       if (($j_java$002elang$002e$002dObject.$m_s_None$() !== x1)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
       }
-      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dEmpty$002dAdt.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$EmptyAdt(id, adt.sr), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
+      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dEmpty$002dAdt.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$EmptyAdt(id, adt.ss), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
     }
-    var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bh);
+    var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bi);
     var r$1 = this$16.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
@@ -1336,12 +1336,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
       var buildL$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
       var init$1 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
       var bad$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$1);
-      var iterator$1 = col$1.o();
+      var iterator$1 = col$1.p();
       var good$1 = init$1;
       var allGood$1 = true;
       while (iterator$1.f()) {
         var x0$3 = iterator$1.e();
-        var x1$1 = $thiz.v4.a28(x0$3.uQ.uN, $thiz.sB, $thiz.v3, x0$3.qO);
+        var x1$1 = $thiz.v4.a26(x0$3.uQ.uN, $thiz.sC, $thiz.v3, x0$3.qP);
         if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
           var e$1 = x1$1.aj;
           allGood$1 = false;
@@ -1353,9 +1353,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
         }
       }
-      var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.bh);
+      var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.bi);
       var r$2 = this$26.a1;
-      var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$2.H.aC()) : r$2), $thiz.bh);
+      var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$2.H.aC()) : r$2), $thiz.bi);
       var r$3 = this$29.a1;
       if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$3 = r$3.H;
@@ -1364,12 +1364,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
         var buildL$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
         var init$2 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
         var bad$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$2);
-        var iterator$2 = col$2.o();
+        var iterator$2 = col$2.p();
         var good$2 = init$2;
         var allGood$2 = true;
         while (iterator$2.f()) {
           var x0$6 = iterator$2.e();
-          var this$37 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Td(x0$6, adt.sr, x0$6.qO), $thiz.bh);
+          var this$37 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.Ta(x0$6, adt.ss, x0$6.qP), $thiz.bi);
           var r$4 = this$37.a1;
           if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$4 = r$4.H;
@@ -1377,7 +1377,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
             var h = null;
             var t = null;
             while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-              var it = rest.i().ph.o();
+              var it = rest.i().pi.p();
               while (it.f()) {
                 var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                 if ((t === null)) {
@@ -1399,16 +1399,16 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
             $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$2.ay);
           } else if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var v$2 = x1$2.H;
-            good$2 = good$2.fs(v$2);
+            good$2 = good$2.ft(v$2);
           } else {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
           }
         }
-        var this$42 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aS(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.bh);
+        var this$42 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aS(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.bi);
         var r$5 = this$42.a1;
-        var this$45 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$5.H.aC()) : r$5), $thiz.bh);
+        var this$45 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$5.H.aC()) : r$5), $thiz.bi);
         var r$6 = this$45.a1;
-        return ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt(id, nel$2$1, b$3, r$6.H), adt.JJ, adt.sr), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : r$6);
+        return ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt(id, nel$2$1, b$3, r$6.H), adt.JI, adt.ss), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : r$6);
       } else {
         return r$3;
       }
@@ -1421,12 +1421,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_sept
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawAdt__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertAdt__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawAdt__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, id, isRoot, svc, thisScope) {
-  var col = svc.Dw;
+  var col = svc.Dv;
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -1442,23 +1442,23 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
   }
-  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
   var r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
     var xs = b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2) => {
-      var this$12 = m$2$2.r1;
+      var this$12 = m$2$2.r2;
       return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$12.toLowerCase(), m$2$2);
     })));
     var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-    var it = xs.o();
+    var it = xs.p();
     while (it.f()) {
       var elem = it.e();
       var key = elem.E();
       m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$15) => (() => this$15.dU()))(xs))).am(elem);
     }
     var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-    var mapIt = m.o();
+    var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
@@ -1474,8 +1474,8 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_
       var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb));
     } else {
       var x0$3 = $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC()))));
-      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dMethod$002dNames.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueMethodNames(svc.qQ.gG, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(x0$3), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$21$2$2) => {
-        var f$1 = ((x$22$2$2) => x$22$2$2.r1);
+      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dMethod$002dNames.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueMethodNames(svc.qR.gG, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(x0$3), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$21$2$2) => {
+        var f$1 = ((x$22$2$2) => x$22$2$2.r2);
         if ((x$21$2$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           return $j_java$002elang$002e$002dObject.$m_sci_Nil$();
         } else {
@@ -1494,7 +1494,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_
         }
       })))), svc.y6), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
     }
-    var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bh);
+    var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bi);
     var r$1 = this$25.a1;
     return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User(isRoot, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dService.$c_Lio_septimalmind_baboon_typer_model_Typedef$Service(id, b.aC()), $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$(), svc.y6), $j_java$002elang$002e$002dObject.$m_sci_Nil$()))) : r$1);
   } else {
@@ -1504,15 +1504,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertService__Lio_septimalmind_baboon_typer_model_TypeId$User__Z__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertArg__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__Lio_septimalmind_baboon_parser_model_RawFuncArg__O($thiz, svc, fn, f) {
   if ((f instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dRef.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Ref)) {
-    var ref = f.K8;
-    var marker = f.K6;
-    var meta = f.K7;
-    var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, ref, meta), $thiz.bh);
+    var ref = f.K7;
+    var marker = f.K5;
+    var meta = f.K6;
+    var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, ref, meta), $thiz.bi);
     var r = this$2.a1;
     return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), marker, r.H)) : r);
   } else if ((f instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dStruct.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Struct)) {
-    var defn = f.Dt;
-    var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Simple(defn.kY(), $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [svc.qQ, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(fn.qP)]))), defn.kW()), $thiz.bh);
+    var defn = f.Ds;
+    var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Simple(defn.kY(), $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [svc.qR, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(fn.qQ)]))), defn.kW()), $thiz.bi);
     var r$1 = this$9.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
@@ -1526,12 +1526,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertArg__Lio_sept
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertArg__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__Lio_septimalmind_baboon_parser_model_RawFuncArg__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertArg__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__Lio_septimalmind_baboon_parser_model_RawFuncArg__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__O($thiz, svc, f) {
-  var col = f.Ds;
+  var col = f.Dr;
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -1547,24 +1547,24 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_s
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
   }
-  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
   var r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple4.$c_T4(b, b.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$24$2$2) => {
+    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple4.$c_T4(b, b.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$24$2$2) => {
       var this$11 = x$24$2$2.E();
       return (this$11.toLowerCase() === "in");
-    }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$25$2$2) => x$25$2$2.z()))), b.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$26$2$2) => {
+    }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$25$2$2) => x$25$2$2.z()))), b.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$26$2$2) => {
       var this$12 = x$26$2$2.E();
       return (this$12.toLowerCase() === "out");
-    }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$27$2$2) => x$27$2$2.z()))), b.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$28$2$2) => {
+    }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$27$2$2) => x$27$2$2.z()))), b.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$28$2$2) => {
       var this$13 = x$28$2$2.E();
       return (this$13.toLowerCase() === "err");
     }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$29$2$2) => x$29$2$2.z())))));
   } else {
     var $x_1 = r;
   }
-  var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bh);
+  var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bi);
   var r$1 = this$15.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -1574,15 +1574,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_s
     var inargs$1 = b$1.ww;
     var outargs$1 = b$1.Af;
     var errargs$1 = b$1.tI;
-    var this$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((outargs$1.y() !== 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMissing$002dOutput.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMissingOutput(svc.qQ.gG, f.qP, f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bh);
+    var this$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((outargs$1.y() !== 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMissing$002dOutput.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMissingOutput(svc.qR.gG, f.qQ, f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bi);
     var r$2 = this$20.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((outargs$1.y() > 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMultiple$002dOutputs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMultipleOutputs(svc.qQ.gG, f.qP, outargs$1.y(), f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bh);
+      var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((outargs$1.y() > 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMultiple$002dOutputs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMultipleOutputs(svc.qR.gG, f.qQ, outargs$1.y(), f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bi);
       var r$3 = this$25.a1;
       if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((errargs$1.y() > 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMultiple$002dErrors.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMultipleErrors(svc.qQ.gG, f.qP, errargs$1.y(), f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bh);
+        var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((errargs$1.y() > 1) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dService$002dMultiple$002dErrors.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ServiceMultipleErrors(svc.qR.gG, f.qQ, errargs$1.y(), f.uS), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bi);
         var r$4 = this$30.a1;
-        return ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dMethod$002dDef.$c_Lio_septimalmind_baboon_typer_model_Typedef$MethodDef(f.qP, inargs$1.i(), outargs$1.no(), errargs$1.no())) : r$4);
+        return ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dMethod$002dDef.$c_Lio_septimalmind_baboon_typer_model_Typedef$MethodDef(f.qQ, inargs$1.i(), outargs$1.no(), errargs$1.no())) : r$4);
       } else {
         return r$3;
       }
@@ -1596,30 +1596,30 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_s
 export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__O as $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMethod__Lio_septimalmind_baboon_parser_model_RawService__Lio_septimalmind_baboon_parser_model_RawFunc__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_septimalmind_baboon_parser_model_RawTypeRef__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, tpe, meta) {
   if ((tpe instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Simple)) {
-    var name = tpe.DD;
+    var name = tpe.DC;
     var prefix = tpe.yd;
-    var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.aii(prefix, name, $thiz.sB, $thiz.v3, meta), $thiz.bh);
+    var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.aif(prefix, name, $thiz.sC, $thiz.v3, meta), $thiz.bi);
     var r = this$2.a1;
     if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b = r.H;
-      var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(($j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dScalar.$is_Lio_septimalmind_baboon_typer_model_TypeId$Scalar(b) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScalar$002dExpected.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScalarExpected(b, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+      var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(($j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dScalar.$is_Lio_septimalmind_baboon_typer_model_TypeId$Scalar(b) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScalar$002dExpected.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScalarExpected(b, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
       var r$1 = this$7.a1;
       return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dRef$0024$002dScalar.$c_Lio_septimalmind_baboon_typer_model_TypeRef$Scalar(r$1.H)) : r$1);
     } else {
       return r;
     }
   } else if ((tpe instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Constructor)) {
-    var name$2 = tpe.Ke;
-    var params = tpe.Kf;
-    var prefix$2 = tpe.Kg;
-    var this$12 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((!prefix$2.m()) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScoped$002dRef$002dTo$002dNamespaced$002dGeneric.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScopedRefToNamespacedGeneric(prefix$2, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bh);
+    var name$2 = tpe.Kd;
+    var params = tpe.Ke;
+    var prefix$2 = tpe.Kf;
+    var this$12 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((!prefix$2.m()) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScoped$002dRef$002dTo$002dNamespaced$002dGeneric.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScopedRefToNamespacedGeneric(prefix$2, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.bi);
     var r$2 = this$12.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.aii(prefix$2, name$2, $thiz.sB, $thiz.v3, meta), $thiz.bh);
+      var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.v4.aif(prefix$2, name$2, $thiz.sC, $thiz.v3, meta), $thiz.bi);
       var r$3 = this$15.a1;
       if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$3 = r$3.H;
-        var this$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((b$3 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dCollection.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinCollection) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b$3) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dCollection$002dExpected.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$CollectionExpected(b$3, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bh);
+        var this$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((b$3 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dCollection.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinCollection) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b$3) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dCollection$002dExpected.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$CollectionExpected(b$3, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.bi);
         var r$4 = this$20.a1;
         if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$4 = r$4.H;
@@ -1627,7 +1627,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_sept
           var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
           var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
           var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-          var iterator = params.o();
+          var iterator = params.p();
           var good = init;
           var allGood = true;
           while (iterator.f()) {
@@ -1643,7 +1643,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_sept
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
             }
           }
-          var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bh);
+          var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.bi);
           var r$5 = this$30.a1;
           if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$5 = r$5.H;
@@ -1656,7 +1656,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_sept
               }
               var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dEmpty$002dGeneric$002dArgs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$EmptyGenericArgs(b$3, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
             }
-            var this$35 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bh);
+            var this$35 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.bi);
             var r$6 = this$35.a1;
             return ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_typer_model_TypeRef$Constructor(b$4, r$6.H.ay)) : r$6);
           } else {
@@ -1679,15 +1679,15 @@ export { $p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertTpe__Lio_sept
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonTranslator(pkg, defn, defined, scopeSupport, evidence$1) {
   this.v3 = null;
-  this.sB = null;
-  this.NE = null;
+  this.sC = null;
+  this.ND = null;
   this.v4 = null;
-  this.bh = null;
+  this.bi = null;
   this.v3 = pkg;
-  this.sB = defn;
-  this.NE = defined;
+  this.sC = defn;
+  this.ND = defined;
   this.v4 = scopeSupport;
-  this.bh = evidence$1;
+  this.bi = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonTranslator as $c_Lio_septimalmind_baboon_typer_BaboonTranslator };
 $p = $c_Lio_septimalmind_baboon_typer_BaboonTranslator.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -1697,21 +1697,21 @@ function $h_Lio_septimalmind_baboon_typer_BaboonTranslator() {
 }
 export { $h_Lio_septimalmind_baboon_typer_BaboonTranslator as $h_Lio_septimalmind_baboon_typer_BaboonTranslator };
 $h_Lio_septimalmind_baboon_typer_BaboonTranslator.prototype = $p;
-$p.aQ7 = (function() {
-  var rawDefn = this.sB.xc();
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.v4.a29(rawDefn.iD.iE.kY(), this.sB, this.v3, rawDefn.iD.iE.kW()), this.bh);
+$p.aQ0 = (function() {
+  var rawDefn = this.sC.xc();
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.v4.a27(rawDefn.iD.iE.kY(), this.sC, this.v3, rawDefn.iD.iE.kW()), this.bi);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_ExtendedRawDefn__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O(this, b, rawDefn, this.sB), this.bh);
+    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTranslator__convertMember__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_ExtendedRawDefn__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O(this, b, rawDefn, this.sC), this.bi);
     var r$1 = this$5.a1;
     return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.H) : r$1);
   } else {
     return r;
   }
 });
-$p.a1Z = (function(id, meta) {
-  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(this.NE.x(id)), this.bh);
+$p.a1X = (function(id, meta) {
+  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(this.ND.x(id)), this.bi);
   var r = this$3.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
@@ -1720,28 +1720,28 @@ $p.a1Z = (function(id, meta) {
       if ((b instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
         var defn = b.a3;
         if ((defn instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dContract.$c_Lio_septimalmind_baboon_typer_model_Typedef$Contract)) {
-          var col = defn.sO;
+          var col = defn.sP;
           var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
           var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
           var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
           var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-          var iterator = col.o();
+          var iterator = col.p();
           var good = init;
           var allGood = true;
           while (iterator.f()) {
-            var x1 = this.a1Z(iterator.e(), meta);
+            var x1 = this.a1X(iterator.e(), meta);
             if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
               var e = x1.aj;
               allGood = false;
               $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
             } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var v = x1.H;
-              good = good.fs(v);
+              good = good.ft(v);
             } else {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
             }
           }
-          var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), this.bh);
+          var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), this.bi);
           var r$1 = this$13.a1;
           var $x_1 = ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.H.aY($j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTranslator$0024$002dContract$002dContent.$c_Lio_septimalmind_baboon_typer_BaboonTranslator$ContractContent(this, defn.jJ, $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [id])))])))) : r$1);
           break matchEnd8;
@@ -1749,19 +1749,19 @@ $p.a1Z = (function(id, meta) {
       }
       var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dWrong$002dParent.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$WrongParent(id, b.eV(), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
     }
-    var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.bh);
+    var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.bi);
     var r$2 = this$25.a1;
     return ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$2.H) : r$2);
   } else {
     return r;
   }
 });
-$p.Td = (function(c, meta, refMeta) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.v4.a28(c.uQ.uN, this.sB, this.v3, refMeta), this.bh);
+$p.Ta = (function(c, meta, refMeta) {
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.v4.a26(c.uQ.uN, this.sC, this.v3, refMeta), this.bi);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a1Z(b, meta), this.bh);
+    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a1X(b, meta), this.bi);
     var r$1 = this$5.a1;
     return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.H) : r$1);
   } else {