@7mind.io/baboon 0.0.164 → 0.0.166

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

@@ -53,21 +53,21 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
   var z = $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
   var i = versions.o();
   var acc = new $j_java$002elang$002e$002dObject.$c_s_util_Right(z);
-  while ((i.f() && acc.a0K())) {
+  while ((i.f() && acc.a0T())) {
     var nxt = i.e();
     var _1 = acc;
     if ((_1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var a = _1.H;
+      var a = _1.G;
       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.mB);
+  var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(acc, $thiz.kf);
   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.is(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.G.hV(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.C(), x0$2$2$2.z().is(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.D(), x0$2$2$2.z().hV(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.C(), x0$3$2$2.z().aHw());
+          return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$3$2$2.D(), x0$3$2$2.z().aHK());
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3$2$2);
         }
@@ -79,32 +79,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.bb(currVersion);
+  var x1 = previousVersions.b7(currVersion);
   if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
-    var prevVersion = x1.ai;
+    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.nz.uY;
-    var update = domainVersions.x(currVersion).b8.ax.is(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+    var unmodified = diff.mC.uX;
+    var update = domainVersions.x(currVersion).b6.at.hV(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
       if ((x0$1$2$2 !== null)) {
-        var id = x0$1$2$2.C();
+        var id = x0$1$2$2.D();
         if (unmodified.a6(id)) {
           var prevrecord = minVersions.x(prevVersion).x(id);
-          prevrecord.yi.m8(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.yi));
+          prevrecord.yj.m9(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.yj));
         } 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$().I9($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$().Ih($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.hr(currVersion, update));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(minVersions.hs(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$().am($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).b8.ax.is(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$().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).b6.at.hV(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.C();
-        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$().I9($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [currVersion]))));
+        var id$1 = x0$2$2$2.D();
+        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$().Ih($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,66 +115,71 @@ 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.b8.ax.bX();
-  var oldTypes = prev.b8.ax.bX();
-  var kept = newTypes.fq(oldTypes);
-  var added = newTypes.cg(oldTypes);
-  var removed = oldTypes.cg(newTypes);
+  var newTypes = last.b6.at.bO();
+  var oldTypes = prev.b6.at.bO();
+  var validRenames = last.Nr.ba(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.D();
+      var oldId = x0$1$2$2.z();
+      return ((newTypes.a6(newId) && oldTypes.a6(oldId)) && (!newTypes.a6(oldId)));
+    } else {
+      throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
+    }
+  })));
+  var renamedNewIds = validRenames.bO();
+  var renamedOldIds = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(validRenames));
+  var kept = newTypes.f9(oldTypes);
+  var added = newTypes.c1(oldTypes).c1(renamedNewIds);
+  var removed = oldTypes.c1(newTypes).c1(renamedOldIds);
   var unmodified = kept.ba(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => {
-    var x = last.jf.x(id$2$2).pb;
-    var x$2 = prev.jf.x(id$2$2).pb;
+    var x = last.jf.x(id$2$2).pd;
+    var x$2 = prev.jf.x(id$2$2).pd;
     if (((x === null) ? (x$2 === null) : x.b(x$2))) {
-      var x$3 = last.jf.x(id$2$2).pa;
-      var x$4 = prev.jf.x(id$2$2).pa;
+      var x$3 = last.jf.x(id$2$2).pc;
+      var x$4 = prev.jf.x(id$2$2).pc;
       return ((x$3 === null) ? (x$4 === null) : x$3.b(x$4));
     } else {
       return false;
     }
   })));
-  var changed = kept.cg(unmodified);
+  var changed = kept.c1(unmodified);
   var fullyModified = changed.ba(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => {
-    var x$1 = last.jf.x(id$2$2$1).pb;
-    var x$2$1 = prev.jf.x(id$2$2$1).pb;
+    var x$1 = last.jf.x(id$2$2$1).pd;
+    var x$2$1 = prev.jf.x(id$2$2$1).pd;
     if ((!((x$1 === null) ? (x$2$1 === null) : x$1.b(x$2$1)))) {
-      var x$3$1 = last.jf.x(id$2$2$1).pa;
-      var x$4$1 = prev.jf.x(id$2$2$1).pa;
+      var x$3$1 = last.jf.x(id$2$2$1).pc;
+      var x$4$1 = prev.jf.x(id$2$2$1).pc;
       return (!((x$3$1 === null) ? (x$4$1 === null) : x$3$1.b(x$4$1)));
     } else {
       return false;
     }
   })));
-  var partiallyModified = changed.cg(fullyModified);
+  var partiallyModified = changed.c1(fullyModified);
   var shallowModified = partiallyModified.ba(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => {
-    var x$5 = last.jf.x(id$2$2$2).pb;
-    var x$2$2 = prev.jf.x(id$2$2$2).pb;
+    var x$5 = last.jf.x(id$2$2$2).pd;
+    var x$2$2 = prev.jf.x(id$2$2$2).pd;
     return (!((x$5 === null) ? (x$2$2 === null) : x$5.b(x$2$2)));
   })));
   var deepModified = partiallyModified.ba(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => {
-    var x$6 = last.jf.x(id$2$2$3).pa;
-    var x$2$3 = prev.jf.x(id$2$2$3).pa;
+    var x$6 = last.jf.x(id$2$2$3).pc;
+    var x$2$3 = prev.jf.x(id$2$2$3).pc;
     return (!((x$6 === null) ? (x$2$3 === null) : x$6.b(x$2$3)));
   })));
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(shallowModified.fq(deepModified).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(shallowModified.fq(fullyModified).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(deepModified.fq(fullyModified).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(changed.fq(unmodified).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(kept.fq(added).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(kept.fq(removed).l());
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(removed.fq(added).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(shallowModified.f9(deepModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(shallowModified.f9(fullyModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(deepModified.f9(fullyModified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(changed.f9(unmodified).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(kept.f9(added).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(kept.f9(removed).l());
+  $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(removed.f9(added).l());
   var $x_1 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-  var x$2$4 = shallowModified.b1(deepModified);
-  $x_1.c3(((partiallyModified === null) ? (x$2$4 === null) : partiallyModified.b(x$2$4)));
+  var x$2$4 = shallowModified.b8(deepModified);
+  $x_1.cd(((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.b1(fullyModified);
-  $x_2.c3(((changed === null) ? (x$4$2 === null) : changed.b(x$4$2)));
-  var $x_3 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-  var x$5$1 = added.b1(unmodified).b1(changed);
-  $x_3.c3(((x$5$1 === null) ? (newTypes === null) : x$5$1.b(newTypes)));
-  var $x_4 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-  var x$7 = removed.b1(unmodified).b1(changed);
-  $x_4.c3(((x$7 === null) ? (oldTypes === null) : x$7.b(oldTypes)));
-  $j_java$002elang$002e$002dObject.$m_s_Predef$().c3(changed.cD(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);
+  var x$4$2 = partiallyModified.b8(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.cD(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$());
@@ -185,63 +190,123 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
   var allGood = true;
   while (iterator.f()) {
     var x0 = iterator.e();
-    var defOld = prev.b8.ax.x(x0);
-    var defNew = last.b8.ax.x(x0);
+    var defOld = prev.b6.at.x(x0);
+    var defNew = last.b6.at.x(x0);
     matchEnd5: {
-      var $x_5;
+      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$10 = 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.a8, defNew.a8), $thiz.mB);
-          var r = this$10.a1;
-          var $x_5 = ((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);
+          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.a7, defNew.a7), $thiz.kf);
+          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.G)) : r);
           break matchEnd5;
         }
       }
-      var $x_5 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$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$().aN(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_5;
+    var x1 = $x_3;
     if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
       var e = x1.aj;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
     } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var v = x1.H;
-      good = good.gR(v);
+      var v = x1.G;
+      good = good.gz(v);
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
   }
-  var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aT(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bd()))), $thiz.mB);
-  var r$1 = this$16.a1;
+  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.bc()))), $thiz.kf);
+  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;
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
-    var it = b$1.o();
-    while (it.f()) {
-      var elem = it.e();
-      var key = elem.C();
-      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).al(elem);
-    }
-    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
-    var mapIt = m.o();
-    while (mapIt.f()) {
-      var x1$1 = mapIt.e();
-      if ((x1$1 === null)) {
+    var b$1 = r$1.G;
+    var col$1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$().A(validRenames);
+    var buildR$1 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
+    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 good$1 = init$1;
+    var allGood$1 = true;
+    while (iterator$1.f()) {
+      var x0$3 = iterator$1.e();
+      if ((x0$3 === null)) {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
+      }
+      var newId$1 = x0$3.D();
+      var oldId$1 = x0$3.z();
+      var defOld$1 = prev.b6.at.x(oldId$1);
+      var defNew$1 = last.b6.at.x(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.a7, defNew$1.a7), $thiz.kf);
+            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.G)) : 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$().aN(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;
+        allGood$1 = false;
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$1, e$1.ay);
+      } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+        var v$1 = x1$1.G;
+        good$1 = good$1.gz(v$1);
+      } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var k = x1$1.C();
-      var v$1 = x1$1.z();
-      result = result.ch(k, v$1.aq());
     }
-    var grouped = result;
-    var bad$1 = grouped.eT(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-    var this$29 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am(b$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$().aO(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$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aB()))))), $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.mB);
-    var r$2 = this$29.a1;
-    if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$2 = r$2.H;
-      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.b9, last.b9), changes, b$2));
+    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.bc()))), $thiz.kf);
+    var r$3 = this$30.a1;
+    if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+      var b$3 = r$3.G;
+      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.b1(b$3)));
     } else {
-      return r$2;
+      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.kf);
+    var r$4 = this$33.a1;
+    if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+      var b$4 = r$4.G;
+      if ((b$4 === null)) {
+        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$().aV();
+      var it = allDiffs$1.o();
+      while (it.f()) {
+        var elem = it.e();
+        var key = elem.D();
+        m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
+      }
+      var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
+      var mapIt = m.o();
+      while (mapIt.f()) {
+        var x1$2 = mapIt.e();
+        if ((x1$2 === null)) {
+          throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
+        }
+        var k = x1$2.D();
+        var v$2 = x1$2.z();
+        result = result.ch(k, v$2.aq());
+      }
+      var grouped = result;
+      var bad$2 = grouped.eT(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
+      var this$46 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$2.l() ? 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$().aN(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.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.kf);
+      var r$5 = this$46.a1;
+      if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
+        var b$5 = r$5.G;
+        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.bb, last.bb), changes, b$5));
+      } else {
+        return r$5;
+      }
+    } else {
+      return r$4;
     }
   } else {
     return r$1;
@@ -264,70 +329,124 @@ 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$().aO(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$().aN(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.gn;
-  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.gF, m$2$2));
+  var this$ = e1.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.gI, 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 {
     var x0 = this$.j();
     var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
     var t = h;
-    var rest = this$.n();
+    var rest = this$.m();
     while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var x0$1 = rest.j();
       var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       t.M = nx;
       t = nx;
-      rest = rest.n();
+      rest = rest.m();
     }
     var $x_1 = h;
   }
-  var members1 = $x_2.am($x_1);
+  var members1 = $x_2.al($x_1);
   var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$$2 = e2.gn;
-  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.gF, m$2$2$1));
+  var this$$2 = e2.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.gI, 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 {
     var x0$2 = this$$2.j();
     var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
     var t$1 = h$1;
-    var rest$1 = this$$2.n();
+    var rest$1 = this$$2.m();
     while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var x0$3 = rest$1.j();
       var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       t$1.M = nx$1;
       t$1 = nx$1;
-      rest$1 = rest$1.n();
+      rest$1 = rest$1.m();
     }
     var $x_3 = h$1;
   }
-  var members2 = $x_4.am($x_3);
-  var names1 = members1.bX();
-  var names2 = members2.bX();
-  var removedMembers = names1.cg(names2);
-  var addedMembers = names2.cg(names1);
-  var keptMembers = names1.fq(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$().bg)));
+  var members2 = $x_4.al($x_3);
+  var names1 = members1.bO();
+  var names2 = members2.bO();
+  var removedMembers = names1.c1(names2);
+  var addedMembers = names2.c1(names1);
+  var keptMembers = names1.f9(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.x(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.x(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.x(id$2$2$2)))))])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)));
 }
 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) {
-  var members1 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(a1.hx);
-  var members2 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(a2.hx);
-  var removedMembers = members1.cg(members2);
-  var addedMembers = members2.cg(members1);
-  var keptMembers = members1.fq(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$().a3($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])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)));
+  if ($j_java$002elang$002e$002dObject.$m_sci_Set$().a3(new $j_java$002elang$002e$002dObject.$c_sc_MapOps$$anon$1(changes.yn)).a6(a1.fL)) {
+    var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
+    var this$ = a1.gn;
+    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.bh.aK, 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 {
+      var x0 = this$.j();
+      var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      var t = h;
+      var rest = this$.m();
+      while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+        var x0$1 = rest.j();
+        var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        t.M = nx;
+        t = nx;
+        rest = rest.m();
+      }
+      var $x_1 = h;
+    }
+    var members1ByName = $x_2.al($x_1);
+    var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
+    var this$$2 = a2.gn;
+    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.bh.aK, 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 {
+      var x0$2 = this$$2.j();
+      var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+      var t$1 = h$1;
+      var rest$1 = this$$2.m();
+      while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+        var x0$3 = rest$1.j();
+        var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        t$1.M = nx$1;
+        t$1 = nx$1;
+        rest$1 = rest$1.m();
+      }
+      var $x_3 = h$1;
+    }
+    var members2ByName = $x_4.al($x_3);
+    var names1 = members1ByName.bO();
+    var names2 = members2ByName.bO();
+    var removedNames = names1.c1(names2);
+    var addedNames = names2.c1(names1);
+    var keptNames = names1.f9(names2);
+    var keptMembers = keptNames.N(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$().a3($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [newRef]))));
+    })));
+    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.x(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.x(name$2$2$2))))), keptMembers])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)));
+  } else {
+    var members1 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(a1.gn);
+    var members2 = $j_java$002elang$002e$002dObject.$m_sci_Set$().a3(a2.gn);
+    var removedMembers = members1.c1(members2);
+    var addedMembers = members2.c1(members1);
+    var keptMembers$2 = members1.f9(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$().a3($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.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])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)));
+  }
 }
 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.d6;
+  var this$1 = d1.d2;
   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.cp, 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$();
@@ -335,19 +454,19 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     var x0 = this$1.j();
     var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
     var t = h;
-    var rest = this$1.n();
+    var rest = this$1.m();
     while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var x0$1 = rest.j();
       var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       t.M = nx;
       t = nx;
-      rest = rest.n();
+      rest = rest.m();
     }
     var $x_1 = h;
   }
-  var members1 = $x_2.am($x_1);
+  var members1 = $x_2.al($x_1);
   var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-  var this$4 = d2.d6;
+  var this$4 = d2.d2;
   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.cp, 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$();
@@ -355,29 +474,29 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
     var x0$2 = this$4.j();
     var h$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
     var t$1 = h$1;
-    var rest$1 = this$4.n();
+    var rest$1 = this$4.m();
     while ((rest$1 !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var x0$3 = rest$1.j();
       var nx$1 = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f$1(x0$3), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       t$1.M = nx$1;
       t$1 = nx$1;
-      rest$1 = rest$1.n();
+      rest$1 = rest$1.m();
     }
     var $x_3 = h$1;
   }
-  var members2 = $x_4.am($x_3);
-  var names1 = members1.bX();
-  var names2 = members2.bX();
-  var removedMembers = names1.cg(names2);
-  var addedMembers = names2.cg(names1);
-  var keptMembers = names1.fq(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 members2 = $x_4.al($x_3);
+  var names1 = members1.bO();
+  var names2 = members2.bO();
+  var removedMembers = names1.c1(names2);
+  var addedMembers = names2.c1(names1);
+  var keptMembers = names1.f9(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.x(name$2$2), members2.x(name$2$2)))));
   var changedFields = keptFields.ba(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.C();
+      var f1 = x0$1$2$2.D();
       var f2 = x0$1$2$2.z();
-      var x = f1.bj;
-      var x$2 = f2.bj;
+      var x = f1.bl;
+      var x$2 = f2.bl;
       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);
@@ -385,39 +504,39 @@ function $p_Lio_septimalmind_baboon_typer_BaboonComparator$BaboonComparatorImpl_
   })));
   var unchangedFields = keptFields.ba(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.C();
+      var f1$1 = x0$2$2$2.D();
       var f2$1 = x0$2$2$2.z();
-      var x$1 = f1$1.bj;
-      var x$2$1 = f2$1.bj;
+      var x$1 = f1$1.bl;
+      var x$2$1 = f2$1.bl;
       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);
     }
-  }))).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$3$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.amu.x4(f2$2.bj)));
+      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.amG.x4(f2$2.bl)));
     } 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$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.C(), id$2$2$2.z().bj)))), unchangedFields])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)));
+  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.x(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.x(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.D(), id$2$2$2.z().bl)))), unchangedFields])), $j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)));
 }
 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.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => changes.aEH().a6(id$2$2)))) ? (directRefs.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => changes.uW.a6(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.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => changes.uX.a6(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$().c3(directRefs.cD(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => (changes.uY.a6(id$2$2$3) || changes.uV.a6(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.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => changes.aEV().a6(id$2$2)))) ? (directRefs.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$1) => changes.uV.a6(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.ej(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$2) => changes.uW.a6(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.cD(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2$3) => (changes.uX.a6(id$2$2$3) || changes.uU.a6(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.amu = null;
-  this.amw = null;
-  this.amv = null;
-  this.mB = null;
-  this.amu = enquiries;
-  this.amw = rules;
-  this.amv = logger;
-  this.mB = evidence$1;
+  this.amG = null;
+  this.amI = null;
+  this.amH = null;
+  this.kf = null;
+  this.amG = enquiries;
+  this.amI = rules;
+  this.amH = logger;
+  this.kf = 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();
@@ -427,14 +546,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.aGO = (function(pkg, versions) {
-  var set = versions.bX();
+$p.aH2 = (function(pkg, versions) {
+  var set = versions.bO();
   $j_java$002elang$002e$002dObject.$m_s_Predef$().e2((!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$().a48.fG());
+  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$().a4i.fH());
   var pinnacleVersion = sortedVersions.j();
   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.amv;
-  var $x_5 = $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(pkg.fw, "", ".", "");
+  var $x_6 = this.amH;
+  var $x_5 = $j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(pkg.fx, "", ".", "");
   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$();
@@ -445,17 +564,17 @@ $p.aGO = (function(pkg, versions) {
     var x0 = toCompare.j();
     var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
     var t = h;
-    var rest = toCompare.n();
+    var rest = toCompare.m();
     while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
       var x0$1 = rest.j();
       var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
       t.M = nx;
       t = nx;
-      rest = rest.n();
+      rest = rest.m();
     }
     var $x_1 = h;
   }
-  $x_6.agO($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, "", "; ", ""))])));
+  $x_6.ah0($x_5, $x_4.n($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 {
@@ -476,11 +595,11 @@ $p.aGO = (function(pkg, versions) {
           if ((p3 instanceof $j_java$002elang$002e$002dObject.$c_sci_$colon$colon)) {
             var old = p3.i9;
             if ($j_java$002elang$002e$002dObject.$m_sci_Nil$().b(p3.M)) {
-              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.mB);
+              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.kf);
               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.Ne, b));
+                var b = r.G;
+                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.Nk, b));
                 break matchEnd8;
               } else {
                 var $x_8 = r;
@@ -489,61 +608,61 @@ $p.aGO = (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$().aO(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$().aN(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;
         allGood = false;
-        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.az);
+        $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
       } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var v = x1.H;
-        good = good.gR(v);
+        var v = x1.G;
+        good = good.gz(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.aT(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bd())));
+    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.bc())));
   }
-  var this$34 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.mB);
+  var this$34 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.kf);
   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 b$1 = r$1.G;
     var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
     var it = b$1.o();
     while (it.f()) {
       var elem = it.e();
-      var key = elem.C();
-      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).al(elem);
+      var key = elem.D();
+      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_java$002elang$002e$002dObject.$c_scm_ListBuffer()))).am(elem);
     }
-    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
+    var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
     var mapIt = m.o();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var k = x1$1.C();
+      var k = x1$1.D();
       var v$1 = x1$1.z();
       result = result.ch(k, v$1.aq());
     }
     var grouped = result;
     var bad$1 = grouped.eT(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-    var this$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$().am(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$().aO(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$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aB()))))), $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.mB);
+    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$().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$().aN(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.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.kf);
     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 b$2 = r$2.G;
+      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.C();
+          var v$2 = x0$2$2$2.D();
           var diff = x0$2$2$2.z();
-          var $x_10 = this.amw;
-          var k$1 = v$2.mD;
+          var $x_10 = this.amI;
+          var k$1 = v$2.mE;
           var $x_9 = versions.x(k$1);
-          var k$2 = v$2.p8;
-          var this$54 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_10.aFn($x_9, versions.x(k$2), diff), this.mB);
+          var k$2 = v$2.pa;
+          var this$54 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_10.aFB($x_9, versions.x(k$2), diff), this.kf);
           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);
+          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.G)) : r$3);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$2$2$2);
         }
@@ -560,43 +679,43 @@ $p.aGO = (function(pkg, versions) {
         if ((x0$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
           var e$1 = x0$6.aj;
           allGood$1 = false;
-          $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$1.az);
+          $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$1.ay);
         } else if ((x0$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var v$3 = x0$6.H;
-          good$1 = good$1.gR(v$3);
+          var v$3 = x0$6.G;
+          good$1 = good$1.gz(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.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.bd()))), this.mB);
+      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.bc()))), this.kf);
       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 b$4 = r$4.G;
         var m$1 = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
         var it$1 = b$4.o();
         while (it$1.f()) {
           var elem$1 = it$1.e();
-          var key$1 = elem$1.C();
-          m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$69) => (() => this$69.dT()))(b$4))).al(elem$1);
+          var key$1 = elem$1.D();
+          m$1.cq(key$1, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$69) => (() => this$69.dT()))(b$4))).am(elem$1);
         }
-        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
+        var result$1 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
         var mapIt$1 = m$1.o();
         while (mapIt$1.f()) {
           var x1$2 = mapIt$1.e();
           if ((x1$2 === null)) {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
           }
-          var k$3 = x1$2.C();
+          var k$3 = x1$2.D();
           var v$4 = x1$2.z();
           result$1 = result$1.ch(k$3, v$4.aq());
         }
         var grouped$1 = result$1;
         var bad$3 = grouped$1.eT(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.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b$4.fc($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bg)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dRuleset.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniqueRuleset($j_java$002elang$002e$002dObject.$m_sci_Map$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$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()))).aB()))))), $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.mB);
+        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.eX($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aN(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$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.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.kf);
         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$().cS(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 b$5 = r$5.G;
+          var xs = $j_java$002elang$002e$002dObject.$m_sci_Seq$().cT(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.i9;
               var p3$1 = x0$3$2$2.M;
@@ -613,29 +732,29 @@ $p.aGO = (function(pkg, versions) {
           var it$2 = xs.o();
           while (it$2.f()) {
             var elem$2 = it$2.e();
-            var key$2 = elem$2.C();
-            m$2.cq(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$89) => (() => this$89.dT()))(xs))).al(elem$2);
+            var key$2 = elem$2.D();
+            m$2.cq(key$2, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$89) => (() => this$89.dT()))(xs))).am(elem$2);
           }
-          var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bV;
+          var result$2 = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
           var mapIt$2 = m$2.o();
           while (mapIt$2.f()) {
             var x1$3 = mapIt$2.e();
             if ((x1$3 === null)) {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$3);
             }
-            var k$4 = x1$3.C();
+            var k$4 = x1$3.D();
             var v$5 = x1$3.z();
             result$2 = result$2.ch(k$4, v$5.aq());
           }
           var grouped$2 = result$2;
           var bad$4 = grouped$2.eT(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.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Map$().am(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aO(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dNon$002dUnique$002dPrev$002dVersions.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$NonUniquePrevVersions($j_java$002elang$002e$002dObject.$m_sci_Map$().am(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$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()))).aB()))))), $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.mB);
+          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$().al(xs)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aN(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$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.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.kf);
           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.Iy()), this.mB);
+            var b$6 = r$6.G;
+            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.IG()), this.kf);
             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);
+            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.G)) : r$7);
           } else {
             return r$6;
           }
@@ -653,8 +772,8 @@ $p.aGO = (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", ({
-  wZ: 1,
-  j4: 1
+  x4: 1,
+  j7: 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