@7mind.io/baboon 0.0.167 → 0.0.168

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

@@ -19,7 +19,7 @@ $p.ej = (function(x1, default$1) {
     var k = x1.E();
     var v = x1.z();
     if ((v instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-      if (v.sH) {
+      if (v.sI) {
         return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k, v);
       }
     }
@@ -30,7 +30,7 @@ $p.el = (function(x1) {
   if ((x1 !== null)) {
     var v = x1.z();
     if ((v instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-      if (v.sH) {
+      if (v.sI) {
         return true;
       }
     }

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

@@ -4,8 +4,8 @@ import * as $j_scala$002eruntime$002e$002dAbstract$002dPartial$002dFunction from
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3(outer, nextDeps$1) {
-  this.a4K = null;
-  this.a4K = nextDeps$1;
+  this.a4I = null;
+  this.a4I = nextDeps$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3 as $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3 };
 $p = $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3.prototype = new $j_scala$002eruntime$002e$002dAbstract$002dPartial$002dFunction.$h_sr_AbstractPartialFunction();
@@ -19,7 +19,7 @@ $p.ej = (function(x1, default$1) {
   if ((x1 !== null)) {
     var k = x1.E();
     var v = x1.z();
-    if (this.a4K.a5(new $j_java$002elang$002e$002dObject.$c_s_Some(k))) {
+    if (this.a4I.a5(new $j_java$002elang$002e$002dObject.$c_s_Some(k))) {
       return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), k, v);
     }
   }
@@ -28,7 +28,7 @@ $p.ej = (function(x1, default$1) {
 $p.el = (function(x1) {
   if ((x1 !== null)) {
     var k = x1.E();
-    if (this.a4K.a5(new $j_java$002elang$002e$002dObject.$c_s_Some(k))) {
+    if (this.a4I.a5(new $j_java$002elang$002e$002dObject.$c_s_Some(k))) {
       return true;
     }
   }

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

@@ -50,11 +50,11 @@ 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$().a2p($j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$2($thiz)).be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.yB.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td) => ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2, td)))(td$2$2))))))).a1A(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((roots$2$2) => {
+  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$().a2n($j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$2($thiz)).be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.yB.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td) => ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2, td)))(td$2$2))))))).a1y(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();
+    var it = roots$2$2.p();
     while (it.f()) {
-      $thiz.aAM(defs, it.e(), seen);
+      $thiz.aAF(defs, it.e(), seen);
     }
     return $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(seen);
   })))));
@@ -65,11 +65,11 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRe
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__makeRefMeta__sci_Map__O($thiz, defs) {
-  var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $thiz.lO.aEx(defn$2$2))))), $thiz.dn);
+  var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $thiz.lO.aEq(defn$2$2))))), $thiz.dn);
   var r = this$5.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), ref$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dMeta.$c_Lio_septimalmind_baboon_typer_model_RefMeta($thiz.lO.aiP(defs, ref$2$2)))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), ref$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dMeta.$c_Lio_septimalmind_baboon_typer_model_RefMeta($thiz.lO.aiM(defs, ref$2$2)))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
   } else {
     var $x_1 = r;
   }
@@ -90,7 +90,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.lO.p4(id);
+  var self = $thiz.lO.p5(id);
   var nseen = $j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedSeqOps__appended__O__O(seen, id);
   if (seen.a5(id)) {
     return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[recursive:" + self) + "]")]));
@@ -111,12 +111,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         var t = null;
         while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var x0 = rest.i();
-          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0.bi));
+          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0.bj));
           var rest$1 = this$13;
           var h$1 = null;
           var t$1 = null;
           while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$1.i(), defs, nseen).o();
+            var it = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$1.i(), defs, nseen).p();
             while (it.f()) {
               var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
               if ((t$1 === null)) {
@@ -129,7 +129,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.cg.cK])).aY(exploded).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).o();
+          var it$1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["{", x0.cg.cK])).aY(exploded).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).p();
           while (it$1.f()) {
             var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$1.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t === null)) {
@@ -150,12 +150,12 @@ 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.i();
-          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$2.bi));
+          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$2.bj));
           var rest$3 = this$38;
           var h$3 = null;
           var t$3 = null;
           while ((rest$3 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$2 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$3.i(), defs, nseen).o();
+            var it$2 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$3.i(), defs, nseen).p();
             while (it$2.f()) {
               var nx$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$2.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
               if ((t$3 === null)) {
@@ -168,7 +168,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.cg.cK])).aY(exploded$1).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).o();
+          var it$3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["{", x0$2.cg.cK])).aY(exploded$1).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).p();
           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)) {
@@ -183,19 +183,19 @@ 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) + "]")])).aY(content$2).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[contract:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dService.$c_Lio_septimalmind_baboon_typer_model_Typedef$Service)) {
-        var this$60 = x1$2.pr;
+        var this$60 = x1$2.ps;
         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.i();
-          var tpes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x0$4.pq])).b7(x0$4.po).b7(x0$4.pp);
+          var tpes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x0$4.pr])).b8(x0$4.pp).b8(x0$4.pq);
           var this$68 = tpes.be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((tpe$2$2) => $thiz.lO.xe(tpe$2$2)))).aC();
           var rest$5 = this$68;
           var h$5 = null;
           var t$5 = null;
           while ((rest$5 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$4 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$5.i(), defs, nseen).o();
+            var it$4 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$5.i(), defs, nseen).p();
             while (it$4.f()) {
               var nx$4 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$4.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
               if ((t$5 === null)) {
@@ -208,7 +208,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.r1])).aY(exploded$2).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).o();
+          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.r2])).aY(exploded$2).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).p();
           while (it$5.f()) {
             var nx$5 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$5.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$4 === null)) {
@@ -223,18 +223,18 @@ 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) + "]")])).aY(content$3).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[service:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt)) {
-        var this$90 = x1$2.NY;
+        var this$90 = x1$2.NX;
         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.i();
-          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$6.bi));
+          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$6.bj));
           var rest$7 = this$93;
           var h$7 = null;
           var t$7 = null;
           while ((rest$7 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-            var it$6 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$7.i(), defs, nseen).o();
+            var it$6 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$7.i(), defs, nseen).p();
             while (it$6.f()) {
               var nx$6 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$6.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
               if ((t$7 === null)) {
@@ -247,7 +247,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.cg.cK])).aY(exploded$3).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).o();
+          var it$7 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["{", x0$6.cg.cK])).aY(exploded$3).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"]))).p();
           while (it$7.f()) {
             var nx$7 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$7.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$6 === null)) {
@@ -266,7 +266,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         var h$8 = null;
         var t$8 = null;
         while ((rest$8 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var it$8 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$8.i(), defs, nseen).o();
+          var it$8 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$8.i(), defs, nseen).p();
           while (it$8.f()) {
             var nx$8 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$8.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$8 === null)) {
@@ -279,12 +279,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           rest$8 = rest$8.n();
         }
         var $x_1 = $x_2.aY(((h$8 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$8)).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}", "{", "contracts"])));
-        var this$116 = x1$2.pn;
+        var this$116 = x1$2.po;
         var rest$9 = this$116;
         var h$9 = null;
         var t$9 = null;
         while ((rest$9 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var it$9 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$9.i(), defs, nseen).o();
+          var it$9 = $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, rest$9.i(), defs, nseen).p();
           while (it$9.f()) {
             var nx$9 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$9.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
             if ((t$9 === null)) {
@@ -331,7 +331,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
         }
         return $x_5.aY($x_4).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[enum:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dForeign.$c_Lio_septimalmind_baboon_typer_model_Typedef$Foreign)) {
-        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(((("[foreign:" + self) + ":") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(x1$2.sP.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.sQ.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.E();
             var v = x0$1$2$2.z();
@@ -354,7 +354,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
   var r = this$4.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, (((("[" + $thiz.lO.p4(id)) + ";") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(b, "", ",", "")) + "]")));
+    var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, (((("[" + $thiz.lO.p5(id)) + ";") + $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(b, "", ",", "")) + "]")));
   } else {
     var $x_1 = r;
   }
@@ -389,7 +389,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDe
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -423,7 +423,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       }
       var id = x0.E();
       var defn = x0.z();
-      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.a12(defn));
+      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.a10(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$();
@@ -441,7 +441,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
         }
         var $x_1 = h$1;
       }
-      var it = $x_1.o();
+      var it = $x_1.p();
       while (it.f()) {
         var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
         if ((t === null)) {
@@ -473,7 +473,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       var $x_2 = h$2;
     }
     var nextDeps = $x_3.a4($x_2);
-    var next = defs.Im(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3($thiz, nextDeps));
+    var next = defs.Il(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$3($thiz, nextDeps));
     var newPredecessors = predecessors.aY(nextDepMap);
     var $x_5 = defs;
     var f$2 = ((x$9$2$2) => x$9$2$2.E());
@@ -493,9 +493,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       }
       var $x_4 = h$3;
     }
-    var todo = $x_5.a25($x_4);
+    var todo = $x_5.a23($x_4);
     if (next.m()) {
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a2p(newPredecessors).a1A(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$10$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(x$10$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$11$2$2) => $j_scala$002e$002dOption$0024.$m_s_Option$().i1(x$11$2$2).fh())))))))));
+      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$().a2n(newPredecessors).a1y(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$10$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(x$10$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$11$2$2) => $j_scala$002e$002dOption$0024.$m_s_Option$().i1(x$11$2$2).fi())))))))));
     } else {
       defs = todo;
       current = next;
@@ -505,7 +505,7 @@ 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.ao4.ao6.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin(id$2$2))))), $thiz.dn);
+  var 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.ao1.ao3.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin(id$2$2))))), $thiz.dn);
   var r = this$4.a1;
   var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), r.H, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder.$c_Lio_septimalmind_baboon_typer_ScopeBuilder($thiz.dn))) : r), $thiz.dn);
   var r$1 = this$7.a1;
@@ -516,7 +516,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
     }
     var initial = b$1.E();
     var builder$1 = b$1.z();
-    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(builder$1.aFY(pkg, members, meta), $thiz.dn);
+    var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(builder$1.aFR(pkg, members, meta), $thiz.dn);
     var r$2 = this$10.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = r$2.H;
@@ -537,14 +537,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
       if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$4 = r$4.H;
         var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
-        var i = b$4.o();
+        var i = b$4.p();
         var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
-        while ((i.f() && acc.a1h())) {
+        while ((i.f() && acc.a1f())) {
           var nxt = i.e();
           var _1 = acc;
           if ((_1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var a$1 = _1.H;
-            var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.ao3.SX(pkg, nxt, a$1).aQ7(), $thiz.dn);
+            var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.ao0.SV(pkg, nxt, a$1).aQ0(), $thiz.dn);
             var r$5 = this$21.a1;
             if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$5 = r$5.H;
@@ -584,7 +584,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
                 }
                 var $x_3 = h$1;
               }
-              var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$5, mapped, $x_5.fc($x_4.a4($x_3))));
+              var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$5, mapped, $x_5.fd($x_4.a4($x_3))));
             } else {
               var $x_2 = r$5;
             }
@@ -595,7 +595,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
               if ((b$6 === null)) {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
               }
-              var mapped$1 = b$6.bj;
+              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.m()) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dDuplicated$002dTypes.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypes(dupes$1, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : new $j_java$002elang$002e$002dObject.$c_s_util_Right((void 0))), $thiz.dn);
               var r$7 = this$30.a1;
@@ -609,16 +609,16 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
         var r$8 = this$33.a1;
         if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$8 = r$8.H;
-          var xs = initial.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2$1) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2$1.qY, m$2$2$1)))).gz($j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(b$8));
+          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.qZ, m$2$2$1)))).gz($j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(b$8));
           var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-          var it = xs.o();
+          var it = xs.p();
           while (it.f()) {
             var elem = it.e();
             var key = elem.E();
             m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$39) => (() => this$39.dU()))(xs))).am(elem);
           }
           var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-          var mapIt = m.o();
+          var mapIt = m.p();
           while (mapIt.f()) {
             var x1 = mapIt.e();
             if ((x1 === null)) {
@@ -652,7 +652,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = flattened.o();
+  var iterator = flattened.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -673,14 +673,14 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
     var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-    var it = b.o();
+    var it = b.p();
     while (it.f()) {
       var elem = it.e();
       var key = elem.E();
       m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
     }
     var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-    var mapIt = m.o();
+    var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
@@ -709,7 +709,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
       }
       var asMap = b$2.E();
       var predMatrix$1 = b$2.z();
-      var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$0024.$m_Lizumi_fundamentals_graphs_tools_Toposort$().axe(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aHz()), $thiz.dn);
+      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$().ax8(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aHs()), $thiz.dn);
       var r$3 = this$33.a1;
       var r$4 = ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$3.H) : r$3);
       var this$36 = new $j_scala$002eutil$002e$002dEither$0024$002dLeft$002dProjection.$c_s_util_Either$LeftProjection(r$4);
@@ -727,21 +727,21 @@ 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.xc();
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.a4I.a29(rawDefn.iD.iE.kY(), defn, pkg, rawDefn.iD.iE.kW()), $thiz.dn);
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.a4G.a27(rawDefn.iD.iE.kY(), defn, pkg, rawDefn.iD.iE.kW()), $thiz.dn);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var col = $thiz.lO.aJN(defn.xc().iD.iE);
+    var col = $thiz.lO.aJG(defn.xc().iD.iE);
     var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Set$());
     var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-    var iterator = col.o();
+    var iterator = col.p();
     var good = init;
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = $thiz.a4I.a28(x0, defn, pkg, rawDefn.iD.iE.kW());
+      var x1 = $thiz.a4G.a26(x0, defn, pkg, rawDefn.iD.iE.kW());
       if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
         var e = x1.aj;
         allGood = false;
@@ -758,7 +758,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var $x_1 = r$1.H;
       var x1$1 = b.c8;
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), $x_1.b7(((x1$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt) ? $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x1$1.fA])) : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())), defn)));
+      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.b8(((x1$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt) ? $j_java$002elang$002e$002dObject.$m_sci_Set$().a4($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x1$1.fB])) : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())), defn)));
     } else {
       return r$1;
     }
@@ -768,12 +768,12 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio_septimalmind_baboon_typer_model_Pkg__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List($thiz, root) {
-  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(root.sJ), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(defn$2$2)))).aC();
+  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(root.sK), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(defn$2$2)))).aC();
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes__Lio_septimalmind_baboon_typer_model_Scope$RootScope__sci_List };
 function $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(current) {
   if ((current instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope)) {
-    return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [current])).aY($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(current.r0), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(n$2$2)))).aC());
+    return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [current])).aY($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(current.r1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((n$2$2) => $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List(n$2$2)))).aC());
   } else if ((current instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope)) {
     return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [current]));
   } else {
@@ -784,16 +784,16 @@ 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.lO = null;
-  this.ao3 = null;
-  this.a4I = null;
-  this.a4H = null;
-  this.ao4 = null;
+  this.ao0 = null;
+  this.a4G = null;
+  this.a4F = null;
+  this.ao1 = null;
   this.dn = null;
   this.lO = enquiries;
-  this.ao3 = translator;
-  this.a4I = scopeSupport;
-  this.a4H = componentParsers;
-  this.ao4 = types;
+  this.ao0 = translator;
+  this.a4G = scopeSupport;
+  this.a4F = componentParsers;
+  this.ao1 = types;
   this.dn = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };
@@ -804,16 +804,16 @@ 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.aNo = (function(model) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4H.aNa(model.nG), this.dn);
+$p.aNh = (function(model) {
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4F.aN3(model.nG), this.dn);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4H.aNd(model.uP), this.dn);
+    var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a4F.aN6(model.uP), this.dn);
     var r$1 = this$5.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
-      var this$8 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper__Lio_septimalmind_baboon_typer_model_Pkg__sci_Seq__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O(this, b, model.p8.p7, model.nG.uT), this.dn);
+      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.p9.p8, model.nG.uT), this.dn);
       var r$2 = this$8.a1;
       if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$2 = r$2.H;
@@ -835,14 +835,14 @@ $p.aNo = (function(model) {
           var xs = h;
         }
         var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-        var it = xs.o();
+        var it = xs.p();
         while (it.f()) {
           var elem = it.e();
           var key = elem.E();
           m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
         }
         var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-        var mapIt = m.o();
+        var mapIt = m.p();
         while (mapIt.f()) {
           var x1 = mapIt.e();
           if ((x1 === null)) {
@@ -858,7 +858,7 @@ $p.aNo = (function(model) {
         var r$3 = this$20.a1;
         if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$3 = r$3.H;
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b$3, b$3.Im(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$1(this))));
+          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.Il(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;
         }
@@ -876,7 +876,7 @@ $p.aNo = (function(model) {
           if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$5 = r$5.H;
             var predMatrix = $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dPred$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyPredList$(), b$5);
-            var graph = $j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().UD(predMatrix, indexedDefs.b8(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$().UA(predMatrix, indexedDefs.b7(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.E();
                 return predMatrix.iJ.a5(k$1);
@@ -884,7 +884,7 @@ $p.aNo = (function(model) {
                 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.bP().c1(graph.aw.bP()), $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(graph.aw), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lO.aOY(defn$2$2)))))));
+            var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple5.$c_T5(b$5, predMatrix, graph, indexedDefs.bP().c1(graph.aw.bP()), $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(graph.aw), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lO.aOR(defn$2$2)))))));
           } else {
             var $x_2 = r$5;
           }
@@ -895,14 +895,14 @@ $p.aNo = (function(model) {
             if ((b$6 === null)) {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
             }
-            var graph$1 = b$6.Hp;
-            var excludedIds$1 = b$6.Hq;
-            var shallowSchema$1 = b$6.Hr;
+            var graph$1 = b$6.Ho;
+            var excludedIds$1 = b$6.Hp;
+            var shallowSchema$1 = b$6.Hq;
             var this$39 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O(this, graph$1), this.dn);
             var r$7 = this$39.a1;
             if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$7 = r$7.H;
-              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$7, this.lO.aLy(graph$1.aw), graph$1.aw.bP().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((deepSchema) => ((id$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dMeta.$c_Lio_septimalmind_baboon_typer_model_TypeMeta(shallowSchema$1.x(id$2$2), deepSchema.x(id$2$2)))))(b$7))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$7, this.lO.aLr(graph$1.aw), graph$1.aw.bP().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((deepSchema) => ((id$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dMeta.$c_Lio_septimalmind_baboon_typer_model_TypeMeta(shallowSchema$1.x(id$2$2), deepSchema.x(id$2$2)))))(b$7))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
             } else {
               var $x_3 = r$7;
             }
@@ -913,7 +913,7 @@ $p.aNo = (function(model) {
               if ((b$8 === null)) {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$8);
               }
-              var loops$1 = b$8.bj;
+              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.aw), this.dn);
               var r$9 = this$46.a1;
@@ -956,12 +956,12 @@ $p.aNo = (function(model) {
     return r;
   }
 });
-$p.aAM = (function(defs, defn, seen) {
-  var notYetSeen = this.lO.a12(defn).c1(seen);
+$p.aAF = (function(defs, defn, seen) {
+  var notYetSeen = this.lO.a10(defn).c1(seen);
   seen.d5(defn.eV());
   seen.cn(notYetSeen);
   notYetSeen.bH(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
-    this.aAM(defs, defs.x(id$2$2), seen);
+    this.aAF(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", ({