@7mind.io/baboon 0.0.167 → 0.0.171

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

@@ -3,11 +3,14 @@ import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$00
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$-W-Evolution-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dBroken$002dComparison from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Broken-Comparison.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dIncomparable$002dTypedefs from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Incomparable-Typedefs.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dInvalid$002dEnum$002dMember$002dRename from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Invalid-Enum-Member-Rename.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dInvalid$002dField$002dRename from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Invalid-Field-Rename.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dMismatching$002dTypedefs from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Mismatching-Typedefs.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiff from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Non-Unique-Diff.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiffs from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Non-Unique-Diffs.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dPrev$002dVersions from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Non-Unique-Prev-Versions.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dRuleset from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Non-Unique-Ruleset.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$0024anonfun$00241 from "./io.septimalmind.baboon.typer.-Baboon-Comparator$-Baboon-Comparator-Impl$$anonfun$1.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut from "./io.septimalmind.baboon.typer.-Baboon-Comparator$-Baboon-Comparator-Impl$-Unmodified-Since-Mut.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dAdd$002dBranch from "./io.septimalmind.baboon.typer.model.-Adt-Op$-Add-Branch.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch from "./io.septimalmind.baboon.typer.model.-Adt-Op$-Keep-Branch.js";
@@ -20,6 +23,7 @@ import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$0
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dChange$002dField from "./io.septimalmind.baboon.typer.model.-Dto-Op$-Change-Field.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dKeep$002dField from "./io.septimalmind.baboon.typer.model.-Dto-Op$-Keep-Field.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dRemove$002dField from "./io.septimalmind.baboon.typer.model.-Dto-Op$-Remove-Field.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dRename$002dField from "./io.septimalmind.baboon.typer.model.-Dto-Op$-Rename-Field.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dAdd$002dBranch from "./io.septimalmind.baboon.typer.model.-Enum-Op$-Add-Branch.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dKeep$002dBranch from "./io.septimalmind.baboon.typer.model.-Enum-Op$-Keep-Branch.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dRemove$002dBranch from "./io.septimalmind.baboon.typer.model.-Enum-Op$-Remove-Branch.js";
@@ -51,9 +55,9 @@ import * as $j_scala$002ecollection$002eimmutable$002e$002dQueue from "./scala.c
 var $p;
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__computeMinVersions__sci_Map__sci_Map__sci_Map__sci_Seq__O($thiz, domainVersions, diffs, previousVersions, versions) {
   var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
-  var i = versions.o();
+  var i = versions.p();
   var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
-  while ((i.f() && acc.a1h())) {
+  while ((i.f() && acc.a1S())) {
     var nxt = i.e();
     var _1 = acc;
     if ((_1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
@@ -61,13 +65,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       acc = $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__minVersionsDiff__sci_Map__sci_Map__sci_Map__sci_Map__Lio_septimalmind_baboon_typer_model_Version__O($thiz, domainVersions, diffs, previousVersions, a, nxt);
     }
   }
-  var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.kj);
+  var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.jk);
   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(r.H.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+  return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r.H.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
     if ((x0$2$2$2 !== null)) {
-      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$2$2$2.E(), x0$2$2$2.z().hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
+      return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$2$2$2.E(), x0$2$2$2.z().hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
         if ((x0$3$2$2 !== null)) {
-          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$3$2$2.E(), x0$3$2$2.z().aIT());
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$3$2$2.E(), x0$3$2$2.z().aJy());
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
         }
@@ -79,32 +83,32 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__computeMinVersions__sci_Map__sci_Map__sci_Map__sci_Seq__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__computeMinVersions__sci_Map__sci_Map__sci_Map__sci_Seq__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__minVersionsDiff__sci_Map__sci_Map__sci_Map__sci_Map__Lio_septimalmind_baboon_typer_model_Version__O($thiz, domainVersions, diffs, previousVersions, minVersions, currVersion) {
-  var x1 = previousVersions.b2(currVersion);
+  var x1 = previousVersions.b1(currVersion);
   if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
     var prevVersion = x1.af;
     var step = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep.$c_Lio_septimalmind_baboon_typer_model_EvolutionStep(prevVersion, currVersion);
-    var diff = diffs.x(step);
-    var unmodified = diff.mI.v8;
-    var update = domainVersions.x(currVersion).b5.aw.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+    var diff = diffs.w(step);
+    var unmodified = diff.lZ.vj;
+    var update = domainVersions.w(currVersion).ba.az.hw(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();
         if (unmodified.a5(id)) {
-          var prevrecord = minVersions.x(prevVersion).x(id);
-          prevrecord.ys.md(currVersion);
-          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id, currVersion, prevrecord.ys));
+          var prevrecord = minVersions.w(prevVersion).w(id);
+          prevrecord.yF.mo(currVersion);
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id, currVersion, prevrecord.yF));
         } else {
-          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id, currVersion, $j_java$002elang$002e$002dObject.$m_scm_ArrayBuffer$().IB($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [currVersion]))));
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id, currVersion, $j_java$002elang$002e$002dObject.$m_scm_ArrayBuffer$().IV($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [currVersion]))));
         }
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
       }
     })));
-    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(minVersions.hv(currVersion, update));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(minVersions.hz(currVersion, update));
   } else if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1)) {
-    return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [$j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), currVersion, domainVersions.x(currVersion).b5.aw.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [$j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), currVersion, domainVersions.w(currVersion).ba.az.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
       if ((x0$2$2$2 !== null)) {
         var id$1 = x0$2$2$2.E();
-        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$1, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id$1, currVersion, $j_java$002elang$002e$002dObject.$m_scm_ArrayBuffer$().IB($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [currVersion]))));
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), id$1, new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$002dUnmodified$002dSince$002dMut.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$UnmodifiedSinceMut($thiz, id$1, currVersion, $j_java$002elang$002e$002dObject.$m_scm_ArrayBuffer$().IV($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [currVersion]))));
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
       }
@@ -115,9 +119,9 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__minVersionsDiff__sci_Map__sci_Map__sci_Map__sci_Map__Lio_septimalmind_baboon_typer_model_Version__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__minVersionsDiff__sci_Map__sci_Map__sci_Map__sci_Map__Lio_septimalmind_baboon_typer_model_Version__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__compare__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_Domain__O($thiz, last, prev) {
-  var newTypes = last.b5.aw.bP();
-  var oldTypes = prev.b5.aw.bP();
-  var validRenames = last.NO.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+  var newTypes = last.ba.az.bI();
+  var oldTypes = prev.ba.az.bI();
+  var validRenames = last.Oe.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
     if ((x0$1$2$2 !== null)) {
       var newId = x0$1$2$2.E();
       var oldId = x0$1$2$2.z();
@@ -126,97 +130,97 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
     }
   })));
-  var renamedNewIds = validRenames.bP();
-  var renamedOldIds = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(validRenames));
-  var kept = newTypes.fc(oldTypes);
-  var added = newTypes.c1(oldTypes).c1(renamedNewIds);
-  var removed = oldTypes.c1(newTypes).c1(renamedOldIds);
-  var unmodified = kept.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
-    var x = last.jj.x(id$2$2).pm;
-    var x$2 = prev.jj.x(id$2$2).pm;
+  var renamedNewIds = validRenames.bI();
+  var renamedOldIds = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(validRenames));
+  var kept = newTypes.fe(oldTypes);
+  var added = newTypes.bF(oldTypes).bF(renamedNewIds);
+  var removed = oldTypes.bF(newTypes).bF(renamedOldIds);
+  var unmodified = kept.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
+    var x = last.jl.w(id$2$2).pv;
+    var x$2 = prev.jl.w(id$2$2).pv;
     if (((x === null) ? (x$2 === null) : x.b(x$2))) {
-      var x$3 = last.jj.x(id$2$2).pl;
-      var x$4 = prev.jj.x(id$2$2).pl;
+      var x$3 = last.jl.w(id$2$2).pu;
+      var x$4 = prev.jl.w(id$2$2).pu;
       return ((x$3 === null) ? (x$4 === null) : x$3.b(x$4));
     } else {
       return false;
     }
   })));
-  var changed = kept.c1(unmodified);
-  var fullyModified = changed.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => {
-    var x$1 = last.jj.x(id$2$2$1).pm;
-    var x$2$1 = prev.jj.x(id$2$2$1).pm;
+  var changed = kept.bF(unmodified);
+  var fullyModified = changed.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => {
+    var x$1 = last.jl.w(id$2$2$1).pv;
+    var x$2$1 = prev.jl.w(id$2$2$1).pv;
     if ((!((x$1 === null) ? (x$2$1 === null) : x$1.b(x$2$1)))) {
-      var x$3$1 = last.jj.x(id$2$2$1).pl;
-      var x$4$1 = prev.jj.x(id$2$2$1).pl;
+      var x$3$1 = last.jl.w(id$2$2$1).pu;
+      var x$4$1 = prev.jl.w(id$2$2$1).pu;
       return (!((x$3$1 === null) ? (x$4$1 === null) : x$3$1.b(x$4$1)));
     } else {
       return false;
     }
   })));
-  var partiallyModified = changed.c1(fullyModified);
-  var shallowModified = partiallyModified.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => {
-    var x$5 = last.jj.x(id$2$2$2).pm;
-    var x$2$2 = prev.jj.x(id$2$2$2).pm;
+  var partiallyModified = changed.bF(fullyModified);
+  var shallowModified = partiallyModified.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => {
+    var x$5 = last.jl.w(id$2$2$2).pv;
+    var x$2$2 = prev.jl.w(id$2$2$2).pv;
     return (!((x$5 === null) ? (x$2$2 === null) : x$5.b(x$2$2)));
   })));
-  var deepModified = partiallyModified.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => {
-    var x$6 = last.jj.x(id$2$2$3).pl;
-    var x$2$3 = prev.jj.x(id$2$2$3).pl;
+  var deepModified = partiallyModified.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => {
+    var x$6 = last.jl.w(id$2$2$3).pu;
+    var x$2$3 = prev.jl.w(id$2$2$3).pu;
     return (!((x$6 === null) ? (x$2$3 === null) : x$6.b(x$2$3)));
   })));
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(shallowModified.fc(deepModified).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(shallowModified.fc(fullyModified).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(deepModified.fc(fullyModified).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(changed.fc(unmodified).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(kept.fc(added).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(kept.fc(removed).m());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(removed.fc(added).m());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(shallowModified.fe(deepModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(shallowModified.fe(fullyModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(deepModified.fe(fullyModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(changed.fe(unmodified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(kept.fe(added).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(kept.fe(removed).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(removed.fe(added).l());
   var $x_1 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-  var x$2$4 = shallowModified.b7(deepModified);
-  $x_1.cd(((partiallyModified === null) ? (x$2$4 === null) : partiallyModified.b(x$2$4)));
+  var x$2$4 = shallowModified.b6(deepModified);
+  $x_1.cg(((partiallyModified === null) ? (x$2$4 === null) : partiallyModified.b(x$2$4)));
   var $x_2 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-  var x$4$2 = partiallyModified.b7(fullyModified);
-  $x_2.cd(((changed === null) ? (x$4$2 === null) : changed.b(x$4$2)));
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(changed.cF(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$3$2$2) => (x$3$2$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_TypeId$User)))));
+  var x$4$2 = partiallyModified.b6(fullyModified);
+  $x_2.cg(((changed === null) ? (x$4$2 === null) : changed.b(x$4$2)));
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(changed.cI(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$3$2$2) => (x$3$2$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_TypeId$User)))));
   var changes = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dChanges.$c_Lio_septimalmind_baboon_typer_model_BaboonChanges(added, removed, unmodified, shallowModified, deepModified, fullyModified, validRenames);
   var col = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A(changed);
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
     var x0 = iterator.e();
-    var defOld = prev.b5.aw.x(x0);
-    var defNew = last.b5.aw.x(x0);
+    var defOld = prev.ba.az.w(x0);
+    var defNew = last.ba.az.w(x0);
     matchEnd5: {
       var $x_3;
       if ((defOld instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
         if ((defNew instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-          var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O($thiz, changes, defOld.a3, defNew.a3), $thiz.kj);
+          var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O($thiz, changes, defOld.a4, defNew.a4), $thiz.jk);
           var r = this$9.a1;
           var $x_3 = ((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(), x0, r.H)) : r);
           break matchEnd5;
         }
       }
-      var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dIncomparable$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$IncomparableTypedefs(defOld, defNew), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+      var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dIncomparable$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$IncomparableTypedefs(defOld, defNew), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
     }
     var x1 = $x_3;
     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$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.kj);
+  var this$15 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.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.jk);
   var r$1 = this$15.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
@@ -225,7 +229,7 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     var buildL$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init$1 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$1);
-    var iterator$1 = col$1.o();
+    var iterator$1 = col$1.p();
     var good$1 = init$1;
     var allGood$1 = true;
     while (iterator$1.f()) {
@@ -235,41 +239,41 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       }
       var newId$1 = x0$3.E();
       var oldId$1 = x0$3.z();
-      var defOld$1 = prev.b5.aw.x(oldId$1);
-      var defNew$1 = last.b5.aw.x(newId$1);
+      var defOld$1 = prev.ba.az.w(oldId$1);
+      var defNew$1 = last.ba.az.w(newId$1);
       matchEnd5$1: {
         var $x_4;
         if ((defOld$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
           if ((defNew$1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-            var this$24 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O($thiz, changes, defOld$1.a3, defNew$1.a3), $thiz.kj);
+            var this$24 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O($thiz, changes, defOld$1.a4, defNew$1.a4), $thiz.jk);
             var r$2 = this$24.a1;
             var $x_4 = ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), oldId$1, r$2.H)) : r$2);
             break matchEnd5$1;
           }
         }
-        var $x_4 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($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$002dEvolution$002dIssue$0024$002dIncomparable$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$IncomparableTypedefs(defOld$1, defNew$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+        var $x_4 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($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$002dEvolution$002dIssue$0024$002dIncomparable$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$IncomparableTypedefs(defOld$1, defNew$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
       }
       var x1$1 = $x_4;
       if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-        var e$1 = x1$1.aj;
+        var e$1 = x1$1.ah;
         allGood$1 = false;
-        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$1, e$1.ay);
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$1, e$1.av);
       } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var v$1 = x1$1.H;
-        good$1 = good$1.gA(v$1);
+        good$1 = good$1.gm(v$1);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
     }
-    var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.kj);
+    var this$30 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aT(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bf()))), $thiz.jk);
     var r$3 = this$30.a1;
     if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$3 = r$3.H;
-      var $x_5 = 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$1.aY(b$3)));
+      var $x_5 = 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$1.aZ(b$3)));
     } else {
       var $x_5 = r$3;
     }
-    var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_5, $thiz.kj);
+    var this$33 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_5, $thiz.jk);
     var r$4 = this$33.a1;
     if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$4 = r$4.H;
@@ -277,15 +281,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$4);
       }
       var allDiffs$1 = b$4.z();
-      var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-      var it = allDiffs$1.o();
+      var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
+      var it = allDiffs$1.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 mapIt = m.o();
+      var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
+      var mapIt = m.p();
       while (mapIt.f()) {
         var x1$2 = mapIt.e();
         if ((x1$2 === null)) {
@@ -293,15 +297,15 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
         }
         var k = x1$2.E();
         var v$2 = x1$2.z();
-        result = result.ci(k, v$2.aq());
+        result = result.ck(k, v$2.ao());
       }
       var grouped = result;
-      var bad$2 = 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$2.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().al(allDiffs$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiffs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueDiffs($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$2), 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$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), $thiz.kj);
+      var bad$2 = 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$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$2.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().ak(allDiffs$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiffs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueDiffs($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$2), 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$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), $thiz.jk);
       var r$5 = this$46.a1;
       if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$5 = r$5.H;
-        return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dDiff.$c_Lio_septimalmind_baboon_typer_model_BaboonDiff(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep.$c_Lio_septimalmind_baboon_typer_model_EvolutionStep(prev.ba, last.ba), changes, b$5));
+        return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dDiff.$c_Lio_septimalmind_baboon_typer_model_BaboonDiff(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep.$c_Lio_septimalmind_baboon_typer_model_EvolutionStep(prev.bc, last.bc), changes, b$5));
       } else {
         return r$5;
       }
@@ -329,13 +333,13 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       return $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffDtos__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Dto__Lio_septimalmind_baboon_typer_model_Typedef$Dto__O($thiz, changes, prevDef, nextDef);
     }
   }
-  return 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$002dEvolution$002dIssue$0024$002dMismatching$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$MismatchingTypedefs(prevDef, nextDef), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+  return 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$002dEvolution$002dIssue$0024$002dMismatching$002dTypedefs.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$MismatchingTypedefs(prevDef, nextDef), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diff__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$User__Lio_septimalmind_baboon_typer_model_Typedef$User__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffEnums__Lio_septimalmind_baboon_typer_model_Typedef$Enum__Lio_septimalmind_baboon_typer_model_Typedef$Enum__O($thiz, e1, e2) {
   var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$ = e1.gp;
-  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.gJ, m$2$2));
+  var this$ = e1.fF;
+  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.f2, m$2$2));
   if ((this$ === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
     var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
   } else {
@@ -352,10 +356,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     }
     var $x_1 = h;
   }
-  var members1 = $x_2.al($x_1);
+  var members1 = $x_2.ak($x_1);
   var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$$2 = e2.gp;
-  var f$1 = ((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.gJ, m$2$2$1));
+  var this$$2 = e2.fF;
+  var f$1 = ((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.f2, m$2$2$1));
   if ((this$$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
     var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
   } else {
@@ -372,20 +376,108 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     }
     var $x_3 = h$1;
   }
-  var members2 = $x_4.al($x_3);
-  var names1 = members1.bP();
-  var names2 = members2.bP();
-  var removedMembers = names1.c1(names2);
-  var addedMembers = names2.c1(names1);
-  var keptMembers = names1.fc(names2);
-  return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dEnum$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$EnumDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$RemoveBranch(members1.x(id$2$2))))), addedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$AddBranch(members2.x(id$2$2$1))))), keptMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$KeepBranch(members2.x(id$2$2$2)))))])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+  var members2 = $x_4.ak($x_3);
+  var names1 = members1.bI();
+  var names2 = members2.bI();
+  var this$7 = e2.fF;
+  var rest$2 = this$7;
+  var h$2 = null;
+  var t$2 = null;
+  while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+    var x0$4 = rest$2.i();
+    var this$8 = x0$4.yT;
+    if (this$8.l()) {
+      var $x_5 = $j_java$002elang$002e$002dObject.$m_s_None$();
+    } else {
+      var x0$5 = this$8.Z();
+      var $x_5 = ((!members1.a5(x0$5)) ? new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dInvalid$002dEnum$002dMember$002dRename.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$InvalidEnumMemberRename(e2.jN, x0$4.f2, x0$5)) : $j_java$002elang$002e$002dObject.$m_s_None$());
+    }
+    var it = $x_5.aC().p();
+    while (it.f()) {
+      var nx$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      if ((t$2 === null)) {
+        h$2 = nx$2;
+      } else {
+        t$2.L = nx$2;
+      }
+      t$2 = nx$2;
+    }
+    rest$2 = rest$2.n();
+  }
+  var invalidRenames = ((h$2 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$2);
+  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 = invalidRenames.p();
+  var good = init;
+  var allGood = true;
+  while (iterator.f()) {
+    var x1 = 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(iterator.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+    var e = x1.ah;
+    allGood = false;
+    $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
+  }
+  var this$18 = 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.jk);
+  var r = this$18.a1;
+  if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+    var $x_7 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
+    var this$20 = e2.fF;
+    var rest$3 = this$20;
+    var h$3 = null;
+    var t$3 = null;
+    while ((rest$3 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+      var x0$8 = rest$3.i();
+      var this$21 = x0$8.yT;
+      if (this$21.l()) {
+        var $x_6 = $j_java$002elang$002e$002dObject.$m_s_None$();
+      } else {
+        var x0$9 = this$21.Z();
+        var this$22 = members1.b1(x0$9);
+        if (this$22.l()) {
+          var $x_6 = $j_java$002elang$002e$002dObject.$m_s_None$();
+        } else {
+          var x0$10 = this$22.Z();
+          var $x_6 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$8.f2, $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$10, x0$8)));
+        }
+      }
+      var it$1 = $x_6.aC().p();
+      while (it$1.f()) {
+        var nx$3 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$1.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        if ((t$3 === null)) {
+          h$3 = nx$3;
+        } else {
+          t$3.L = nx$3;
+        }
+        t$3 = nx$3;
+      }
+      rest$3 = rest$3.n();
+    }
+    var renamedMembers = $x_7.ak(((h$3 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$3));
+    var renamedNewNames = renamedMembers.bI();
+    var renamedOldNames = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2($j_java$002elang$002e$002dObject.$f_sc_IterableOps__map__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(renamedMembers), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.E().f2))));
+    var removedMembers = names1.bF(names2).bF(renamedOldNames);
+    var addedMembers = names2.bF(names1).bF(renamedNewNames);
+    var keptMembers = names1.fe(names2);
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dEnum$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$EnumDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$RemoveBranch(members1.w(id$2$2))))), addedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$AddBranch(members2.w(id$2$2$1))))), keptMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$KeepBranch(members2.w(id$2$2$2))))), $j_java$002elang$002e$002dObject.$f_sc_IterableOps__map__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(renamedMembers), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+      if ((x0$1$2$2 !== null)) {
+        return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEnum$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_EnumOp$KeepBranch(x0$1$2$2.z());
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
+      }
+    })))])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
+  } else {
+    return r;
+  }
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffEnums__Lio_septimalmind_baboon_typer_model_Typedef$Enum__Lio_septimalmind_baboon_typer_model_Typedef$Enum__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffEnums__Lio_septimalmind_baboon_typer_model_Typedef$Enum__Lio_septimalmind_baboon_typer_model_Typedef$Enum__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffAdts__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Adt__Lio_septimalmind_baboon_typer_model_Typedef$Adt__O($thiz, changes, a1, a2) {
-  if ($j_java$002elang$002e$002dObject.$m_sci_Set$().a4(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(changes.yw)).a5(a1.gK)) {
+  var isRenamed = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(changes.sP)).a5(a1.gM);
+  var branchRenames = changes.sP.xl(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dComparator$0024$002dBaboon$002dComparator$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl$$anonfun$1($thiz, a2, a1));
+  if (isRenamed) {
     var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-    var this$ = a1.go;
-    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.bm.aN, m$2$2));
+    var this$ = a1.fn;
+    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.bg.aH, m$2$2));
     if ((this$ === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -402,10 +494,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       }
       var $x_1 = h;
     }
-    var members1ByName = $x_2.al($x_1);
+    var members1ByName = $x_2.ak($x_1);
     var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-    var this$$2 = a2.go;
-    var f$1 = ((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.bm.aN, m$2$2$1));
+    var this$$2 = a2.fn;
+    var f$1 = ((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.bg.aH, m$2$2$1));
     if ((this$$2 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
     } else {
@@ -422,32 +514,59 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
       }
       var $x_3 = h$1;
     }
-    var members2ByName = $x_4.al($x_3);
-    var names1 = members1ByName.bP();
-    var names2 = members2ByName.bP();
-    var removedNames = names1.c1(names2);
-    var addedNames = names2.c1(names1);
-    var keptNames = names1.fc(names2);
-    var keptMembers = keptNames.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2) => {
-      members1ByName.x(name$2$2);
-      var newRef = members2ByName.x(name$2$2);
-      return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(newRef, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [newRef]))));
+    var members2ByName = $x_4.ak($x_3);
+    var renamedByName = branchRenames.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+      if ((x0$1$2$2 !== null)) {
+        var newId = x0$1$2$2.E();
+        return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$1$2$2.z().bg.aH, newId.bg.aH);
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
+      }
     })));
-    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedNames.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$RemoveBranch(members1ByName.x(name$2$2$1))))), addedNames.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$AddBranch(members2ByName.x(name$2$2$2))))), keptMembers])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+    var names1 = members1ByName.bI();
+    var names2 = members2ByName.bI();
+    var removedNames = names1.bF(names2).bF(renamedByName.bI());
+    var addedNames = names2.bF(names1).bF($j_java$002elang$002e$002dObject.$m_sci_Set$().a2(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(renamedByName)));
+    var keptNames = names1.fe(names2);
+    var keptMembers = keptNames.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2) => {
+      members1ByName.w(name$2$2);
+      var newRef = members2ByName.w(name$2$2);
+      return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(newRef, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [newRef]))));
+    })));
+    var renamedMembers = renamedByName.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+      if ((x0$2$2$2 !== null)) {
+        var newName = x0$2$2$2.z();
+        var newRef$1 = members2ByName.w(newName);
+        return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(newRef$1, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [newRef$1]))));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
+      }
+    })));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedNames.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$RemoveBranch(members1ByName.w(name$2$2$1))))), addedNames.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$AddBranch(members2ByName.w(name$2$2$2))))), keptMembers, renamedMembers])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
   } else {
-    var members1 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(a1.go);
-    var members2 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(a2.go);
-    var removedMembers = members1.c1(members2);
-    var addedMembers = members2.c1(members1);
-    var keptMembers$2 = members1.fc(members2).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(ref$2$2, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [ref$2$2])))))));
-    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$RemoveBranch(id$2$2)))), addedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$AddBranch(id$2$2$1)))), keptMembers$2])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+    var members1 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(a1.fn);
+    var members2 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(a2.fn);
+    var renamedOld = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(branchRenames));
+    var renamedNew = branchRenames.bI();
+    var removedMembers = members1.bF(members2).bF(renamedOld);
+    var addedMembers = members2.bF(members1).bF(renamedNew);
+    var keptMembers$2 = members1.fe(members2).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((ref$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(ref$2$2, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [ref$2$2])))))));
+    var renamedMembers$2 = branchRenames.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
+      if ((x0$3$2$2 !== null)) {
+        var newId$1 = x0$3$2$2.E();
+        return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dKeep$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$KeepBranch(newId$1, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $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(), [newId$1]))));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
+      }
+    })));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dRemove$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$RemoveBranch(id$2$2)))), addedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dAdt$002dOp$0024$002dAdd$002dBranch.$c_Lio_septimalmind_baboon_typer_model_AdtOp$AddBranch(id$2$2$1)))), keptMembers$2, renamedMembers$2])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
   }
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffAdts__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Adt__Lio_septimalmind_baboon_typer_model_Typedef$Adt__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffAdts__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Adt__Lio_septimalmind_baboon_typer_model_Typedef$Adt__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffDtos__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Dto__Lio_septimalmind_baboon_typer_model_Typedef$Dto__O($thiz, changes, d1, d2) {
   var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$1 = d1.cS;
-  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.cg, m$2$2));
+  var this$1 = d1.cF;
+  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.bG, m$2$2));
   if ((this$1 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
     var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
   } else {
@@ -464,10 +583,10 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     }
     var $x_1 = h;
   }
-  var members1 = $x_2.al($x_1);
+  var members1 = $x_2.ak($x_1);
   var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$4 = d2.cS;
-  var f$1 = ((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.cg, m$2$2$1));
+  var this$4 = d2.cF;
+  var f$1 = ((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.bG, m$2$2$1));
   if ((this$4 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
     var $x_3 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
   } else {
@@ -484,59 +603,148 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     }
     var $x_3 = h$1;
   }
-  var members2 = $x_4.al($x_3);
-  var names1 = members1.bP();
-  var names2 = members2.bP();
-  var removedMembers = names1.c1(names2);
-  var addedMembers = names2.c1(names1);
-  var keptMembers = names1.fc(names2);
-  var keptFields = keptMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), members1.x(name$2$2), members2.x(name$2$2)))));
-  var changedFields = keptFields.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
-    if ((x0$1$2$2 !== null)) {
-      var f1 = x0$1$2$2.E();
-      var f2 = x0$1$2$2.z();
-      var x = f1.bi;
-      var x$2 = f2.bi;
-      return (!((x === null) ? (x$2 === null) : x.b(x$2)));
+  var members2 = $x_4.ak($x_3);
+  var names1 = members1.bI();
+  var names2 = members2.bI();
+  var this$7 = d2.cF;
+  var rest$2 = this$7;
+  var h$2 = null;
+  var t$2 = null;
+  while ((rest$2 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+    var x0$4 = rest$2.i();
+    var this$8 = x0$4.yV;
+    if (this$8.l()) {
+      var $x_5 = $j_java$002elang$002e$002dObject.$m_s_None$();
     } else {
-      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
+      var x0$5 = this$8.Z();
+      var $x_5 = ((!members1.a5(x0$5)) ? new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dInvalid$002dField$002dRename.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$InvalidFieldRename(d2.dJ, x0$4.bG, x0$5)) : $j_java$002elang$002e$002dObject.$m_s_None$());
     }
-  })));
-  var unchangedFields = keptFields.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
-    if ((x0$2$2$2 !== null)) {
-      var f1$1 = x0$2$2$2.E();
-      var f2$1 = x0$2$2$2.z();
-      var x$1 = f1$1.bi;
-      var x$2$1 = f2$1.bi;
-      return ((x$1 === null) ? (x$2$1 === null) : x$1.b(x$2$1));
-    } else {
-      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
+    var it = $x_5.p();
+    while (it.f()) {
+      var nx$2 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      if ((t$2 === null)) {
+        h$2 = nx$2;
+      } else {
+        t$2.L = nx$2;
+      }
+      t$2 = nx$2;
     }
-  }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
-    if ((x0$3$2$2 !== null)) {
-      var f2$2 = x0$3$2$2.z();
-      return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dKeep$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$KeepField(f2$2, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $thiz.anT.xe(f2$2.bi)));
-    } else {
-      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
+    rest$2 = rest$2.n();
+  }
+  var invalidRenames = ((h$2 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$2);
+  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 = invalidRenames.p();
+  var good = init;
+  var allGood = true;
+  while (iterator.f()) {
+    var x1 = 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(iterator.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+    var e = x1.ah;
+    allGood = false;
+    $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
+  }
+  var this$18 = 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.jk);
+  var r = this$18.a1;
+  if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+    var $x_7 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
+    var this$20 = d2.cF;
+    var rest$3 = this$20;
+    var h$3 = null;
+    var t$3 = null;
+    while ((rest$3 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+      var x0$8 = rest$3.i();
+      var this$21 = x0$8.yV;
+      if (this$21.l()) {
+        var $x_6 = $j_java$002elang$002e$002dObject.$m_s_None$();
+      } else {
+        var x0$9 = this$21.Z();
+        var this$22 = members1.b1(x0$9);
+        if (this$22.l()) {
+          var $x_6 = $j_java$002elang$002e$002dObject.$m_s_None$();
+        } else {
+          var x0$10 = this$22.Z();
+          var $x_6 = new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$8.bG, $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$10, x0$8)));
+        }
+      }
+      var it$1 = $x_6.p();
+      while (it$1.f()) {
+        var nx$3 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it$1.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        if ((t$3 === null)) {
+          h$3 = nx$3;
+        } else {
+          t$3.L = nx$3;
+        }
+        t$3 = nx$3;
+      }
+      rest$3 = rest$3.n();
     }
-  })));
-  return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dDto$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$DtoDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dRemove$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$RemoveField(members1.x(id$2$2))))), addedMembers.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dAdd$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$AddField(members2.x(id$2$2$1))))), changedFields.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dChange$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$ChangeField(id$2$2$2.E(), id$2$2$2.z().bi)))), unchangedFields])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)));
+    var renamedFields = $x_7.ak(((h$3 === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h$3));
+    var renamedNewNames = renamedFields.bI();
+    var renamedOldNames = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2($j_java$002elang$002e$002dObject.$f_sc_IterableOps__map__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(renamedFields), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$7$2$2) => x$7$2$2.E().bG))));
+    var removedMembers = names1.bF(names2).bF(renamedOldNames);
+    var addedMembers = names2.bF(names1).bF(renamedNewNames);
+    var keptMembers = names1.fe(names2);
+    var keptFields = keptMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), members1.w(name$2$2), members2.w(name$2$2)))));
+    var changedFields = keptFields.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+      if ((x0$1$2$2 !== null)) {
+        var f1 = x0$1$2$2.E();
+        var f2 = x0$1$2$2.z();
+        var x = f1.aY;
+        var x$2 = f2.aY;
+        return (!((x === null) ? (x$2 === null) : x.b(x$2)));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
+      }
+    })));
+    var unchangedFields = keptFields.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+      if ((x0$2$2$2 !== null)) {
+        var f1$1 = x0$2$2$2.E();
+        var f2$1 = x0$2$2$2.z();
+        var x$1 = f1$1.aY;
+        var x$2$1 = f2$1.aY;
+        return ((x$1 === null) ? (x$2$1 === null) : x$1.b(x$2$1));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
+      }
+    }))).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
+      if ((x0$3$2$2 !== null)) {
+        var f2$2 = x0$3$2$2.z();
+        return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dKeep$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$KeepField(f2$2, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $thiz.a5a.ul(f2$2.aY)));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
+      }
+    })));
+    var renamedFieldOps = $j_java$002elang$002e$002dObject.$f_sc_IterableOps__map__F1__O(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(renamedFields), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$4$2$2) => {
+      if ((x0$4$2$2 !== null)) {
+        var oldField = x0$4$2$2.E();
+        var newField = x0$4$2$2.z();
+        return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dRename$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$RenameField(oldField, newField, $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, $thiz.a5a.ul(newField.aY)));
+      } else {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$4$2$2);
+      }
+    })));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dDto$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$DtoDiff($j_java$002elang$002e$002dObject.$f_sc_StrictOptimizedIterableOps__flatten__F1__O($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(), [removedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dRemove$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$RemoveField(members1.w(id$2$2))))), addedMembers.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dAdd$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$AddField(members2.w(id$2$2$1))))), changedFields.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dChange$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$ChangeField(id$2$2$2.E(), id$2$2$2.z().aY)))), unchangedFields, renamedFieldOps])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bh)));
+  } else {
+    return r;
+  }
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffDtos__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Dto__Lio_septimalmind_baboon_typer_model_Typedef$Dto__O as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__diffDtos__Lio_septimalmind_baboon_typer_model_BaboonChanges__Lio_septimalmind_baboon_typer_model_Typedef$Dto__Lio_septimalmind_baboon_typer_model_Typedef$Dto__O };
 function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification($thiz, changes, directRefs) {
-  return (directRefs.ek(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => changes.aG4().a5(id$2$2)))) ? (directRefs.ek(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => changes.v6.a5(id$2$2$1)))) ? $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dFull$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Full$() : (directRefs.ek(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => changes.v7.a5(id$2$2$2)))) ? $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dShallow$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Shallow$() : ($j_java$002elang$002e$002dObject.$m_s_Predef$().cd(directRefs.cF(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => (changes.v8.a5(id$2$2$3) || changes.v5.a5(id$2$2$3)))))), $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dDeep$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Deep$()))) : $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dUnchanged$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Unchanged$());
+  return (directRefs.eo(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => changes.aGI().a5(id$2$2)))) ? (directRefs.eo(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => changes.vh.a5(id$2$2$1)))) ? $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dFull$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Full$() : (directRefs.eo(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => changes.vi.a5(id$2$2$2)))) ? $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dShallow$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Shallow$() : ($j_java$002elang$002e$002dObject.$m_s_Predef$().cg(directRefs.cI(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => (changes.vj.a5(id$2$2$3) || changes.vg.a5(id$2$2$3)))))), $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dDeep$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Deep$()))) : $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dUnchanged$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Unchanged$());
 }
 export { $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification as $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__figureOutModification__Lio_septimalmind_baboon_typer_model_BaboonChanges__sci_Set__Lio_septimalmind_baboon_typer_model_RefModification };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl(enquiries, rules, logger, evidence$1) {
-  this.anT = null;
-  this.anV = null;
-  this.anU = null;
-  this.kj = null;
-  this.anT = enquiries;
-  this.anV = rules;
-  this.anU = logger;
-  this.kj = evidence$1;
+  this.a5a = null;
+  this.aoA = null;
+  this.aoz = null;
+  this.jk = null;
+  this.a5a = enquiries;
+  this.aoA = rules;
+  this.aoz = logger;
+  this.jk = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl as $c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl };
 $p = $c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -546,14 +754,14 @@ function $h_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl(
 }
 export { $h_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl as $h_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl };
 $h_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl.prototype = $p;
-$p.aIb = (function(pkg, versions) {
-  var set = versions.bP();
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().e3((!set.m()));
-  var sortedVersions = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O($j_java$002elang$002e$002dObject.$m_sci_Nil$().A(set), $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dVersion$0024.$m_Lio_septimalmind_baboon_typer_model_Version$().a4V.fK());
+$p.aIQ = (function(pkg, versions) {
+  var set = versions.bI();
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().dZ((!set.l()));
+  var sortedVersions = $j_java$002elang$002e$002dObject.$f_sc_SeqOps__sorted__s_math_Ordering__O($j_java$002elang$002e$002dObject.$m_sci_Nil$().A(set), $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dVersion$0024.$m_Lio_septimalmind_baboon_typer_model_Version$().a5C.fP());
   var pinnacleVersion = sortedVersions.i();
   var toCompare = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$f_sc_IterableOps__sliding__I__I__sc_Iterator(sortedVersions, 2, 1));
-  var $x_6 = this.anU;
-  var $x_5 = $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(pkg.fj, "", ".", "");
+  var $x_6 = this.aoz;
+  var $x_5 = $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(pkg.fm, "", ".", "");
   var $x_4 = $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dQuote$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$Quote$();
   var $x_3 = new $j_scala$002e$002dString$002dContext.$c_s_StringContext($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["conversions chain: ", ""]));
   var $x_2 = $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$();
@@ -574,7 +782,7 @@ $p.aIb = (function(pkg, versions) {
     }
     var $x_1 = h;
   }
-  $x_6.ahE($x_5, $x_4.l($x_3, $j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($x_2, $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T($x_1, "", "; ", ""))])));
+  $x_6.aih($x_5, $x_4.m($x_3, $j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($x_2, $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T($x_1, "", "; ", ""))])));
   if ((sortedVersions.y() === 1)) {
     var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$());
   } else {
@@ -582,7 +790,7 @@ $p.aIb = (function(pkg, versions) {
     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 = toCompare.o();
+    var iterator = toCompare.p();
     var good = init;
     var allGood = true;
     while (iterator.f()) {
@@ -590,16 +798,16 @@ $p.aIb = (function(pkg, versions) {
       matchEnd8: {
         var $x_8;
         if ((x0$2 instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
-          var fresh = x0$2.id;
+          var fresh = x0$2.ig;
           var p3 = x0$2.L;
           if ((p3 instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
-            var old = p3.id;
+            var old = p3.ig;
             if ($j_java$002elang$002e$002dObject.$m_sci_Nil$().b(p3.L)) {
-              var this$28 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__compare__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_Domain__O(this, versions.x(fresh), versions.x(old)), this.kj);
+              var this$28 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__compare__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_Domain__O(this, versions.w(fresh), versions.w(old)), this.jk);
               var r = this$28.a1;
               if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
                 var b = r.H;
-                var $x_8 = 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.NH, b));
+                var $x_8 = 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.O8, b));
                 break matchEnd8;
               } else {
                 var $x_8 = r;
@@ -608,35 +816,35 @@ $p.aIb = (function(pkg, versions) {
             }
           }
         }
-        var $x_8 = 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$002dEvolution$002dIssue$0024$002dBroken$002dComparison.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$BrokenComparison(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+        var $x_8 = 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$002dEvolution$002dIssue$0024$002dBroken$002dComparison.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$BrokenComparison(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
       }
       var x1 = $x_8;
       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 $x_7 = (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())));
+    var $x_7 = (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())));
   }
-  var this$34 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.kj);
+  var this$34 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.jk);
   var r$1 = this$34.a1;
   if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$1 = r$1.H;
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-    var it = b$1.o();
+    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
+    var it = b$1.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 mapIt = m.o();
+    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
+    var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
@@ -644,23 +852,23 @@ $p.aIb = (function(pkg, versions) {
       }
       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$47 = 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$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiff.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueDiff($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()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.kj);
+    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$47 = 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$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dDiff.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueDiff($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()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.jk);
     var r$2 = this$47.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$2 = r$2.H;
-      var col = b$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
+      var col = b$2.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$2$2$2) => {
         if ((x0$2$2$2 !== null)) {
           var v$2 = x0$2$2$2.E();
           var diff = x0$2$2$2.z();
-          var $x_10 = this.anV;
-          var k$1 = v$2.mK;
-          var $x_9 = versions.x(k$1);
-          var k$2 = v$2.pj;
-          var this$54 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_10.aGK($x_9, versions.x(k$2), diff), this.kj);
+          var $x_10 = this.aoA;
+          var k$1 = v$2.mT;
+          var $x_9 = versions.w(k$1);
+          var k$2 = v$2.pq;
+          var this$54 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_10.aHo($x_9, versions.w(k$2), diff), this.jk);
           var r$3 = this$54.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.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), v$2, r$3.H)) : r$3);
         } else {
@@ -671,35 +879,35 @@ $p.aIb = (function(pkg, versions) {
       var buildL$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
       var init$1 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
       var bad$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$1);
-      var iterator$1 = col.o();
+      var iterator$1 = col.p();
       var good$1 = init$1;
       var allGood$1 = true;
       while (iterator$1.f()) {
         var x0$6 = iterator$1.e();
         if ((x0$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-          var e$1 = x0$6.aj;
+          var e$1 = x0$6.ah;
           allGood$1 = false;
-          $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$1.ay);
+          $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$1.av);
         } else if ((x0$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var v$3 = x0$6.H;
-          good$1 = good$1.gA(v$3);
+          good$1 = good$1.gm(v$3);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$6);
         }
       }
-      var this$64 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), this.kj);
+      var this$64 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aT(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bf()))), this.jk);
       var r$4 = this$64.a1;
       if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
         var b$4 = r$4.H;
-        var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-        var it$1 = b$4.o();
+        var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
+        var it$1 = b$4.p();
         while (it$1.f()) {
           var elem$1 = it$1.e();
           var key$1 = elem$1.E();
-          m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$69) => (() => this$69.dU()))(b$4))).am(elem$1);
+          m$1.cs(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$69) => (() => this$69.dY()))(b$4))).am(elem$1);
         }
-        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-        var mapIt$1 = m$1.o();
+        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
+        var mapIt$1 = m$1.p();
         while (mapIt$1.f()) {
           var x1$2 = mapIt$1.e();
           if ((x1$2 === null)) {
@@ -707,20 +915,20 @@ $p.aIb = (function(pkg, versions) {
           }
           var k$3 = x1$2.E();
           var v$4 = x1$2.z();
-          result$1 = result$1.ci(k$3, v$4.aq());
+          result$1 = result$1.ck(k$3, v$4.ao());
         }
         var grouped$1 = result$1;
-        var bad$3 = grouped$1.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2$1) => (x$4$2$2$1.z().a2() > 1))), false);
-        var this$76 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$3.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b$4.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$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dRuleset.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueRuleset($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$3), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$1) => x$5$2$2$1.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$1) => x$6$2$2$1.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.kj);
+        var bad$3 = grouped$1.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2$1) => (x$4$2$2$1.z().a3() > 1))), false);
+        var this$76 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$3.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b$4.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$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dRuleset.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueRuleset($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$3), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$1) => x$5$2$2$1.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$1) => x$6$2$2$1.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.jk);
         var r$5 = this$76.a1;
         if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$5 = r$5.H;
-          var xs = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cW(new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$10(new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$6($j_java$002elang$002e$002dObject.$f_sc_IterableOps__sliding__I__I__sc_Iterator(sortedVersions, 2, 1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => (x$2$2$2.y() === 2))), false), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
+          var xs = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cX(new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$10(new $j_java$002elang$002e$002dObject.$c_sc_Iterator$$anon$6($j_java$002elang$002e$002dObject.$f_sc_IterableOps__sliding__I__I__sc_Iterator(sortedVersions, 2, 1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => (x$2$2$2.y() === 2))), false), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$2$2) => {
             if ((x0$3$2$2 instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
-              var n = x0$3$2$2.id;
+              var n = x0$3$2$2.ig;
               var p3$1 = x0$3$2$2.L;
               if ((p3$1 instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
-                var p$1 = p3$1.id;
+                var p$1 = p3$1.ig;
                 if ($j_java$002elang$002e$002dObject.$m_sci_Nil$().b(p3$1.L)) {
                   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(), [$j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), n, p$1)]));
                 }
@@ -728,15 +936,15 @@ $p.aIb = (function(pkg, versions) {
             }
             return $j_java$002elang$002e$002dObject.$m_sci_Nil$();
           }))));
-          var m$2 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
-          var it$2 = xs.o();
+          var m$2 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aX();
+          var it$2 = xs.p();
           while (it$2.f()) {
             var elem$2 = it$2.e();
             var key$2 = elem$2.E();
-            m$2.cq(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$89) => (() => this$89.dU()))(xs))).am(elem$2);
+            m$2.cs(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$89) => (() => this$89.dY()))(xs))).am(elem$2);
           }
-          var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-          var mapIt$2 = m$2.o();
+          var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bZ;
+          var mapIt$2 = m$2.p();
           while (mapIt$2.f()) {
             var x1$3 = mapIt$2.e();
             if ((x1$3 === null)) {
@@ -744,15 +952,15 @@ $p.aIb = (function(pkg, versions) {
             }
             var k$4 = x1$3.E();
             var v$5 = x1$3.z();
-            result$2 = result$2.ci(k$4, v$5.aq());
+            result$2 = result$2.ck(k$4, v$5.ao());
           }
           var grouped$2 = result$2;
-          var bad$4 = grouped$2.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2$2) => (x$4$2$2$2.z().a2() > 1))), false);
-          var this$96 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$4.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$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dPrev$002dVersions.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniquePrevVersions($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$4), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$2) => x$5$2$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$2) => x$6$2$2$2.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.kj);
+          var bad$4 = grouped$2.eV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2$2) => (x$4$2$2$2.z().a3() > 1))), false);
+          var this$96 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$4.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$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dPrev$002dVersions.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniquePrevVersions($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$4), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2$2) => x$5$2$2$2.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2$2) => x$6$2$2$2.z()))).aC()))))), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())))), this.jk);
           var r$6 = this$96.a1;
           if ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
             var b$6 = r$6.H;
-            var this$99 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__computeMinVersions__sci_Map__sci_Map__sci_Map__sci_Seq__O(this, versions, b$2, b$6, sortedVersions.J0()), this.kj);
+            var this$99 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl__computeMinVersions__sci_Map__sci_Map__sci_Map__sci_Seq__O(this, versions, b$2, b$6, sortedVersions.Jn()), this.jk);
             var r$7 = this$99.a1;
             return ((r$7 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$002dBaboon$002dEvolution.$c_Lio_septimalmind_baboon_typer_model_BaboonEvolution(pkg, pinnacleVersion, b$2, b$5, r$7.H)) : r$7);
           } else {
@@ -772,8 +980,8 @@ $p.aIb = (function(pkg, versions) {
   }
 });
 var $d_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl, "io.septimalmind.baboon.typer.BaboonComparator$BaboonComparatorImpl", ({
-  x8: 1,
-  jb: 1
+  xh: 1,
+  je: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl as $d_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Baboon-Comparator$-Baboon-Comparator-Impl.js.map