@7mind.io/baboon 0.0.168 → 0.0.171

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

@@ -1,5 +1,9 @@
 'use strict';
-import * as $j_$002dxa27c2ef07b189593e2727fd7f782e745a4935cef from "./-xa27c2ef07b189593e2727fd7f782e745a4935cef.js";
+import * as $j_$002dx1840e96914f4820edac28314054860416a7f2c2d from "./-x1840e96914f4820edac28314054860416a7f2c2d.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt from "./io.septimalmind.baboon.parser.model.-Raw-Adt.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto from "./io.septimalmind.baboon.parser.model.-Raw-Dto.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum from "./io.septimalmind.baboon.parser.model.-Raw-Enum.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign from "./io.septimalmind.baboon.parser.model.-Raw-Foreign.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$-W-Typer-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dBad$002dInheritance from "./io.septimalmind.baboon.parser.model.issues.-Typer-Issue$-Bad-Inheritance.js";
@@ -10,17 +14,25 @@ import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$00
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00241 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$1.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00242 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$2.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00243 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$3.js";
-import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$0024compute$002dRenames$00241 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$compute-Renames$1.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00244 from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$$anonfun$4.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$002dTyper$002dOutput from "./io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl$-Typer-Output.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder from "./io.septimalmind.baboon.typer.-Scope-Builder.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDeep$002dSchema$002dId from "./io.septimalmind.baboon.typer.model.-Deep-Schema-Id.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain from "./io.septimalmind.baboon.typer.model.-Domain.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin from "./io.septimalmind.baboon.typer.model.-Domain-Member$-Builtin.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser from "./io.septimalmind.baboon.typer.model.-Domain-Member$-User.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt from "./io.septimalmind.baboon.typer.model.-Owner$-Adt.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dNs from "./io.septimalmind.baboon.typer.model.-Owner$-Ns.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dToplevel$0024 from "./io.septimalmind.baboon.typer.model.-Owner$-Toplevel$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dMeta from "./io.septimalmind.baboon.typer.model.-Ref-Meta.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope from "./io.septimalmind.baboon.typer.model.-Scope$-Leaf-Scope.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dNested$002dScope from "./io.septimalmind.baboon.typer.model.-Scope$-Nested-Scope.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope from "./io.septimalmind.baboon.typer.model.-Scope$-Root-Scope.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName from "./io.septimalmind.baboon.typer.model.-Scope$-Scope-Name.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope from "./io.septimalmind.baboon.typer.model.-Scope$-Sub-Scope.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dUser from "./io.septimalmind.baboon.typer.model.-Type-Id$-User.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dMeta from "./io.septimalmind.baboon.typer.model.-Type-Meta.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName from "./io.septimalmind.baboon.typer.model.-Type-Name.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt from "./io.septimalmind.baboon.typer.model.-Typedef$-Adt.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dContract from "./io.septimalmind.baboon.typer.model.-Typedef$-Contract.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dDto from "./io.septimalmind.baboon.typer.model.-Typedef$-Dto.js";
@@ -50,30 +62,103 @@ 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$().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) => {
+  return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a2Z($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)).bj(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.F0.N(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))))))).a2b(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.p();
     while (it.f()) {
-      $thiz.aAF(defs, it.e(), seen);
+      $thiz.aBq(defs, it.e(), seen);
     }
-    return $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(seen);
+    return $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(seen);
   })))));
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O };
-function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map($thiz, pkg, defs) {
-  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__collect__s_PartialFunction__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(defs), new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$0024compute$002dRenames$00241.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$computeRenames$1($thiz)).be(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((td$2$2) => td$2$2.yB.bG(new $j_$002dxa27c2ef07b189593e2727fd7f782e745a4935cef.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$$nestedInanonfun$computeRenames$2$1($thiz, td$2$2, pkg))))).f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb);
+function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__O($thiz, pkg, flattened) {
+  var rest = flattened;
+  var h = null;
+  var t = null;
+  while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+    var x0 = rest.i();
+    var rawDefn = x0.qr().gb.gc;
+    var it = ((rawDefn instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dDto.$c_Lio_septimalmind_baboon_parser_model_RawDto) ? rawDefn.ya : ((rawDefn instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dEnum.$c_Lio_septimalmind_baboon_parser_model_RawEnum) ? rawDefn.DB : ((rawDefn instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt) ? rawDefn.Ds : ((rawDefn instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign.$c_Lio_septimalmind_baboon_parser_model_RawForeign) ? rawDefn.DF : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())))).bE(new $j_$002dx1840e96914f4820edac28314054860416a7f2c2d.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$$nestedInanonfun$computeRenames$10$1($thiz, x0, rawDefn)).p();
+    while (it.f()) {
+      var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      if ((t === null)) {
+        h = nx;
+      } else {
+        t.L = nx;
+      }
+      t = nx;
+    }
+    rest = rest.n();
+  }
+  var renameRefs = ((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h);
+  var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
+  var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
+  var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
+  var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
+  var iterator = renameRefs.p();
+  var good = init;
+  var allGood = true;
+  while (iterator.f()) {
+    var x0$1 = iterator.e();
+    if ((x0$1 === null)) {
+      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
+    }
+    var scope = x0$1.aS;
+    var rawDefn$1 = x0$1.b5;
+    var ref = x0$1.bd;
+    var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.O3.Jl(rawDefn$1.ka(), scope, pkg, rawDefn$1.k9()), $thiz.cE);
+    var r = this$9.a1;
+    if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+      var b = r.H;
+      var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((ref.yp.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b.bY) : $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__ownerForPrefix$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__Lio_septimalmind_baboon_typer_model_Pkg__O($thiz, ref.yp, scope, pkg)), $thiz.cE);
+      var r$1 = this$13.a1;
+      if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+        var b$1 = r$1.H;
+        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, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_TypeId$User(pkg, b$1, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName.$c_Lio_septimalmind_baboon_typer_model_TypeName(ref.DS.gs))));
+      } else {
+        var $x_1 = r$1;
+      }
+      var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.cE);
+      var r$2 = this$16.a1;
+      if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+        var b$2 = r$2.H;
+        if ((b$2 === null)) {
+          throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$2);
+        }
+        var x1 = 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$2.z()));
+      } else {
+        var x1 = r$2;
+      }
+    } else {
+      var x1 = r;
+    }
+    if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
+      var e = x1.ah;
+      allGood = false;
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
+    } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+      var v = x1.H;
+      good = good.gm(v);
+    } else {
+      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
+    }
+  }
+  var this$21 = 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.bf()))), $thiz.cE);
+  var r$3 = this$21.a1;
+  return ((r$3 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_Map$().ak(r$3.H)) : r$3);
 }
-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 };
+export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__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.lO.aEq(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.lX.aFa(defn$2$2))))), $thiz.cE);
   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.aiM(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.N(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.lX.ajr(defs, ref$2$2)))))).fj($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
   } 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.dn);
+  var this$10 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.cE);
   var r$1 = this$10.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -90,28 +175,28 @@ 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.p5(id);
+  var self = $thiz.lX.pc(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) + "]")]));
   } else {
-    var maybedef = defs.b2(id);
-    if ((!(!maybedef.m()))) {
+    var maybedef = defs.b1(id);
+    if ((!(!maybedef.l()))) {
       throw $j_java$002elang$002e$002dObject.$ct_jl_AssertionError__O__(new $j_java$002elang$002e$002dObject.$c_jl_AssertionError(), (("assertion failed: " + ("BUG: " + id)) + " not found"));
     }
-    var x1 = maybedef.a0();
+    var x1 = maybedef.Z();
     if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dBuiltin.$c_Lio_septimalmind_baboon_typer_model_DomainMember$Builtin)) {
       return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[builtin:" + self) + "]")]));
     } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-      var x1$2 = x1.a3;
+      var x1$2 = x1.a4;
       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.cS;
+        var this$10 = x1$2.cF;
         var rest = this$10;
         var h = null;
         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.bj));
+          var this$13 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lX.ul(x0.aY));
           var rest$1 = this$13;
           var h$1 = null;
           var t$1 = null;
@@ -129,7 +214,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(), ["}"]))).p();
+          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.bG.ca])).aZ(exploded).aZ($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)) {
@@ -142,15 +227,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           rest = rest.n();
         }
         var content = ((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h);
-        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[dto:" + self) + "]")])).aY(content).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[dto:" + self) + "]")])));
+        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[dto:" + self) + "]")])).aZ(content).aZ($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[dto:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dContract.$c_Lio_septimalmind_baboon_typer_model_Typedef$Contract)) {
-        var this$35 = x1$2.jJ;
+        var this$35 = x1$2.jM;
         var rest$2 = this$35;
         var h$2 = null;
         var t$2 = null;
         while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var x0$2 = rest$2.i();
-          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lO.xe(x0$2.bj));
+          var this$38 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lX.ul(x0$2.aY));
           var rest$3 = this$38;
           var h$3 = null;
           var t$3 = null;
@@ -168,7 +253,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(), ["}"]))).p();
+          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.bG.ca])).aZ(exploded$1).aZ($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)) {
@@ -181,16 +266,16 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           rest$2 = rest$2.n();
         }
         var content$2 = ((h$2 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$2);
-        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[contract:" + self) + "]")])).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) + "]")])));
+        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) + "]")])).aZ(content$2).aZ($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.ps;
+        var this$60 = x1$2.pA;
         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.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 tpes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x0$4.pz])).b6(x0$4.px).b6(x0$4.py);
+          var this$68 = tpes.bj(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((tpe$2$2) => $thiz.lX.ul(tpe$2$2)))).aC();
           var rest$5 = this$68;
           var h$5 = null;
           var t$5 = null;
@@ -208,7 +293,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.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();
+          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.rg])).aZ(exploded$2).aZ($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)) {
@@ -221,15 +306,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           rest$4 = rest$4.n();
         }
         var content$3 = ((h$4 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$4);
-        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[service:" + self) + "]")])).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) + "]")])));
+        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) + "]")])).aZ(content$3).aZ($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.NX;
+        var this$90 = x1$2.Oo;
         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.bj));
+          var this$93 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lX.ul(x0$6.aY));
           var rest$7 = this$93;
           var h$7 = null;
           var t$7 = null;
@@ -247,7 +332,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(), ["}"]))).p();
+          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.bG.ca])).aZ(exploded$3).aZ($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)) {
@@ -261,7 +346,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.go;
+        var this$109 = x1$2.fn;
         var rest$8 = this$109;
         var h$8 = null;
         var t$8 = null;
@@ -278,8 +363,8 @@ 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.po;
+        var $x_1 = $x_2.aZ(((h$8 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$8)).aZ($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.pw;
         var rest$9 = this$116;
         var h$9 = null;
         var t$9 = null;
@@ -296,22 +381,22 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           }
           rest$9 = rest$9.n();
         }
-        var branches = $x_1.aY(((h$9 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$9)).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"])));
-        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[adt:" + self) + "]")])).aY(content$4).aY(branches).aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[adt:" + self) + "]")])));
+        var branches = $x_1.aZ(((h$9 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$9)).aZ($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["}"])));
+        return $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[adt:" + self) + "]")])).aZ(content$4).aZ(branches).aZ($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("/[adt:" + self) + "]")])));
       } else if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dEnum.$c_Lio_septimalmind_baboon_typer_model_Typedef$Enum)) {
         var $x_5 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [(("[enum:" + self) + "]")]));
-        var this$ = x1$2.gp;
+        var this$ = x1$2.fF;
         var f = ((m$2$2) => {
-          var $x_3 = m$2$2.gJ;
-          var this$138 = m$2$2.yC;
-          if (this$138.m()) {
+          var $x_3 = m$2$2.f2;
+          var this$138 = m$2$2.yS;
+          if (this$138.l()) {
             var this$139 = $j_java$002elang$002e$002dObject.$m_s_None$();
           } else {
-            var x0$10 = this$138.a0();
+            var x0$10 = this$138.Z();
             var t$10 = $j_java$002elang$002e$002dObject.$uJ(x0$10);
-            var this$139 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_RTLong$().k7(t$10.g, t$10.j));
+            var this$139 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_RTLong$().kc(t$10.h, t$10.j));
           }
-          return (($x_3 + "/") + (this$139.m() ? "NoVal" : this$139.a0()));
+          return (($x_3 + "/") + (this$139.l() ? "NoVal" : this$139.Z()));
         });
         if ((this$ === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
@@ -329,9 +414,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
           }
           var $x_4 = h$10;
         }
-        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) + "]")])));
+        return $x_5.aZ($x_4).aZ($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.sQ.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.t2.N(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();
@@ -350,15 +435,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O($thiz, id, defs) {
-  var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaRepr__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__sci_List__sci_List($thiz, id, defs, $j_java$002elang$002e$002dObject.$m_sci_Nil$())), $thiz.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($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.cE);
   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.p5(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.lX.pc(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.dn);
+  var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.cE);
   var r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -375,10 +460,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchem
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDeepSchema__Lizumi_fundamentals_graphs_DG__O($thiz, graph) {
-  var col = graph.aw.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+  var col = graph.az.N(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.E();
-      var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deepSchemaOf__Lio_septimalmind_baboon_typer_model_TypeId__sci_Map__O($thiz, id, graph.aw), $thiz.dn);
+      var 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.az), $thiz.cE);
       var r = this$4.a1;
       return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, r.H)) : r);
     } else {
@@ -395,19 +480,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.aj;
+      var e = x0.ah;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
     } else if ((x0 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var v = x0.H;
-      good = good.gA(v);
+      good = good.gm(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.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.dn);
+  var 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.bf()))), $thiz.cE);
   var r$1 = this$14.a1;
-  return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.H.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : 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.fj($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)) : 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) {
@@ -423,7 +508,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.a10(defn));
+      var this$6 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($thiz.lX.a1D(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$();
@@ -455,7 +540,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
     }
     var nextDepMap = ((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h);
     var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
-    var f$1 = ((x$8$2$2) => x$8$2$2.z());
+    var f$1 = ((x$13$2$2) => x$13$2$2.z());
     if ((nextDepMap === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -472,11 +557,11 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       }
       var $x_2 = h$2;
     }
-    var nextDeps = $x_3.a4($x_2);
-    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 nextDeps = $x_3.a2($x_2);
+    var next = defs.xl(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$0024anonfun$00244.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$$anonfun$4($thiz, nextDeps));
+    var newPredecessors = predecessors.aZ(nextDepMap);
     var $x_5 = defs;
-    var f$2 = ((x$9$2$2) => x$9$2$2.E());
+    var f$2 = ((x$14$2$2) => x$14$2$2.E());
     if ((nextDepMap === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -493,9 +578,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDepe
       }
       var $x_4 = h$3;
     }
-    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$().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())))))))));
+    var todo = $x_5.a2G($x_4);
+    if (next.l()) {
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_izumi$002efundamentals$002ecollections$002e$002dIz$002dIter$002dOnce$002dMappings$0024.$m_Lizumi_fundamentals_collections_IzIterOnceMappings$().a2Z(newPredecessors).a2b(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$15$2$2) => $j_java$002elang$002e$002dObject.$m_sci_Set$().a2($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(x$15$2$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$16$2$2) => $j_scala$002e$002dOption$0024.$m_s_Option$().i3(x$16$2$2).fk())))))))));
     } else {
       defs = todo;
       current = next;
@@ -505,9 +590,9 @@ 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.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 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.aoJ.aoM.N(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.cE);
   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 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.cE))) : r), $thiz.cE);
   var r$1 = this$7.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -516,7 +601,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.aFR(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.aGC(pkg, members, meta), $thiz.cE);
     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;
@@ -524,7 +609,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
     } else {
       var $x_1 = r$2;
     }
-    var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
+    var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.cE);
     var r$3 = this$13.a1;
     if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$3 = r$3.H;
@@ -532,109 +617,116 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__runTyper_
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$3);
       }
       var flattened$1 = b$3.z();
-      var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O($thiz, pkg, flattened$1, meta), $thiz.dn);
+      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__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_List__O($thiz, pkg, flattened$1), $thiz.cE);
       var r$4 = this$16.a1;
       if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$4 = r$4.H;
-        var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
-        var i = b$4.p();
-        var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
-        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.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;
-              var f = ((m$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2.eV(), m$2$2));
-              if ((b$5 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var mapped = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
-              } else {
-                var x0 = b$5.i();
-                var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                var t = h;
-                var rest = b$5.n();
-                while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                  var x0$1 = rest.i();
-                  var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                  t.L = nx;
-                  t = nx;
-                  rest = rest.n();
+        var this$19 = 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.cE);
+        var r$5 = this$19.a1;
+        if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+          var b$5 = r$5.H;
+          var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
+          var i = b$5.p();
+          var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
+          while ((i.f() && acc.a1S())) {
+            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$24 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.aoI.Tu(pkg, nxt, a$1).aQN(), $thiz.cE);
+              var r$6 = this$24.a1;
+              if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+                var b$6 = r$6.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.eW(), m$2$2));
+                if ((b$6 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+                  var mapped = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
+                } else {
+                  var x0 = b$6.i();
+                  var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+                  var t = h;
+                  var rest = b$6.n();
+                  while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+                    var x0$1 = rest.i();
+                    var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+                    t.L = nx;
+                    t = nx;
+                    rest = rest.n();
+                  }
+                  var mapped = h;
                 }
-                var mapped = h;
-              }
-              var $x_5 = a$1.bP();
-              var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
-              var f$1 = ((x$12$2$2) => x$12$2$2.E());
-              if ((mapped === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
-              } else {
-                var x0$2 = mapped.i();
-                var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                var t$1 = h$1;
-                var rest$1 = mapped.n();
-                while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-                  var x0$3 = rest$1.i();
-                  var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
-                  t$1.L = nx$1;
-                  t$1 = nx$1;
-                  rest$1 = rest$1.n();
+                var $x_5 = a$1.bI();
+                var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Set$();
+                var f$1 = ((x$17$2$2) => x$17$2$2.E());
+                if ((mapped === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+                  var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
+                } else {
+                  var x0$2 = mapped.i();
+                  var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+                  var t$1 = h$1;
+                  var rest$1 = mapped.n();
+                  while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+                    var x0$3 = rest$1.i();
+                    var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+                    t$1.L = nx$1;
+                    t$1 = nx$1;
+                    rest$1 = rest$1.n();
+                  }
+                  var $x_3 = h$1;
                 }
-                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$6, mapped, $x_5.fe($x_4.a2($x_3))));
+              } else {
+                var $x_2 = r$6;
               }
-              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;
-            }
-            var this$25 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.dn);
-            var r$6 = this$25.a1;
-            if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-              var b$6 = r$6.H;
-              if ((b$6 === null)) {
-                throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
+              var this$28 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, $thiz.cE);
+              var r$7 = this$28.a1;
+              if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+                var b$7 = r$7.H;
+                if ((b$7 === null)) {
+                  throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$7);
+                }
+                var mapped$1 = b$7.b5;
+                var dupes$1 = b$7.bd;
+                var this$33 = 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$().aL(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.cE);
+                var r$8 = this$33.a1;
+                acc = ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(a$1.is(mapped$1)) : r$8);
+              } else {
+                acc = r$7;
               }
-              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;
-              acc = ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(a$1.j6(mapped$1)) : r$7);
-            } else {
-              acc = r$6;
             }
           }
-        }
-        var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.dn);
-        var r$8 = this$33.a1;
-        if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$8 = r$8.H;
-          var xs = initial.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2$1) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2$1.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.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.p();
-          while (mapIt.f()) {
-            var x1 = mapIt.e();
-            if ((x1 === null)) {
-              throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
+          var this$36 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.cE);
+          var r$9 = this$36.a1;
+          if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+            var b$9 = r$9.H;
+            var xs = initial.N(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.rd, m$2$2$1)))).gE($j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(b$9));
+            var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
+            var it = xs.p();
+            while (it.f()) {
+              var elem = it.e();
+              var key = elem.E();
+              m.cs(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$42) => (() => this$42.dY()))(xs))).am(elem);
+            }
+            var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
+            var mapIt = m.p();
+            while (mapIt.f()) {
+              var x1 = mapIt.e();
+              if ((x1 === null)) {
+                throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
+              }
+              var k = x1.E();
+              var v = x1.z();
+              result = result.ck(k, v.ao());
             }
-            var k = x1.E();
-            var v = x1.z();
-            result = result.ci(k, v.aq());
+            var grouped = result;
+            var bad = grouped.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a3() > 1))), false);
+            var this$49 = 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.fj($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$().aL(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$().ak(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.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.cE);
+            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$002e$002dBaboon$002dTyper$0024$002dBaboon$002dTyper$002dImpl$0024$002dTyper$002dOutput.$c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl$TyperOutput($thiz, $j_java$002elang$002e$002dObject.$m_sci_Nil$().A(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(r$10.H)), b$4)) : r$10);
+          } else {
+            return r$9;
           }
-          var grouped = result;
-          var bad = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-          var this$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueTypedefs($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.dn);
-          var r$9 = this$46.a1;
-          return ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(r$9.H))) : r$9);
         } else {
-          return r$8;
+          return r$5;
         }
       } else {
         return r$4;
@@ -658,28 +750,28 @@ 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.aj;
+      var e = x1.ah;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
     } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var v = x1.H;
-      good = good.gA(v);
+      good = good.gm(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.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.dn);
+  var 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.bf()))), $thiz.cE);
   var r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
     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);
+      m.cs(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 result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
     var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
@@ -688,19 +780,19 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__order__Li
       }
       var k = x1$1.E();
       var v$1 = x1$1.z();
-      result = result.ci(k, v$1.aq());
+      result = result.ck(k, v$1.ao());
     }
     var grouped = result;
-    var bad$1 = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-    var this$22 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(b)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dBad$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$BadInheritance($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.dn);
+    var bad$1 = grouped.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a3() > 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$().ak(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$().aL(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$().ak(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.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.cE);
     var r$1 = this$22.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
-      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b$1, $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyList$(), $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(b$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$17$2$2) => x$17$2$2.E())))))));
+      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$().ak(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$22$2$2) => x$22$2$2.E())))))));
     } else {
       var $x_1 = r$1;
     }
-    var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.dn);
+    var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.cE);
     var r$2 = this$29.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = r$2.H;
@@ -709,14 +801,14 @@ 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$().ax8(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aHs()), $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$().axS(predMatrix$1, $j_izumi$002efundamentals$002egraphs$002etools$002e$002dToposort$002dLoop$002dBreaker$0024.$m_Lizumi_fundamentals_graphs_tools_ToposortLoopBreaker$().aId()), $thiz.cE);
       var r$3 = this$33.a1;
       var r$4 = ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$3.H) : r$3);
       var this$36 = new $j_scala$002eutil$002e$002dEither$0024$002dLeft$002dProjection.$c_s_util_Either$LeftProjection(r$4);
-      var x1$2 = this$36.bX;
-      var this$38 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left) ? new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dCircular$002dInheritance.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$CircularInheritance(x1$2.aj, meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$()))) : this$36.bX), $thiz.dn);
+      var x1$2 = this$36.c0;
+      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$().aL(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.ah, 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.c0), $thiz.cE);
       var r$5 = this$38.a1;
-      return ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$5.H.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => asMap.x(id$2$2).z()))).aC()) : 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.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => asMap.w(id$2$2).z()))).aC()) : r$5);
     } else {
       return r$2;
     }
@@ -726,12 +818,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.xc();
-  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 rawDefn = defn.qr();
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.O3.Jl(rawDefn.gb.gc.ka(), defn, pkg, rawDefn.gb.gc.k9()), $thiz.cE);
   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.aJG(defn.xc().iD.iE);
+    var col = $thiz.lX.aKs(defn.qr().gb.gc);
     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$();
@@ -741,24 +833,24 @@ function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__deps__Lio
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = $thiz.a4G.a26(x0, defn, pkg, rawDefn.iD.iE.kW());
+      var x1 = $thiz.O3.a2J(x0, defn, pkg, rawDefn.gb.gc.k9());
       if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-        var e = x1.aj;
+        var e = x1.ah;
         allGood = false;
-        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
       } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var v = x1.H;
-        good = good.gA(v);
+        good = good.gm(v);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
       }
     }
-    var this$13 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.dn);
+    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.bf()))), $thiz.cE);
     var r$1 = this$13.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var $x_1 = r$1.H;
-      var x1$1 = b.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.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)));
+      var x1$1 = b.bY;
+      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.b6(((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$().a2($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [x1$1.fE])) : $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$())), defn)));
     } else {
       return r$1;
     }
@@ -768,12 +860,106 @@ 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.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();
+  return $j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(root.re), 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__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(s) {
+  if ((s instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope)) {
+    return new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(s, $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+  } else if ($j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dNested$002dScope.$is_Lio_septimalmind_baboon_typer_model_Scope$NestedScope(s)) {
+    return $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(s.qr().Jc(s)).aZ(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(s, $j_java$002elang$002e$002dObject.$m_sci_Nil$()));
+  } else {
+    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(s);
+  }
+}
+export { $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List as $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List };
+function $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(needles, scope) {
+  var head = needles.i().rf;
+  if ((scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope)) {
+    var headScope = scope.re.b1(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head));
+  } else if ((scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope)) {
+    var this$2 = new $j_java$002elang$002e$002dObject.$c_s_Some(scope);
+    var this$3 = ((this$2.l() || (this$2.af.vs === head)) ? this$2 : $j_java$002elang$002e$002dObject.$m_s_None$());
+    var headScope = (this$3.l() ? $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(needles, scope.pr.Jc(scope)) : this$3);
+  } else {
+    if ((!(scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope))) {
+      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(scope);
+    }
+    var this$4 = new $j_java$002elang$002e$002dObject.$c_s_Some(scope);
+    var this$5 = ((this$4.l() || (this$4.af.ps === head)) ? this$4 : $j_java$002elang$002e$002dObject.$m_s_None$());
+    var this$6 = (this$5.l() ? scope.pt.b1(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head)) : this$5);
+    var headScope = (this$6.l() ? $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(needles, scope.kq.Jc(scope)) : this$6);
+  }
+  var list = needles.n();
+  var x1$2 = (list.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list)));
+  if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
+    var value = x1$2.af.av;
+    return (headScope.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(value, headScope.Z()));
+  } else if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1$2)) {
+    return headScope;
+  } else {
+    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
+  }
+}
+export { $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option as $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option };
+function $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__ownerForPrefix$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__Lio_septimalmind_baboon_typer_model_Pkg__O($thiz, prefix, scope, pkg$1) {
+  var f = ((p$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(p$2$2.gs));
+  if ((prefix === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+    var list = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
+  } else {
+    var x0 = prefix.i();
+    var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+    var t = h;
+    var rest = prefix.n();
+    while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+      var x0$1 = rest.i();
+      var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      t.L = nx;
+      t = nx;
+      rest = rest.n();
+    }
+    var list = h;
+  }
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().dZ((!list.l()));
+  var x1 = $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__findScope$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(list, scope);
+  if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
+    var found = x1.af;
+    var x1$2 = found.qr().gb.gc;
+    if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) {
+      var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.O3.Jl(x1$2.y8, found, pkg$1, x1$2.r1), $thiz.cE);
+      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(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt(r.H)) : r);
+    } else {
+      var ns = $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(found).en(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));
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right((ns.l() ? $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dToplevel$0024.$m_Lio_septimalmind_baboon_typer_model_Owner$Toplevel$() : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dNs.$c_Lio_septimalmind_baboon_typer_model_Owner$Ns(ns)));
+    }
+  } else if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1)) {
+    var f$1 = ((p$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName.$c_Lio_septimalmind_baboon_typer_model_TypeName(p$2$2$1.gs));
+    if ((prefix === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+      var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
+    } else {
+      var x0$2 = prefix.i();
+      var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      var t$1 = h$1;
+      var rest$1 = prefix.n();
+      while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+        var x0$3 = rest$1.i();
+        var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        t$1.L = nx$1;
+        t$1 = nx$1;
+        rest$1 = rest$1.n();
+      }
+      var $x_1 = h$1;
+    }
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dNs.$c_Lio_septimalmind_baboon_typer_model_Owner$Ns($x_1));
+  } else {
+    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
+  }
+}
+export { $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__ownerForPrefix$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__Lio_septimalmind_baboon_typer_model_Pkg__O as $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__ownerForPrefix$1__sci_List__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__Lio_septimalmind_baboon_typer_model_Pkg__O };
 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.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());
+    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])).aZ($j_java$002elang$002e$002dObject.$f_sc_IterableOps__flatMap__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(current.pt), 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 {
@@ -783,18 +969,18 @@ function $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenS
 export { $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List as $ps_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__flattenScopes$1__Lio_septimalmind_baboon_typer_model_Scope$NestedScope__sci_List };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl(enquiries, translator, scopeSupport, componentParsers, types, evidence$1) {
-  this.lO = null;
-  this.ao0 = null;
-  this.a4G = null;
-  this.a4F = null;
-  this.ao1 = null;
-  this.dn = null;
-  this.lO = enquiries;
-  this.ao0 = translator;
-  this.a4G = scopeSupport;
-  this.a4F = componentParsers;
-  this.ao1 = types;
-  this.dn = evidence$1;
+  this.lX = null;
+  this.aoI = null;
+  this.O3 = null;
+  this.a5p = null;
+  this.aoJ = null;
+  this.cE = null;
+  this.lX = enquiries;
+  this.aoI = translator;
+  this.O3 = scopeSupport;
+  this.a5p = componentParsers;
+  this.aoJ = types;
+  this.cE = 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();
@@ -804,27 +990,40 @@ 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.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);
+$p.aO4 = (function(model) {
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a5p.aNQ(model.nN), this.cE);
   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.a4F.aN6(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.a5p.aNT(model.v0), this.cE);
     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.p9.p8, 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.pg.pf, model.nN.v4), this.cE);
       var r$2 = this$8.a1;
       if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$2 = r$2.H;
-        var f = ((d$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), d$2$2.eV(), d$2$2));
-        if ((b$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+        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, b$2.O4));
+      } else {
+        var $x_1 = r$2;
+      }
+      var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.cE);
+      var r$3 = this$11.a1;
+      if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+        var b$3 = r$3.H;
+        if ((b$3 === null)) {
+          throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$3);
+        }
+        var typed = b$3.E();
+        var defs$1 = b$3.z();
+        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.eW(), d$2$2));
+        if ((defs$1 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
           var xs = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
         } else {
-          var x0 = b$2.i();
+          var x0 = defs$1.i();
           var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
           var t = h;
-          var rest = b$2.n();
+          var rest = defs$1.n();
           while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
             var x0$1 = rest.i();
             var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
@@ -834,14 +1033,14 @@ $p.aNh = (function(model) {
           }
           var xs = h;
         }
-        var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+        var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
         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);
+          m.cs(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 result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
         var mapIt = m.p();
         while (mapIt.f()) {
           var x1 = mapIt.e();
@@ -850,104 +1049,104 @@ $p.aNh = (function(model) {
           }
           var k = x1.E();
           var v = x1.z();
-          result = result.ci(k, v.aq());
+          result = result.ck(k, v.ao());
         }
         var grouped = result;
-        var bad = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-        var this$20 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dDuplicated$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$DuplicatedTypedefs(model, $j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), this.dn);
-        var r$3 = this$20.a1;
-        if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$3 = r$3.H;
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b$3, b$3.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;
-        }
-        var this$23 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.dn);
+        var bad = grouped.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a3() > 1))), false);
+        var this$23 = 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$().ak(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$().aL(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$().ak(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.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), this.cE);
         var r$4 = this$23.a1;
         if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$4 = r$4.H;
-          if ((b$4 === null)) {
-            throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$4);
+          var $x_2 = 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$4, b$4.xl(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_2 = r$4;
+        }
+        var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, this.cE);
+        var r$5 = this$26.a1;
+        if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+          var b$5 = r$5.H;
+          if ((b$5 === null)) {
+            throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$5);
           }
-          var indexedDefs = b$4.E();
-          var roots$1 = b$4.z();
-          var this$26 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__buildDependencies__sci_Map__sci_Map__sci_List__O(this, indexedDefs, roots$1, roots$1.bP().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((t$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), t$2$2, $j_java$002elang$002e$002dObject.$m_s_None$())))).aC()), this.dn);
-          var r$5 = this$26.a1;
-          if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var b$5 = r$5.H;
-            var predMatrix = $j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdj$002dList$002dSyntax.$f_Lizumi_fundamentals_graphs_struct_AdjListSyntax__apply__sci_Map__O($j_izumi$002efundamentals$002egraphs$002estruct$002e$002dAdjacency$002dPred$002dList$0024.$m_Lizumi_fundamentals_graphs_struct_AdjacencyPredList$(), b$5);
-            var graph = $j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().UA(predMatrix, indexedDefs.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+          var indexedDefs = b$5.E();
+          var roots$1 = b$5.z();
+          var this$29 = 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.bI().N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((t$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), t$2$2, $j_java$002elang$002e$002dObject.$m_s_None$())))).aC()), this.cE);
+          var r$6 = this$29.a1;
+          if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+            var b$6 = r$6.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$6);
+            var graph = $j_izumi$002efundamentals$002egraphs$002e$002dD$002dG$0024.$m_Lizumi_fundamentals_graphs_DG$().Vb(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);
+                return predMatrix.iL.a5(k$1);
               } else {
                 throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
               }
             }))));
-            var $x_2 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple5.$c_T5(b$5, predMatrix, graph, indexedDefs.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)))))));
+            var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple5.$c_T5(b$6, predMatrix, graph, indexedDefs.bI().bF(graph.az.bI()), $j_java$002elang$002e$002dObject.$m_sci_Map$().ak(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.az), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => this.lX.aPE(defn$2$2)))))));
           } else {
-            var $x_2 = r$5;
+            var $x_3 = r$6;
           }
-          var this$36 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_2, this.dn);
-          var r$6 = this$36.a1;
-          if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var b$6 = r$6.H;
-            if ((b$6 === null)) {
-              throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$6);
-            }
-            var graph$1 = b$6.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.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;
+          var this$39 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, this.cE);
+          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;
+            if ((b$7 === null)) {
+              throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$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.dn);
-            var r$8 = this$43.a1;
+            var graph$1 = b$7.HK;
+            var excludedIds$1 = b$7.HL;
+            var shallowSchema$1 = b$7.HM;
+            var this$42 = 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.cE);
+            var r$8 = this$42.a1;
             if ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$8 = r$8.H;
-              if ((b$8 === null)) {
-                throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$8);
+              var $x_4 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b$8, this.lX.aMe(graph$1.az), graph$1.az.bI().N(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.w(id$2$2), deepSchema.w(id$2$2)))))(b$8))).fj($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
+            } else {
+              var $x_4 = r$8;
+            }
+            var this$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_4, this.cE);
+            var r$9 = this$46.a1;
+            if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+              var b$9 = r$9.H;
+              if ((b$9 === null)) {
+                throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$9);
               }
-              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;
-              if ((r$9 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-                var b$9 = r$9.H;
-                var this$49 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeDerivations__sci_Map__O(this, graph$1.aw), this.dn);
-                var r$10 = this$49.a1;
-                var this$52 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), r$10.H, $p_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl__computeRenames__Lio_septimalmind_baboon_typer_model_Pkg__sci_Map__sci_Map(this, b, graph$1.aw))) : r$10), this.dn);
+              var loops$1 = b$9.b5;
+              var typeMeta$1 = b$9.bd;
+              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__makeRefMeta__sci_Map__O(this, graph$1.az), this.cE);
+              var r$10 = this$49.a1;
+              if ((r$10 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+                var b$10 = r$10.H;
+                var this$52 = 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.az), this.cE);
                 var r$11 = this$52.a1;
-                if ((r$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-                  var b$11 = r$11.H;
-                  if ((b$11 === null)) {
-                    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$11);
+                var this$55 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(((r$11 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), r$11.H, typed.O5)) : r$11), this.cE);
+                var r$12 = this$55.a1;
+                if ((r$12 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+                  var b$12 = r$12.H;
+                  if ((b$12 === null)) {
+                    throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$12);
                   }
-                  var derivations = b$11.E();
-                  var renames$1 = b$11.z();
-                  return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain.$c_Lio_septimalmind_baboon_typer_model_Domain(b, b$1, graph$1, excludedIds$1, typeMeta$1, loops$1, b$9, derivations, roots$1.bP(), renames$1));
+                  var derivations = b$12.E();
+                  var renames$1 = b$12.z();
+                  return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain.$c_Lio_septimalmind_baboon_typer_model_Domain(b, b$1, graph$1, excludedIds$1, typeMeta$1, loops$1, b$10, derivations, roots$1.bI(), renames$1));
                 } else {
-                  return r$11;
+                  return r$12;
                 }
               } else {
-                return r$9;
+                return r$10;
               }
             } else {
-              return r$8;
+              return r$9;
             }
           } else {
-            return r$6;
+            return r$7;
           }
         } else {
-          return r$4;
+          return r$5;
         }
       } else {
-        return r$2;
+        return r$3;
       }
     } else {
       return r$1;
@@ -956,17 +1155,17 @@ $p.aNh = (function(model) {
     return r;
   }
 });
-$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.aAF(defs, defs.x(id$2$2), seen);
+$p.aBq = (function(defs, defn, seen) {
+  var notYetSeen = this.lX.a1D(defn).bF(seen);
+  seen.d7(defn.eW());
+  seen.cf(notYetSeen);
+  notYetSeen.bK(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
+    this.aBq(defs, defs.w(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", ({
-  xv: 1,
-  jj: 1
+  xK: 1,
+  jm: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl as $d_Lio_septimalmind_baboon_typer_BaboonTyper$BaboonTyperImpl };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Baboon-Typer$-Baboon-Typer-Impl.js.map