@7mind.io/baboon 0.0.165 → 0.0.167

package/io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl.js

@@ -1,4 +1,5 @@
 'use strict';
+import * as $j_$002dxa27c2ef07b189593e2727fd7f782e745a4935cef from "./-xa27c2ef07b189593e2727fd7f782e745a4935cef.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$-W-Typer-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dBad$002dInheritance from "./io.septimalmind.baboon.parser.model.issues.-Typer-Issue$-Bad-Inheritance.js";
@@ -9,6 +10,7 @@ import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$00
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00241 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$1.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$2.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$3.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$0024compute$002dRenames$00241 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$compute-Renames$1.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder from "./io.septimalmind.baboon.typer.-Scope-Builder.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDeep$002dSchema$002dId from "./io.septimalmind.baboon.typer.model.-Deep-Schema-Id.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain from "./io.septimalmind.baboon.typer.model.-Domain.js";
@@ -48,26 +50,30 @@ import * as $j_scala$002emath$002e$002dOrdering$0024$002dString$0024 from "./sca
 import * as $j_scala$002eutil$002e$002dEither$0024$002dLeft$002dProjection from "./scala.util.-Either$-Left-Projection.js";
 var $p;
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O($thiz, defs) {
-  return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a1Q($j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$2($thiz)).bh(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.Eg.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td) => ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2, td)))(td$2$2))))))).a13(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((roots$2$2) => {
+  return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a2p($j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$2($thiz)).be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.yB.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td) => ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2, td)))(td$2$2))))))).a1A(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((roots$2$2) => {
     var seen = $j_java$002elang$002e$002dObject.$ct_scm_HashSet__(new $j_java$002elang$002e$002dObject.$c_scm_HashSet());
     var it = roots$2$2.o();
     while (it.f()) {
-      $thiz.azo(defs, it.e(), seen);
+      $thiz.aAM(defs, it.e(), seen);
     }
-    return $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(seen);
+    return $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(seen);
   })))));
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O };
+function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map($thiz, pkg, defs) {
+  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$0024compute$002dRenames$00241.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$computeRenames$1($thiz)).be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.yB.bG(new $j_$002dxa27c2ef07b189593e2727fd7f782e745a4935cef.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$$nestedInanonfun$computeRenames$2$1($thiz, td$2$2, pkg))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb);
+}
+export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O($thiz, defs) {
-  var this$5 = 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($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $thiz.lJ.aDb(defn$2$2))))), $thiz.dF);
+  var this$5 = 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($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $thiz.lO.aEx(defn$2$2))))), $thiz.dn);
   var r = this$5.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, b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), ref$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dMeta.$c_Lio_septimalmind_baboon_typer_model_RefMeta($thiz.lJ.ai0(defs, ref$2$2)))))).fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)));
+    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, b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), ref$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dMeta.$c_Lio_septimalmind_baboon_typer_model_RefMeta($thiz.lO.aiP(defs, ref$2$2)))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
   } else {
     var $x_1 = r;
   }
-  var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dF);
+  var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
   var r$1 = this$10.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -84,170 +90,170 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMe
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, id, defs, seen) {
-  var self = $thiz.lJ.oV(id);
+  var self = $thiz.lO.p4(id);
   var nseen = $j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedSeqOps__appended__O__O(seen, id);
-  if (seen.a6(id)) {
+  if (seen.a5(id)) {
     return $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(), [(("[recursive:" + self) + "]")]));
   } else {
-    var maybedef = defs.bb(id);
-    if ((!(!maybedef.l()))) {
+    var maybedef = defs.b2(id);
+    if ((!(!maybedef.m()))) {
       throw $j_java$002elang$002e$002dObject.$ct_jl_AssertionError__O__(new $j_java$002elang$002e$002dObject.$c_jl_AssertionError(), (("assertion failed: " + ("BUG: " + id)) + " not found"));
     }
     var x1 = maybedef.a0();
     if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin)) {
       return $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(), [(("[builtin:" + self) + "]")]));
     } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-      var x1$2 = x1.a8;
+      var x1$2 = x1.a3;
       if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dDto.$c_Lio_septimalmind_baboon_typer_model_Typedef$Dto)) {
-        var this$10 = x1$2.d6;
+        var this$10 = x1$2.cS;
         var rest = this$10;
         var h = null;
         var t = null;
         while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0 = rest.j();
-          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0.bj));
+          var x0 = rest.i();
+          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0.bi));
           var rest$1 = this$13;
           var h$1 = null;
           var t$1 = null;
           while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$1.j(), defs, nseen).o();
+            var it = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$1.i(), defs, nseen).o();
             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$1 === null)) {
                 h$1 = nx;
               } else {
-                t$1.M = nx;
+                t$1.L = nx;
               }
               t$1 = nx;
             }
             rest$1 = rest$1.n();
           }
           var exploded = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O(((h$1 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$1), $j_scala$002emath$002e$002dOrdering$0024$002dString$0024.$m_s_math_Ordering$String$());
-          var it$1 = $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(), ["{", x0.cp.cT])).b3(exploded).b3($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(), ["}"]))).o();
+          var it$1 = $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(), ["{", x0.cg.cK])).aY(exploded).aY($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(), ["}"]))).o();
           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 === null)) {
               h = nx$1;
             } else {
-              t.M = nx$1;
+              t.L = nx$1;
             }
             t = nx$1;
           }
           rest = rest.n();
         }
         var content = ((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h);
-        return $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(), [(("[dto:" + self) + "]")])).b3(content).b3($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(), [(("/[dto:" + self) + "]")])));
+        return $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(), [(("[dto:" + self) + "]")])).aY(content).aY($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(), [(("/[dto:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dContract.$c_Lio_septimalmind_baboon_typer_model_Typedef$Contract)) {
-        var this$35 = x1$2.jF;
+        var this$35 = x1$2.jJ;
         var rest$2 = this$35;
         var h$2 = null;
         var t$2 = null;
         while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0$2 = rest$2.j();
-          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0$2.bj));
+          var x0$2 = rest$2.i();
+          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$2.bi));
           var rest$3 = this$38;
           var h$3 = null;
           var t$3 = null;
           while ((rest$3 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$2 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$3.j(), defs, nseen).o();
+            var it$2 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$3.i(), defs, nseen).o();
             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$3 === null)) {
                 h$3 = nx$2;
               } else {
-                t$3.M = nx$2;
+                t$3.L = nx$2;
               }
               t$3 = nx$2;
             }
             rest$3 = rest$3.n();
           }
           var exploded$1 = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O(((h$3 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$3), $j_scala$002emath$002e$002dOrdering$0024$002dString$0024.$m_s_math_Ordering$String$());
-          var it$3 = $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(), ["{", x0$2.cp.cT])).b3(exploded$1).b3($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(), ["}"]))).o();
+          var it$3 = $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(), ["{", x0$2.cg.cK])).aY(exploded$1).aY($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(), ["}"]))).o();
           while (it$3.f()) {
             var nx$3 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$3.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$2 === null)) {
               h$2 = nx$3;
             } else {
-              t$2.M = nx$3;
+              t$2.L = nx$3;
             }
             t$2 = nx$3;
           }
           rest$2 = rest$2.n();
         }
         var content$2 = ((h$2 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$2);
-        return $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(), [(("[contract:" + self) + "]")])).b3(content$2).b3($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(), [(("/[contract:" + self) + "]")])));
+        return $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(), [(("[contract:" + self) + "]")])).aY(content$2).aY($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(), [(("/[contract:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dService.$c_Lio_septimalmind_baboon_typer_model_Typedef$Service)) {
-        var this$60 = x1$2.pg;
+        var this$60 = x1$2.pr;
         var rest$4 = this$60;
         var h$4 = null;
         var t$4 = null;
         while ((rest$4 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0$4 = rest$4.j();
-          var tpes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x0$4.pf])).b1(x0$4.pd).b1(x0$4.pe);
-          var this$68 = tpes.bh(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((tpe$2$2) => $thiz.lJ.x4(tpe$2$2)))).aB();
+          var x0$4 = rest$4.i();
+          var tpes = $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(), [x0$4.pq])).b7(x0$4.po).b7(x0$4.pp);
+          var this$68 = tpes.be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((tpe$2$2) => $thiz.lO.xe(tpe$2$2)))).aC();
           var rest$5 = this$68;
           var h$5 = null;
           var t$5 = null;
           while ((rest$5 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$4 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$5.j(), defs, nseen).o();
+            var it$4 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$5.i(), defs, nseen).o();
             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$5 === null)) {
                 h$5 = nx$4;
               } else {
-                t$5.M = nx$4;
+                t$5.L = nx$4;
               }
               t$5 = nx$4;
             }
             rest$5 = rest$5.n();
           }
           var exploded$2 = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O(((h$5 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$5), $j_scala$002emath$002e$002dOrdering$0024$002dString$0024.$m_s_math_Ordering$String$());
-          var it$5 = $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(), ["{", x0$4.qS])).b3(exploded$2).b3($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(), ["}"]))).o();
+          var it$5 = $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(), ["{", x0$4.r1])).aY(exploded$2).aY($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(), ["}"]))).o();
           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$4 === null)) {
               h$4 = nx$5;
             } else {
-              t$4.M = nx$5;
+              t$4.L = nx$5;
             }
             t$4 = nx$5;
           }
           rest$4 = rest$4.n();
         }
         var content$3 = ((h$4 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$4);
-        return $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(), [(("[service:" + self) + "]")])).b3(content$3).b3($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(), [(("/[service:" + self) + "]")])));
+        return $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(), [(("[service:" + self) + "]")])).aY(content$3).aY($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(), [(("/[service:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt)) {
-        var this$90 = x1$2.Nt;
+        var this$90 = x1$2.NY;
         var rest$6 = this$90;
         var h$6 = null;
         var t$6 = null;
         while ((rest$6 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0$6 = rest$6.j();
-          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0$6.bj));
+          var x0$6 = rest$6.i();
+          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$6.bi));
           var rest$7 = this$93;
           var h$7 = null;
           var t$7 = null;
           while ((rest$7 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$6 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$7.j(), defs, nseen).o();
+            var it$6 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$7.i(), defs, nseen).o();
             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$7 === null)) {
                 h$7 = nx$6;
               } else {
-                t$7.M = nx$6;
+                t$7.L = nx$6;
               }
               t$7 = nx$6;
             }
             rest$7 = rest$7.n();
           }
           var exploded$3 = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O(((h$7 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$7), $j_scala$002emath$002e$002dOrdering$0024$002dString$0024.$m_s_math_Ordering$String$());
-          var it$7 = $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(), ["{", x0$6.cp.cT])).b3(exploded$3).b3($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(), ["}"]))).o();
+          var it$7 = $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(), ["{", x0$6.cg.cK])).aY(exploded$3).aY($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(), ["}"]))).o();
           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$6 === null)) {
               h$6 = nx$7;
             } else {
-              t$6.M = nx$7;
+              t$6.L = nx$7;
             }
             t$6 = nx$7;
           }
@@ -255,79 +261,79 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         }
         var content$4 = ((h$6 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$6);
         var $x_2 = $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(), ["{", "branches"]));
-        var this$109 = x1$2.hx;
+        var this$109 = x1$2.go;
         var rest$8 = this$109;
         var h$8 = null;
         var t$8 = null;
         while ((rest$8 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var it$8 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$8.j(), defs, nseen).o();
+          var it$8 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$8.i(), defs, nseen).o();
           while (it$8.f()) {
             var nx$8 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$8.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$8 === null)) {
               h$8 = nx$8;
             } else {
-              t$8.M = nx$8;
+              t$8.L = nx$8;
             }
             t$8 = nx$8;
           }
           rest$8 = rest$8.n();
         }
-        var $x_1 = $x_2.b3(((h$8 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$8)).b3($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(), ["}", "{", "contracts"])));
-        var this$116 = x1$2.pc;
+        var $x_1 = $x_2.aY(((h$8 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$8)).aY($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(), ["}", "{", "contracts"])));
+        var this$116 = x1$2.pn;
         var rest$9 = this$116;
         var h$9 = null;
         var t$9 = null;
         while ((rest$9 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var it$9 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$9.j(), defs, nseen).o();
+          var it$9 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$9.i(), defs, nseen).o();
           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$9 === null)) {
               h$9 = nx$9;
             } else {
-              t$9.M = nx$9;
+              t$9.L = nx$9;
             }
             t$9 = nx$9;
           }
           rest$9 = rest$9.n();
         }
-        var branches = $x_1.b3(((h$9 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$9)).b3($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(), ["}"])));
-        return $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(), [(("[adt:" + self) + "]")])).b3(content$4).b3(branches).b3($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(), [(("/[adt:" + self) + "]")])));
+        var branches = $x_1.aY(((h$9 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$9)).aY($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(), ["}"])));
+        return $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(), [(("[adt:" + self) + "]")])).aY(content$4).aY(branches).aY($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(), [(("/[adt:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dEnum.$c_Lio_septimalmind_baboon_typer_model_Typedef$Enum)) {
         var $x_5 = $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(), [(("[enum:" + self) + "]")]));
-        var this$ = x1$2.gn;
+        var this$ = x1$2.gp;
         var f = ((m$2$2) => {
-          var $x_3 = m$2$2.gF;
-          var this$138 = m$2$2.ys;
-          if (this$138.l()) {
+          var $x_3 = m$2$2.gJ;
+          var this$138 = m$2$2.yC;
+          if (this$138.m()) {
             var this$139 = $j_java$002elang$002e$002dObject.$m_s_None$();
           } else {
             var x0$10 = this$138.a0();
             var t$10 = $j_java$002elang$002e$002dObject.$uJ(x0$10);
-            var this$139 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_RTLong$().k3(t$10.g, t$10.i));
+            var this$139 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_RTLong$().k7(t$10.g, t$10.j));
           }
-          return (($x_3 + "/") + (this$139.l() ? "NoVal" : this$139.a0()));
+          return (($x_3 + "/") + (this$139.m() ? "NoVal" : this$139.a0()));
         });
         if ((this$ === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
         } else {
-          var x0$11 = this$.j();
+          var x0$11 = this$.i();
           var h$10 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$11), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
           var t$11 = h$10;
           var rest$10 = this$.n();
           while ((rest$10 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var x0$12 = rest$10.j();
+            var x0$12 = rest$10.i();
             var nx$10 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$12), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-            t$11.M = nx$10;
+            t$11.L = nx$10;
             t$11 = nx$10;
             rest$10 = rest$10.n();
           }
           var $x_4 = h$10;
         }
-        return $x_5.b3($x_4).b3($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(), [(("/[enum:" + self) + "]")])));
+        return $x_5.aY($x_4).aY($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(), [(("/[enum:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign.$c_Lio_septimalmind_baboon_typer_model_Typedef$Foreign)) {
-        return $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(), [(((("[foreign:" + self) + ":") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(x1$2.sH.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+        return $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(), [(((("[foreign:" + self) + ":") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(x1$2.sP.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
           if ((x0$1$2$2 !== null)) {
-            var k = x0$1$2$2.C();
+            var k = x0$1$2$2.E();
             var v = x0$1$2$2.z();
             return ((k + "->") + v);
           } else {
@@ -344,15 +350,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O($thiz, id, defs) {
-  var this$4 = 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($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, id, defs, $j_java$002elang$002e$002dObject.$m_sci_Nil$())), $thiz.dF);
+  var this$4 = 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($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, id, defs, $j_java$002elang$002e$002dObject.$m_sci_Nil$())), $thiz.dn);
   var r = this$4.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.lJ.oV(id)) + ";") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(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.lO.p4(id)) + ";") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(b, "", ",", "")) + "]")));
   } else {
     var $x_1 = r;
   }
-  var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dF);
+  var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
   var r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -369,10 +375,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O($thiz, graph) {
-  var col = graph.ax.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+  var col = graph.aw.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
     if ((x0$1$2$2 !== null)) {
-      var id = x0$1$2$2.C();
-      var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O($thiz, id, graph.ax), $thiz.dF);
+      var id = x0$1$2$2.E();
+      var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O($thiz, id, graph.aw), $thiz.dn);
       var r = this$4.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(), id, r.H)) : r);
     } else {
@@ -391,17 +397,17 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDe
     if ((x0 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
       var e = x0.aj;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
     } else if ((x0 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var v = x0.H;
-      good = good.gR(v);
+      good = good.gA(v);
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
   }
-  var this$14 = 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.aT(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.bd()))), $thiz.dF);
+  var this$14 = 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.dn);
   var r$1 = this$14.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.fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)) : r$1);
+  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.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : r$1);
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O($thiz, defs, current, predecessors) {
@@ -411,25 +417,25 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
     var h = null;
     var t = null;
     while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-      var x0 = rest.j();
+      var x0 = rest.i();
       if ((x0 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
       }
-      var id = x0.C();
+      var id = x0.E();
       var defn = x0.z();
-      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.a0x(defn));
+      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.a12(defn));
       var f = ((id) => ((dep$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, new $j_java$002elang$002e$002dObject.$c_s_Some(dep$2$2))))(id);
       if ((this$6 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
         var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
       } else {
-        var x0$1 = this$6.j();
+        var x0$1 = this$6.i();
         var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
         var t$1 = h$1;
         var rest$1 = this$6.n();
         while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0$2 = rest$1.j();
+          var x0$2 = rest$1.i();
           var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-          t$1.M = nx;
+          t$1.L = nx;
           t$1 = nx;
           rest$1 = rest$1.n();
         }
@@ -441,7 +447,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
         if ((t === null)) {
           h = nx$1;
         } else {
-          t.M = nx$1;
+          t.L = nx$1;
         }
         t = nx$1;
       }
@@ -449,47 +455,47 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
     }
     var nextDepMap = ((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h);
     var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
-    var f$1 = ((x$7$2$2) => x$7$2$2.z());
+    var f$1 = ((x$8$2$2) => x$8$2$2.z());
     if ((nextDepMap === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
-      var x0$3 = nextDepMap.j();
+      var x0$3 = nextDepMap.i();
       var h$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       var t$2 = h$2;
       var rest$2 = nextDepMap.n();
       while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-        var x0$4 = rest$2.j();
+        var x0$4 = rest$2.i();
         var nx$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$4), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-        t$2.M = nx$2;
+        t$2.L = nx$2;
         t$2 = nx$2;
         rest$2 = rest$2.n();
       }
       var $x_2 = h$2;
     }
-    var nextDeps = $x_3.a3($x_2);
-    var next = defs.HU(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3($thiz, nextDeps));
-    var newPredecessors = predecessors.b3(nextDepMap);
+    var nextDeps = $x_3.a4($x_2);
+    var next = defs.Im(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3($thiz, nextDeps));
+    var newPredecessors = predecessors.aY(nextDepMap);
     var $x_5 = defs;
-    var f$2 = ((x$8$2$2) => x$8$2$2.C());
+    var f$2 = ((x$9$2$2) => x$9$2$2.E());
     if ((nextDepMap === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
-      var x0$5 = nextDepMap.j();
+      var x0$5 = nextDepMap.i();
       var h$3 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$2(x0$5), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       var t$3 = h$3;
       var rest$3 = nextDepMap.n();
       while ((rest$3 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-        var x0$6 = rest$3.j();
+        var x0$6 = rest$3.i();
         var nx$3 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$2(x0$6), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-        t$3.M = nx$3;
+        t$3.L = nx$3;
         t$3 = nx$3;
         rest$3 = rest$3.n();
       }
       var $x_4 = h$3;
     }
-    var todo = $x_5.a1w($x_4);
-    if (next.l()) {
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a1Q(newPredecessors).a13(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$9$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(x$9$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$10$2$2) => $j_scala$002e$002dOption$0024.$m_s_Option$().hX(x$10$2$2).fd())))))))));
+    var todo = $x_5.a25($x_4);
+    if (next.m()) {
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a2p(newPredecessors).a1A(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$10$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(x$10$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$11$2$2) => $j_scala$002e$002dOption$0024.$m_s_Option$().i1(x$11$2$2).fh())))))))));
     } else {
       defs = todo;
       current = next;
@@ -499,18 +505,18 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper__Lio_septimalmind_baboon_typer_model_Pkg__sci_Seq__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, pkg, members, meta) {
-  var this$4 = 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($thiz.amF.amG.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin(id$2$2))))), $thiz.dF);
+  var this$4 = 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($thiz.ao4.ao6.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin(id$2$2))))), $thiz.dn);
   var r = this$4.a1;
-  var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((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(), r.H, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder.$c_Lio_septimalmind_baboon_typer_ScopeBuilder($thiz.dF))) : r), $thiz.dF);
+  var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((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(), r.H, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder.$c_Lio_septimalmind_baboon_typer_ScopeBuilder($thiz.dn))) : r), $thiz.dn);
   var r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
     if ((b$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$1);
     }
-    var initial = b$1.C();
+    var initial = b$1.E();
     var builder$1 = b$1.z();
-    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(builder$1.aEB(pkg, members, meta), $thiz.dF);
+    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(builder$1.aFY(pkg, members, meta), $thiz.dn);
     var r$2 = this$10.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = r$2.H;
@@ -518,7 +524,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
     } else {
       var $x_1 = r$2;
     }
-    var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dF);
+    var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
     var r$3 = this$13.a1;
     if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$3 = r$3.H;
@@ -526,105 +532,105 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$3);
       }
       var flattened$1 = b$3.z();
-      var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, pkg, flattened$1, meta), $thiz.dF);
+      var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, pkg, flattened$1, meta), $thiz.dn);
       var r$4 = this$16.a1;
       if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$4 = r$4.H;
         var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
         var i = b$4.o();
         var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
-        while ((i.f() && acc.a0K())) {
+        while ((i.f() && acc.a1h())) {
           var nxt = i.e();
           var _1 = acc;
           if ((_1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var a$1 = _1.H;
-            var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.amE.Sr(pkg, nxt, a$1).aOI(), $thiz.dF);
+            var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.ao3.SX(pkg, nxt, a$1).aQ7(), $thiz.dn);
             var r$5 = this$21.a1;
             if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$5 = r$5.H;
-              var f = ((m$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2.eP(), m$2$2));
+              var f = ((m$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2.eV(), m$2$2));
               if ((b$5 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
                 var mapped = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
               } else {
-                var x0 = b$5.j();
+                var x0 = b$5.i();
                 var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                 var t = h;
                 var rest = b$5.n();
                 while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                  var x0$1 = rest.j();
+                  var x0$1 = rest.i();
                   var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                  t.M = nx;
+                  t.L = nx;
                   t = nx;
                   rest = rest.n();
                 }
                 var mapped = h;
               }
-              var $x_5 = a$1.bX();
+              var $x_5 = a$1.bP();
               var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
-              var f$1 = ((x$11$2$2) => x$11$2$2.C());
+              var f$1 = ((x$12$2$2) => x$12$2$2.E());
               if ((mapped === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
                 var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
               } else {
-                var x0$2 = mapped.j();
+                var x0$2 = mapped.i();
                 var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
                 var t$1 = h$1;
                 var rest$1 = mapped.n();
                 while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                  var x0$3 = rest$1.j();
+                  var x0$3 = rest$1.i();
                   var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                  t$1.M = nx$1;
+                  t$1.L = nx$1;
                   t$1 = nx$1;
                   rest$1 = rest$1.n();
                 }
                 var $x_3 = h$1;
               }
-              var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$5, mapped, $x_5.fq($x_4.a3($x_3))));
+              var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$5, mapped, $x_5.fc($x_4.a4($x_3))));
             } else {
               var $x_2 = r$5;
             }
-            var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.dF);
+            var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.dn);
             var r$6 = this$25.a1;
             if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$6 = r$6.H;
               if ((b$6 === null)) {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
               }
-              var mapped$1 = b$6.bk;
+              var mapped$1 = b$6.bj;
               var dupes$1 = b$6.br;
-              var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((!dupes$1.l()) ? 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$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dDuplicated$002dTypes.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypes(dupes$1, 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.dF);
+              var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((!dupes$1.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$002dDuplicated$002dTypes.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypes(dupes$1, 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.dn);
               var r$7 = this$30.a1;
-              acc = ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(a$1.j3(mapped$1)) : r$7);
+              acc = ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(a$1.j6(mapped$1)) : r$7);
             } else {
               acc = r$6;
             }
           }
         }
-        var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.dF);
+        var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.dn);
         var r$8 = this$33.a1;
         if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$8 = r$8.H;
-          var xs = initial.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2$1) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2$1.qP, m$2$2$1)))).gx($j_java$002elang$002e$002dObject.$m_sci_Seq$().cS(b$8));
-          var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
+          var xs = initial.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2$1) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2$1.qY, m$2$2$1)))).gz($j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(b$8));
+          var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
           var it = xs.o();
           while (it.f()) {
             var elem = it.e();
-            var key = elem.C();
-            m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$39) => (() => this$39.dT()))(xs))).al(elem);
+            var key = elem.E();
+            m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$39) => (() => this$39.dU()))(xs))).am(elem);
           }
-          var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
+          var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
           var mapIt = m.o();
           while (mapIt.f()) {
             var x1 = mapIt.e();
             if ((x1 === null)) {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
             }
-            var k = x1.C();
+            var k = x1.E();
             var v = x1.z();
-            result = result.ch(k, v.aq());
+            result = result.ci(k, v.aq());
           }
           var grouped = result;
-          var bad = grouped.eT(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$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)) : 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$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueTypedefs($j_java$002elang$002e$002dObject.$m_sci_Map$().am(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()))).aB())))), 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.dF);
+          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$46 = 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(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$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueTypedefs($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())))), 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.dn);
           var r$9 = this$46.a1;
           return ((r$9 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(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(r$9.H))) : r$9);
         } else {
@@ -654,63 +660,63 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
     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.az);
+      $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.gR(v);
+      good = good.gA(v);
     } else {
       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.aT(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.bd()))), $thiz.dF);
+  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.dn);
   var r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
+    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
     var it = b.o();
     while (it.f()) {
       var elem = it.e();
-      var key = elem.C();
-      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).al(elem);
+      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$().bV;
+    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
     var mapIt = m.o();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var k = x1$1.C();
+      var k = x1$1.E();
       var v$1 = x1$1.z();
-      result = result.ch(k, v$1.aq());
+      result = result.ci(k, v$1.aq());
     }
     var grouped = result;
-    var bad$1 = grouped.eT(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$22 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am(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$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dBad$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$BadInheritance($j_java$002elang$002e$002dObject.$m_sci_Map$().am(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()))).aB())))), 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.dF);
+    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$22 = 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($j_java$002elang$002e$002dObject.$m_sci_Map$().al(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$002dBad$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$BadInheritance($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())))), 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.dn);
     var r$1 = this$22.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.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$1, $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyList$(), $j_java$002elang$002e$002dObject.$m_sci_Map$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(b$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$16$2$2) => x$16$2$2.C())))))));
+      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$1, $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyList$(), $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(b$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$17$2$2) => x$17$2$2.E())))))));
     } else {
       var $x_1 = r$1;
     }
-    var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dF);
+    var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
     var r$2 = this$29.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = r$2.H;
       if ((b$2 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$2);
       }
-      var asMap = b$2.C();
+      var asMap = b$2.E();
       var predMatrix$1 = b$2.z();
-      var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$0024.$m_Lizumi_fundamentals_graphs_tools_Toposort$().avO(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aGc()), $thiz.dF);
+      var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$0024.$m_Lizumi_fundamentals_graphs_tools_Toposort$().axe(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aHz()), $thiz.dn);
       var r$3 = this$33.a1;
       var r$4 = ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$3.H) : r$3);
       var this$36 = new $j_scala$002eutil$002e$002dEither$0024$002dLeft$002dProjection.$c_s_util_Either$LeftProjection(r$4);
-      var x1$2 = this$36.bW;
-      var this$38 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left) ? 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$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dCircular$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$CircularInheritance(x1$2.aj, 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$()))) : this$36.bW), $thiz.dF);
+      var x1$2 = this$36.bX;
+      var this$38 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left) ? 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$002dCircular$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$CircularInheritance(x1$2.aj, 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$()))) : this$36.bX), $thiz.dn);
       var r$5 = this$38.a1;
-      return ((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.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => asMap.x(id$2$2).z()))).aB()) : r$5);
+      return ((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.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => asMap.x(id$2$2).z()))).aC()) : r$5);
     } else {
       return r$2;
     }
@@ -720,12 +726,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, pkg, defn) {
-  var rawDefn = defn.x2();
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.a3X.a1A(rawDefn.iB.iC.kT(), defn, pkg, rawDefn.iB.iC.kR()), $thiz.dF);
+  var rawDefn = defn.xc();
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.a4I.a29(rawDefn.iD.iE.kY(), defn, pkg, rawDefn.iD.iE.kW()), $thiz.dn);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var col = $thiz.lJ.aIq(defn.x2().iB.iC);
+    var col = $thiz.lO.aJN(defn.xc().iD.iE);
     var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Set$());
     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$();
@@ -735,24 +741,24 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = $thiz.a3X.a1z(x0, defn, pkg, rawDefn.iB.iC.kR());
+      var x1 = $thiz.a4I.a28(x0, defn, pkg, rawDefn.iD.iE.kW());
       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.az);
+        $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.gR(v);
+        good = good.gA(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.aT(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.bd()))), $thiz.dF);
+    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.dn);
     var r$1 = this$13.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var $x_1 = r$1.H;
-      var x1$1 = b.c5;
-      return 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, $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), $x_1.b1(((x1$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt) ? $j_java$002elang$002e$002dObject.$m_sci_Set$().a3($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x1$1.fv])) : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())), defn)));
+      var x1$1 = b.c8;
+      return 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, $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), $x_1.b7(((x1$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt) ? $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(), [x1$1.fA])) : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())), defn)));
     } else {
       return r$1;
     }
@@ -762,12 +768,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List($thiz, root) {
-  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(root.sB), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(defn$2$2)))).aB();
+  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(root.sJ), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(defn$2$2)))).aC();
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List };
 function $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(current) {
   if ((current instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope)) {
-    return $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(), [current])).b3($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(current.qR), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(n$2$2)))).aB());
+    return $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(), [current])).aY($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(current.r0), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(n$2$2)))).aC());
   } else if ((current instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope)) {
     return $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(), [current]));
   } else {
@@ -777,18 +783,18 @@ function $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenS
 export { $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List as $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl(enquiries, translator, scopeSupport, componentParsers, types, evidence$1) {
-  this.lJ = null;
-  this.amE = null;
-  this.a3X = null;
-  this.a3W = null;
-  this.amF = null;
-  this.dF = null;
-  this.lJ = enquiries;
-  this.amE = translator;
-  this.a3X = scopeSupport;
-  this.a3W = componentParsers;
-  this.amF = types;
-  this.dF = evidence$1;
+  this.lO = null;
+  this.ao3 = null;
+  this.a4I = null;
+  this.a4H = null;
+  this.ao4 = null;
+  this.dn = null;
+  this.lO = enquiries;
+  this.ao3 = translator;
+  this.a4I = scopeSupport;
+  this.a4H = componentParsers;
+  this.ao4 = types;
+  this.dn = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };
 $p = $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -798,124 +804,136 @@ function $h_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl() {
 }
 export { $h_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $h_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };
 $h_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl.prototype = $p;
-$p.aLZ = (function(model) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a3W.aLL(model.nv), this.dF);
+$p.aNo = (function(model) {
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4H.aNa(model.nG), this.dn);
   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.a3W.aLO(model.uH), this.dF);
+    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4H.aNd(model.uP), this.dn);
     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;
-      var this$8 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper__Lio_septimalmind_baboon_typer_model_Pkg__sci_Seq__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O(this, b, model.oZ.oY, model.nv.uL), this.dF);
+      var this$8 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper__Lio_septimalmind_baboon_typer_model_Pkg__sci_Seq__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O(this, b, model.p8.p7, model.nG.uT), this.dn);
       var r$2 = this$8.a1;
       if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$2 = r$2.H;
-        var f = ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2.eP(), d$2$2));
+        var f = ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2.eV(), d$2$2));
         if ((b$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var xs = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
         } else {
-          var x0 = b$2.j();
+          var x0 = b$2.i();
           var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
           var t = h;
           var rest = b$2.n();
           while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var x0$1 = rest.j();
+            var x0$1 = rest.i();
             var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-            t.M = nx;
+            t.L = nx;
             t = nx;
             rest = rest.n();
           }
           var xs = h;
         }
-        var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
+        var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
         var it = xs.o();
         while (it.f()) {
           var elem = it.e();
-          var key = elem.C();
-          m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).al(elem);
+          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$().bV;
+        var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
         var mapIt = m.o();
         while (mapIt.f()) {
           var x1 = mapIt.e();
           if ((x1 === null)) {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
           }
-          var k = x1.C();
+          var k = x1.E();
           var v = x1.z();
-          result = result.ch(k, v.aq());
+          result = result.ci(k, v.aq());
         }
         var grouped = result;
-        var bad = grouped.eT(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$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am(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$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dDuplicated$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypedefs(model, $j_java$002elang$002e$002dObject.$m_sci_Map$().am(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()))).aB()))))), $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$())))), this.dF);
+        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$20 = 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$002dDuplicated$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypedefs(model, $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()))))), $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$())))), this.dn);
         var r$3 = this$20.a1;
         if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$3 = r$3.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$3, b$3.HU(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$1(this))));
+          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$3, b$3.Im(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$1(this))));
         } else {
           var $x_1 = r$3;
         }
-        var this$23 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.dF);
+        var this$23 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.dn);
         var r$4 = this$23.a1;
         if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$4 = r$4.H;
           if ((b$4 === null)) {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$4);
           }
-          var indexedDefs = b$4.C();
+          var indexedDefs = b$4.E();
           var roots$1 = b$4.z();
-          var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O(this, indexedDefs, roots$1, roots$1.bX().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((t$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), t$2$2, $j_java$002elang$002e$002dObject.$m_s_None$())))).aB()), this.dF);
+          var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O(this, indexedDefs, roots$1, roots$1.bP().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((t$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), t$2$2, $j_java$002elang$002e$002dObject.$m_s_None$())))).aC()), this.dn);
           var r$5 = this$26.a1;
           if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$5 = r$5.H;
             var predMatrix = $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dPred$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyPredList$(), b$5);
-            var graph = $j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().U8(predMatrix, indexedDefs.ba(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+            var graph = $j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().UD(predMatrix, indexedDefs.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
               if ((x0$1$2$2 !== null)) {
-                var k$1 = x0$1$2$2.C();
-                return predMatrix.iH.a6(k$1);
+                var k$1 = x0$1$2$2.E();
+                return predMatrix.iJ.a5(k$1);
               } else {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
               }
             }))));
-            var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple5.$c_T5(b$5, predMatrix, graph, indexedDefs.bX().cg(graph.ax.bX()), $j_java$002elang$002e$002dObject.$m_sci_Map$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(graph.ax), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lJ.aNz(defn$2$2)))))));
+            var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple5.$c_T5(b$5, predMatrix, graph, indexedDefs.bP().c1(graph.aw.bP()), $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(graph.aw), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lO.aOY(defn$2$2)))))));
           } else {
             var $x_2 = r$5;
           }
-          var this$36 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, this.dF);
+          var this$36 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, this.dn);
           var r$6 = this$36.a1;
           if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$6 = r$6.H;
             if ((b$6 === null)) {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
             }
-            var graph$1 = b$6.GX;
-            var excludedIds$1 = b$6.GY;
-            var shallowSchema$1 = b$6.GZ;
-            var this$39 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O(this, graph$1), this.dF);
+            var graph$1 = b$6.Hp;
+            var excludedIds$1 = b$6.Hq;
+            var shallowSchema$1 = b$6.Hr;
+            var this$39 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O(this, graph$1), this.dn);
             var r$7 = this$39.a1;
             if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$7 = r$7.H;
-              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$7, this.lJ.aKa(graph$1.ax), graph$1.ax.bX().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((deepSchema) => ((id$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dMeta.$c_Lio_septimalmind_baboon_typer_model_TypeMeta(shallowSchema$1.x(id$2$2), deepSchema.x(id$2$2)))))(b$7))).fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)));
+              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$7, this.lO.aLy(graph$1.aw), graph$1.aw.bP().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((deepSchema) => ((id$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dMeta.$c_Lio_septimalmind_baboon_typer_model_TypeMeta(shallowSchema$1.x(id$2$2), deepSchema.x(id$2$2)))))(b$7))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
             } else {
               var $x_3 = r$7;
             }
-            var this$43 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, this.dF);
+            var this$43 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, this.dn);
             var r$8 = this$43.a1;
             if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$8 = r$8.H;
               if ((b$8 === null)) {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$8);
               }
-              var loops$1 = b$8.bk;
+              var loops$1 = b$8.bj;
               var typeMeta$1 = b$8.br;
-              var this$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O(this, graph$1.ax), this.dF);
+              var this$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O(this, graph$1.aw), this.dn);
               var r$9 = this$46.a1;
               if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var b$9 = r$9.H;
-                var this$49 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O(this, graph$1.ax), this.dF);
+                var this$49 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O(this, graph$1.aw), this.dn);
                 var r$10 = this$49.a1;
-                return ((r$10 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.$c_Lio_septimalmind_baboon_typer_model_Domain(b, b$1, graph$1, excludedIds$1, typeMeta$1, loops$1, b$9, r$10.H, roots$1.bX())) : r$10);
+                var this$52 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((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.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), r$10.H, $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map(this, b, graph$1.aw))) : r$10), this.dn);
+                var r$11 = this$52.a1;
+                if ((r$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+                  var b$11 = r$11.H;
+                  if ((b$11 === null)) {
+                    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$11);
+                  }
+                  var derivations = b$11.E();
+                  var renames$1 = b$11.z();
+                  return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain.$c_Lio_septimalmind_baboon_typer_model_Domain(b, b$1, graph$1, excludedIds$1, typeMeta$1, loops$1, b$9, derivations, roots$1.bP(), renames$1));
+                } else {
+                  return r$11;
+                }
               } else {
                 return r$9;
               }
@@ -938,17 +956,17 @@ $p.aLZ = (function(model) {
     return r;
   }
 });
-$p.azo = (function(defs, defn, seen) {
-  var notYetSeen = this.lJ.a0x(defn).cg(seen);
-  seen.d2(defn.eP());
-  seen.cm(notYetSeen);
-  notYetSeen.bG(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
-    this.azo(defs, defs.x(id$2$2), seen);
+$p.aAM = (function(defs, defn, seen) {
+  var notYetSeen = this.lO.a12(defn).c1(seen);
+  seen.d5(defn.eV());
+  seen.cn(notYetSeen);
+  notYetSeen.bH(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
+    this.aAM(defs, defs.x(id$2$2), seen);
   })));
 });
 var $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl, "io.septimalmind.baboon.typer.BaboonTyper$BaboonTyperImpl", ({
-  xm: 1,
-  jc: 1
+  xv: 1,
+  jj: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl.js.map