@7mind.io/baboon 0.0.160 → 0.0.164

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

@@ -48,29 +48,29 @@ 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$().al($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a1J($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)).bi(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.E2.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))))))).a0W(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$().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) => {
     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.aze(defs, it.e(), seen);
+      $thiz.azo(defs, it.e(), seen);
     }
     return $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(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__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.aCZ(defn$2$2))))), $thiz.dE);
+  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 r = this$5.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.I;
-    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.ahU(defs, ref$2$2)))))).fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
+    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)));
   } 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.dE);
+  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 r$1 = this$10.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b$1 = r$1.I;
+    var b$1 = r$1.H;
     if ((b$1 !== null)) {
       var $x_2 = b$1.z();
     } else {
@@ -84,7 +84,7 @@ 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.oT(id);
+  var self = $thiz.lJ.oV(id);
   var nseen = $j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedSeqOps__appended__O__O(seen, id);
   if (seen.a6(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) + "]")]));
@@ -99,13 +99,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
     } 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;
       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.d5;
+        var this$10 = x1$2.d6;
         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.wV(x0.bk));
+          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0.bj));
           var rest$1 = this$13;
           var h$1 = null;
           var t$1 = null;
@@ -123,7 +123,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
             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.cn.cS])).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.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();
           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)) {
@@ -144,7 +144,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         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.wV(x0$2.bk));
+          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0$2.bj));
           var rest$3 = this$38;
           var h$3 = null;
           var t$3 = null;
@@ -162,7 +162,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
             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.cn.cS])).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.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();
           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)) {
@@ -177,14 +177,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         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) + "]")])));
       } 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.pe;
+        var this$60 = x1$2.pg;
         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.pd])).b1(x0$4.pb).b1(x0$4.pc);
-          var this$68 = tpes.bi(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((tpe$2$2) => $thiz.lJ.wV(tpe$2$2)))).aB();
+          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 rest$5 = this$68;
           var h$5 = null;
           var t$5 = null;
@@ -202,7 +202,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
             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.qP])).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.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();
           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)) {
@@ -217,13 +217,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         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) + "]")])));
       } 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.Ne;
+        var this$90 = x1$2.Nt;
         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.wV(x0$6.bk));
+          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.x4(x0$6.bj));
           var rest$7 = this$93;
           var h$7 = null;
           var t$7 = null;
@@ -241,7 +241,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
             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.cn.cS])).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.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();
           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)) {
@@ -255,7 +255,7 @@ 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.hw;
+        var this$109 = x1$2.hx;
         var rest$8 = this$109;
         var h$8 = null;
         var t$8 = null;
@@ -273,7 +273,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           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.pa;
+        var this$116 = x1$2.pc;
         var rest$9 = this$116;
         var h$9 = null;
         var t$9 = null;
@@ -297,7 +297,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         var this$ = x1$2.gn;
         var f = ((m$2$2) => {
           var $x_3 = m$2$2.gF;
-          var this$138 = m$2$2.yg;
+          var this$138 = m$2$2.ys;
           if (this$138.l()) {
             var this$139 = $j_java$002elang$002e$002dObject.$m_s_None$();
           } else {
@@ -325,9 +325,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         }
         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) + "]")])));
       } 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.sE.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.sH.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.D();
+            var k = x0$1$2$2.C();
             var v = x0$1$2$2.z();
             return ((k + "->") + v);
           } else {
@@ -344,18 +344,18 @@ 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.dE);
+  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 r = this$4.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.I;
-    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.oT(id)) + ";") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(b, "", ",", "")) + "]")));
+    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, "", ",", "")) + "]")));
   } 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.dE);
+  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 r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b$1 = r$1.I;
+    var b$1 = r$1.H;
     if ((b$1 !== null)) {
       var $x_2 = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDeep$002dSchema$002dId.$c_Lio_septimalmind_baboon_typer_model_DeepSchemaId($j_izumi$002efundamentals$002eplatform$002ecrypto$002e$002dIz$002dHash$002dFunction.$f_Lizumi_fundamentals_platform_crypto_IzHashFunction__hash__T__T($j_izumi$002efundamentals$002eplatform$002ecrypto$002e$002dIz$002dSha256$002dHash$002dFunction$0024.$m_Lizumi_fundamentals_platform_crypto_IzSha256HashFunction$(), b$1.z()));
     } else {
@@ -371,10 +371,10 @@ export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
 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) => {
     if ((x0$1$2$2 !== null)) {
-      var id = x0$1$2$2.D();
-      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.dE);
+      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 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.I)) : r);
+      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 {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
     }
@@ -389,19 +389,19 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDe
   while (iterator.f()) {
     var x0 = iterator.e();
     if ((x0 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-      var e = x0.ak;
+      var e = x0.aj;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.aA);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
     } else if ((x0 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var v = x0.I;
+      var v = x0.H;
       good = good.gR(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.dE);
+  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 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.I.fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)) : 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.fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)) : 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) {
@@ -415,9 +415,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       if ((x0 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
       }
-      var id = x0.D();
+      var id = x0.C();
       var defn = x0.z();
-      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.a0r(defn));
+      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lJ.a0x(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$();
@@ -467,10 +467,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       var $x_2 = h$2;
     }
     var nextDeps = $x_3.a3($x_2);
-    var next = defs.HI(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 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 $x_5 = defs;
-    var f$2 = ((x$8$2$2) => x$8$2$2.D());
+    var f$2 = ((x$8$2$2) => x$8$2$2.C());
     if ((nextDepMap === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -487,9 +487,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       }
       var $x_4 = h$3;
     }
-    var todo = $x_5.a1o($x_4);
+    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$().al($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a1J(newPredecessors).a0W(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())))))))));
+      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())))))))));
     } else {
       defs = todo;
       current = next;
@@ -499,49 +499,49 @@ 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.amx.amy.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.dE);
+  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 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.I, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder.$c_Lio_septimalmind_baboon_typer_ScopeBuilder($thiz.dE))) : r), $thiz.dE);
+  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 r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b$1 = r$1.I;
+    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.D();
+    var initial = b$1.C();
     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.aEp(pkg, members, meta), $thiz.dE);
+    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 r$2 = this$10.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$2 = r$2.I;
+      var b$2 = r$2.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$2, $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List($thiz, b$2)));
     } 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.dE);
+    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 r$3 = this$13.a1;
     if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$3 = r$3.I;
+      var b$3 = r$3.H;
       if ((b$3 === null)) {
         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.dE);
+      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 r$4 = this$16.a1;
       if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var b$4 = r$4.I;
+        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.a0E())) {
+        while ((i.f() && acc.a0K())) {
           var nxt = i.e();
           var _1 = acc;
           if ((_1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var a$1 = _1.I;
-            var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.amw.Sf(pkg, nxt, a$1).aOA(), $thiz.dE);
+            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 r$5 = this$21.a1;
             if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-              var b$5 = r$5.I;
+              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));
               if ((b$5 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
                 var mapped = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
@@ -559,9 +559,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
                 }
                 var mapped = h;
               }
-              var $x_5 = a$1.bW();
+              var $x_5 = a$1.bX();
               var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
-              var f$1 = ((x$11$2$2) => x$11$2$2.D());
+              var f$1 = ((x$11$2$2) => x$11$2$2.C());
               if ((mapped === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
                 var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
               } else {
@@ -582,34 +582,34 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
             } 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.dE);
+            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 r$6 = this$25.a1;
             if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-              var b$6 = r$6.I;
+              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.be;
-              var dupes$1 = b$6.bn;
-              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$().aN(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.dE);
+              var mapped$1 = b$6.bk;
+              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 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.j1(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.j3(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.dE);
+        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 r$8 = this$33.a1;
         if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$8 = r$8.I;
-          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.qM, m$2$2$1)))).gx($j_java$002elang$002e$002dObject.$m_sci_Seq$().cR(b$8));
+          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 it = xs.o();
           while (it.f()) {
             var elem = it.e();
-            var key = elem.D();
-            m.co(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$39) => (() => this$39.dS()))(xs))).am(elem);
+            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 result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
           var mapIt = m.o();
@@ -618,15 +618,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
             if ((x1 === null)) {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
             }
-            var k = x1.D();
+            var k = x1.C();
             var v = x1.z();
-            result = result.cg(k, v.aq());
+            result = result.ch(k, v.aq());
           }
           var grouped = result;
-          var bad = grouped.eS(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$().bh)) : 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$().aN(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()))).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.dE);
+          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 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.I))) : r$9);
+          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 {
           return r$8;
         }
@@ -652,26 +652,26 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
   while (iterator.f()) {
     var x1 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O($thiz, pkg, iterator.e());
     if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-      var e = x1.ak;
+      var e = x1.aj;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.aA);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
     } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var v = x1.I;
+      var v = x1.H;
       good = good.gR(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.dE);
+  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 r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.I;
+    var b = r.H;
     var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
     var it = b.o();
     while (it.f()) {
       var elem = it.e();
-      var key = elem.D();
-      m.co(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
+      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 result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
     var mapIt = m.o();
@@ -680,37 +680,37 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
       if ((x1$1 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var k = x1$1.D();
+      var k = x1$1.C();
       var v$1 = x1$1.z();
-      result = result.cg(k, v$1.aq());
+      result = result.ch(k, v$1.aq());
     }
     var grouped = result;
-    var bad$1 = grouped.eS(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$().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$().aN(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()))).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.dE);
+    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 r$1 = this$22.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$1 = r$1.I;
-      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$16$2$2) => x$16$2$2.D())))))));
+      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())))))));
     } 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.dE);
+    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 r$2 = this$29.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$2 = r$2.I;
+      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.D();
+      var asMap = b$2.C();
       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$().avG(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aG0()), $thiz.dE);
+      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 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.I) : r$3);
+      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.cr;
-      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$().aN(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.ak, 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.cr), $thiz.dE);
+      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 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.I.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => asMap.y(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()))).aB()) : r$5);
     } else {
       return r$2;
     }
@@ -720,12 +720,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.wT();
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.a3O.a1s(rawDefn.iy.iz.kT(), defn, pkg, rawDefn.iy.iz.kR()), $thiz.dE);
+  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 r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.I;
-    var col = $thiz.lJ.aIf(defn.wT().iy.iz);
+    var b = r.H;
+    var col = $thiz.lJ.aIq(defn.x2().iB.iC);
     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,23 +735,23 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = $thiz.a3O.a1r(x0, defn, pkg, rawDefn.iy.iz.kR());
+      var x1 = $thiz.a3X.a1z(x0, defn, pkg, rawDefn.iB.iC.kR());
       if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-        var e = x1.ak;
+        var e = x1.aj;
         allGood = false;
-        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.aA);
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
       } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var v = x1.I;
+        var v = x1.H;
         good = good.gR(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.dE);
+    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 r$1 = this$13.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var $x_1 = r$1.I;
-      var x1$1 = b.c4;
+      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)));
     } else {
       return r$1;
@@ -762,12 +762,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.sy), 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.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();
 }
 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.qO), 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])).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());
   } 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 {
@@ -778,17 +778,17 @@ export { $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenS
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl(enquiries, translator, scopeSupport, componentParsers, types, evidence$1) {
   this.lJ = null;
-  this.amw = null;
-  this.a3O = null;
-  this.a3N = null;
-  this.amx = null;
-  this.dE = null;
+  this.amE = null;
+  this.a3X = null;
+  this.a3W = null;
+  this.amF = null;
+  this.dF = null;
   this.lJ = enquiries;
-  this.amw = translator;
-  this.a3O = scopeSupport;
-  this.a3N = componentParsers;
-  this.amx = types;
-  this.dE = evidence$1;
+  this.amE = translator;
+  this.a3X = scopeSupport;
+  this.a3W = componentParsers;
+  this.amF = types;
+  this.dF = 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,19 +798,19 @@ 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.aLO = (function(model) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a3N.aLA(model.nv), this.dE);
+$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);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.I;
-    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a3N.aLD(model.uC), this.dE);
+    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 r$1 = this$5.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$1 = r$1.I;
-      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.oX.oW, model.nv.uG), this.dE);
+      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 r$2 = this$8.a1;
       if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var b$2 = r$2.I;
+        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));
         if ((b$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var xs = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
@@ -832,8 +832,8 @@ $p.aLO = (function(model) {
         var it = xs.o();
         while (it.f()) {
           var elem = it.e();
-          var key = elem.D();
-          m.co(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
+          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 result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
         var mapIt = m.o();
@@ -842,80 +842,80 @@ $p.aLO = (function(model) {
           if ((x1 === null)) {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
           }
-          var k = x1.D();
+          var k = x1.C();
           var v = x1.z();
-          result = result.cg(k, v.aq());
+          result = result.ch(k, v.aq());
         }
         var grouped = result;
-        var bad = grouped.eS(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$().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$().aN(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()))).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.dE);
+        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 r$3 = this$20.a1;
         if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$3 = r$3.I;
-          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.HI(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 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))));
         } 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.dE);
+        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 r$4 = this$23.a1;
         if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$4 = r$4.I;
+          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.D();
+          var indexedDefs = b$4.C();
           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.bW().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.dE);
+          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 r$5 = this$26.a1;
           if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var b$5 = r$5.I;
+            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$().U1(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$().U8(predMatrix, indexedDefs.ba(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.D();
-                return predMatrix.iE.a6(k$1);
+                var k$1 = x0$1$2$2.C();
+                return predMatrix.iH.a6(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.bW().cf(graph.ax.bW()), $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.ax), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lJ.aNp(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.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)))))));
           } 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.dE);
+          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 r$6 = this$36.a1;
           if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var b$6 = r$6.I;
+            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.GL;
-            var excludedIds$1 = b$6.GM;
-            var shallowSchema$1 = b$6.GN;
-            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.dE);
+            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 r$7 = this$39.a1;
             if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-              var b$7 = r$7.I;
-              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.aJY(graph$1.ax), graph$1.ax.bW().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.y(id$2$2), deepSchema.y(id$2$2)))))(b$7))).fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
+              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)));
             } 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.dE);
+            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 r$8 = this$43.a1;
             if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-              var b$8 = r$8.I;
+              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.be;
-              var typeMeta$1 = b$8.bn;
-              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.dE);
+              var loops$1 = b$8.bk;
+              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 r$9 = this$46.a1;
               if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-                var b$9 = r$9.I;
-                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.dE);
+                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 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.I, roots$1.bW())) : r$10);
+                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);
               } else {
                 return r$9;
               }
@@ -938,16 +938,16 @@ $p.aLO = (function(model) {
     return r;
   }
 });
-$p.aze = (function(defs, defn, seen) {
-  var notYetSeen = this.lJ.a0r(defn).cf(seen);
-  seen.d1(defn.eP());
-  seen.ck(notYetSeen);
+$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.aze(defs, defs.y(id$2$2), seen);
+    this.azo(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", ({
-  xi: 1,
+  xm: 1,
   jc: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };