@tuprolog/2p-full 0.31.5-dev0a → 0.31.5-dev0f

package/2p-oop-lib.js

@@ -163,18 +163,18 @@
   setMetadataFor(Value, 'Value', classMeta, Result, undefined, undefined, undefined, []);
   setMetadataFor(Companion_2, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
   function convert(term) {
-    return this.k3q(this.m3q(term), term);
+    return this.h3q(this.j3q(term), term);
   }
   setMetadataFor(TermToObjectConverter, 'TermToObjectConverter', interfaceMeta, undefined, undefined, undefined, undefined, []);
   setMetadataFor(Companion_3, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
   function typeRefFromName(typeName) {
-    var tmp = Companion_getInstance().pq(this.p3q(typeName));
-    return tmp.ht(TypeFactory$typeRefFromName$lambda).b1();
+    var tmp = Companion_getInstance().mq(this.m3q(typeName));
+    return tmp.et(TypeFactory$typeRefFromName$lambda).b1();
   }
   setMetadataFor(TypeFactory, 'TypeFactory', interfaceMeta, undefined, undefined, undefined, undefined, []);
   setMetadataFor(Companion_4, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
   function create(objectConverter, arguments_0) {
-    return this.s3q(objectConverter, listOf(arguments_0.slice()));
+    return this.p3q(objectConverter, listOf(arguments_0.slice()));
   }
   setMetadataFor(TypeRef, 'TypeRef', interfaceMeta, undefined, [Ref], undefined, undefined, []);
   setMetadataFor(OopException, 'OopException', classMeta, TuPrologException, undefined, undefined, undefined, []);
@@ -228,11 +228,11 @@
   }
   function OOP() {
     OOP_instance = this;
-    this.o3p_1 = '.';
-    this.p3p_1 = ':=';
-    this.q3p_1 = '$';
-    this.r3p_1 = 'as';
-    this.s3p_1 = 'alias';
+    this.l3p_1 = '.';
+    this.m3p_1 = ':=';
+    this.n3p_1 = '$';
+    this.o3p_1 = 'as';
+    this.p3p_1 = 'alias';
   }
   var OOP_instance;
   function OOP_getInstance() {
@@ -244,10 +244,10 @@
     OOPLib_instance = this;
     AbstractLibrary.call(this);
   }
-  OOPLib.prototype.o2e = function () {
+  OOPLib.prototype.l2e = function () {
     return 'prolog.oop';
   };
-  OOPLib.prototype.n2e = function () {
+  OOPLib.prototype.k2e = function () {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.map' call
     var tmp0_map = listOf([ArrayItems_getInstance(), Assign_getInstance(), Cast_getInstance(), Type_getInstance(), InvokeMethod_getInstance(), InvokeStrict_getInstance(), ListItems_getInstance(), NewObject3_getInstance(), NullRef_getInstance(), ObjectRef_getInstance(), Ref_getInstance(), Register_getInstance(), SetItems_getInstance(), TypeRef_getInstance(), Unregister_getInstance()]);
@@ -256,12 +256,12 @@
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.j();
     while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.p();
+      var item = tmp0_iterator.n();
       var tmp$ret$1;
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.OOPLib.<get-primitives>.<anonymous>' call
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.descriptionPair' call
-      tmp$ret$0 = to(item.signature, item.j1u());
+      tmp$ret$0 = to(item.signature, item.g1u());
       tmp$ret$1 = tmp$ret$0;
       tmp0_mapTo.g(tmp$ret$1);
     }
@@ -269,26 +269,26 @@
     tmp$ret$3 = tmp$ret$2;
     return toMap(tmp$ret$3);
   };
-  OOPLib.prototype.t1l = function () {
+  OOPLib.prototype.q1l = function () {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = listOf(arrayConcat([[Cast_getInstance_0(), Invocation_getInstance(), Assignment_getInstance(), Dot_getInstance(), Recursive_getInstance(), Couple_getInstance(), Trivial_getInstance(), NewObject2_getInstance(), Recursive_getInstance_0(), Base_getInstance(), Companion_getInstance_27().v3p('string', PrimitiveClasses_getInstance().ee()), Companion_getInstance_27().v3p('array', PrimitiveClasses_getInstance().de()), Companion_getInstance_27().v3p('list', getKClass(List)), Companion_getInstance_27().v3p('arraylist', getKClass(ArrayList)), Companion_getInstance_27().v3p('map', getKClass(Map)), Companion_getInstance_27().v3p('hashmap', getKClass(LinkedHashMap)), Companion_getInstance_27().v3p('int', PrimitiveClasses_getInstance().ae()), Companion_getInstance_27().v3p('integer', PrimitiveClasses_getInstance().ae()), Companion_getInstance_27().v3p('double', PrimitiveClasses_getInstance().ce()), Companion_getInstance_27().v3p('float', PrimitiveClasses_getInstance().be()), Companion_getInstance_27().v3p('long', getKClass(Long)), Companion_getInstance_27().v3p('short', PrimitiveClasses_getInstance().zd()), Companion_getInstance_27().v3p('byte', PrimitiveClasses_getInstance().yd()), Companion_getInstance_27().v3p('char', getKClass(Char)), Companion_getInstance_27().v3p('bool', PrimitiveClasses_getInstance().xd()), Companion_getInstance_27().v3p('boolean', PrimitiveClasses_getInstance().xd()), Companion_getInstance_27().v3p('any', PrimitiveClasses_getInstance().ud()), Companion_getInstance_27().v3p('nothing', PrimitiveClasses_getInstance().wd()), Companion_getInstance_27().v3p('big_integer', getKClass(BigInteger)), Companion_getInstance_27().v3p('big_decimal', getKClass(BigDecimal))], get_platformSpecificAliases()]));
+    var tmp0_map = listOf(arrayConcat([[Cast_getInstance_0(), Invocation_getInstance(), Assignment_getInstance(), Dot_getInstance(), Recursive_getInstance(), Couple_getInstance(), Trivial_getInstance(), NewObject2_getInstance(), Recursive_getInstance_0(), Base_getInstance(), Companion_getInstance_27().s3p('string', PrimitiveClasses_getInstance().ee()), Companion_getInstance_27().s3p('array', PrimitiveClasses_getInstance().de()), Companion_getInstance_27().s3p('list', getKClass(List)), Companion_getInstance_27().s3p('arraylist', getKClass(ArrayList)), Companion_getInstance_27().s3p('map', getKClass(Map)), Companion_getInstance_27().s3p('hashmap', getKClass(LinkedHashMap)), Companion_getInstance_27().s3p('int', PrimitiveClasses_getInstance().ae()), Companion_getInstance_27().s3p('integer', PrimitiveClasses_getInstance().ae()), Companion_getInstance_27().s3p('double', PrimitiveClasses_getInstance().ce()), Companion_getInstance_27().s3p('float', PrimitiveClasses_getInstance().be()), Companion_getInstance_27().s3p('long', getKClass(Long)), Companion_getInstance_27().s3p('short', PrimitiveClasses_getInstance().zd()), Companion_getInstance_27().s3p('byte', PrimitiveClasses_getInstance().yd()), Companion_getInstance_27().s3p('char', getKClass(Char)), Companion_getInstance_27().s3p('bool', PrimitiveClasses_getInstance().xd()), Companion_getInstance_27().s3p('boolean', PrimitiveClasses_getInstance().xd()), Companion_getInstance_27().s3p('any', PrimitiveClasses_getInstance().ud()), Companion_getInstance_27().s3p('nothing', PrimitiveClasses_getInstance().wd()), Companion_getInstance_27().s3p('big_integer', getKClass(BigInteger)), Companion_getInstance_27().s3p('big_decimal', getKClass(BigDecimal))], get_platformSpecificAliases()]));
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.j();
     while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.p();
+      var item = tmp0_iterator.n();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.OOPLib.<get-clauses>.<anonymous>' call
-      tmp$ret$0 = item.j1u();
+      tmp$ret$0 = item.g1u();
       tmp0_mapTo.g(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  OOPLib.prototype.h1v = function () {
+  OOPLib.prototype.e1v = function () {
     return OperatorSet_init_$Create$([new Operator('.', Specifier_XFY_getInstance(), 800), new Operator(':=', Specifier_XFX_getInstance(), 850), new Operator('as', Specifier_XFX_getInstance(), 200), new Operator('$', Specifier_FX_getInstance(), 100)]);
   };
   var OOPLib_instance;
@@ -302,15 +302,15 @@
   }
   function Companion() {
     Companion_instance = this;
-    this.w3p_1 = NullRefImpl_getInstance();
+    this.t3p_1 = NullRefImpl_getInstance();
   }
-  Companion.prototype.x3p = function (any) {
+  Companion.prototype.u3p = function (any) {
     var tmp0_subject = any;
     return tmp0_subject == null ? nameOf(this, PrimitiveClasses_getInstance().wd(), 'null') : nameOf(this, getKClassFromExpression(any), get_identifier(any));
   };
-  Companion.prototype.y3p = function (any) {
+  Companion.prototype.v3p = function (any) {
     var tmp0_subject = any;
-    return tmp0_subject == null ? this.w3p_1 : new ObjectRefImpl(any);
+    return tmp0_subject == null ? this.t3p_1 : new ObjectRefImpl(any);
   };
   var Companion_instance;
   function Companion_getInstance_19() {
@@ -322,7 +322,7 @@
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.z3p_1 = new ObjectToTermConverterImpl();
+    this.w3p_1 = new ObjectToTermConverterImpl();
   }
   var Companion_instance_0;
   function Companion_getInstance_20() {
@@ -333,7 +333,7 @@
   function Companion_1() {
     Companion_instance_1 = this;
   }
-  Companion_1.prototype.a3q = function (type, termToObjectConverter) {
+  Companion_1.prototype.x3p = function (type, termToObjectConverter) {
     return overloadSelector(type, termToObjectConverter);
   };
   var Companion_instance_1;
@@ -348,19 +348,19 @@
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = termValue$factory();
-    tmp$ret$0 = $this.c3q_1.b1();
+    tmp$ret$0 = $this.z3p_1.b1();
     return tmp$ret$0;
   }
   function _get_objectRef__3zhern($this) {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = objectRef$factory();
-    tmp$ret$0 = $this.d3q_1.b1();
+    tmp$ret$0 = $this.a3q_1.b1();
     return tmp$ret$0;
   }
   function Result$Value$termValue$delegate$lambda(this$0) {
     return function () {
-      return Companion_getInstance_20().z3p_1.e3q(this$0.b3q_1);
+      return Companion_getInstance_20().w3p_1.b3q(this$0.y3p_1);
     };
   }
   function Result$Value$objectRef$delegate$lambda(this$0) {
@@ -375,7 +375,7 @@
       if (isInterface(tmp0_let, ObjectRef)) {
         tmp = tmp0_let;
       } else {
-        tmp = Companion_getInstance_19().y3p(this$0.b3q_1);
+        tmp = Companion_getInstance_19().v3p(this$0.y3p_1);
       }
       tmp$ret$0 = tmp;
       tmp$ret$1 = tmp$ret$0;
@@ -384,26 +384,26 @@
   }
   function Value(value) {
     Result.call(this);
-    this.b3q_1 = value;
+    this.y3p_1 = value;
     var tmp = this;
-    tmp.c3q_1 = lazy(Result$Value$termValue$delegate$lambda(this));
+    tmp.z3p_1 = lazy(Result$Value$termValue$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.d3q_1 = lazy(Result$Value$objectRef$delegate$lambda(this));
+    tmp_0.a3q_1 = lazy(Result$Value$objectRef$delegate$lambda(this));
   }
-  Value.prototype.r1i = function () {
+  Value.prototype.o1i = function () {
     return _get_termValue__ikgccs(this);
   };
   Value.prototype.toTerm = function () {
-    return this.r1i();
+    return this.o1i();
   };
-  Value.prototype.f3q = function () {
+  Value.prototype.c3q = function () {
     return _get_objectRef__3zhern(this);
   };
   Value.prototype.toString = function () {
-    return 'Value(value=' + toString(this.b3q_1) + ')';
+    return 'Value(value=' + toString(this.y3p_1) + ')';
   };
   Value.prototype.hashCode = function () {
-    return this.b3q_1 == null ? 0 : hashCode(this.b3q_1);
+    return this.y3p_1 == null ? 0 : hashCode(this.y3p_1);
   };
   Value.prototype.equals = function (other) {
     if (this === other)
@@ -411,7 +411,7 @@
     if (!(other instanceof Value))
       return false;
     var tmp0_other_with_cast = other instanceof Value ? other : THROW_CCE();
-    if (!equals(this.b3q_1, tmp0_other_with_cast.b3q_1))
+    if (!equals(this.y3p_1, tmp0_other_with_cast.y3p_1))
       return false;
     return true;
   };
@@ -433,18 +433,18 @@
   function Companion_2() {
     Companion_instance_2 = this;
     var tmp = this;
-    tmp.g3q_1 = this.h3q(null, null, 3, null);
+    tmp.d3q_1 = this.e3q(null, null, 3, null);
   }
-  Companion_2.prototype.i3q = function (typeFactory, dealiaser) {
+  Companion_2.prototype.f3q = function (typeFactory, dealiaser) {
     return new TermToObjectConverterImpl(typeFactory, dealiaser);
   };
-  Companion_2.prototype.h3q = function (typeFactory, dealiaser, $mask0, $handler) {
+  Companion_2.prototype.e3q = function (typeFactory, dealiaser, $mask0, $handler) {
     if (!(($mask0 & 1) === 0))
-      typeFactory = Companion_getInstance_23().j3q_1;
+      typeFactory = Companion_getInstance_23().g3q_1;
     if (!(($mask0 & 2) === 0)) {
       dealiaser = TermToObjectConverter$Companion$of$lambda;
     }
-    return this.i3q(typeFactory, dealiaser);
+    return this.f3q(typeFactory, dealiaser);
   };
   var Companion_instance_2;
   function Companion_getInstance_22() {
@@ -456,7 +456,7 @@
   }
   function Companion_3() {
     Companion_instance_3 = this;
-    this.j3q_1 = new TypeFactoryImpl();
+    this.g3q_1 = new TypeFactoryImpl();
   }
   var Companion_instance_3;
   function Companion_getInstance_23() {
@@ -465,14 +465,14 @@
     return Companion_instance_3;
   }
   function TypeFactory$typeRefFromName$lambda(it) {
-    return Companion_getInstance_24().o3q(it);
+    return Companion_getInstance_24().l3q(it);
   }
   function TypeFactory() {
   }
   function Companion_4() {
     Companion_instance_4 = this;
   }
-  Companion_4.prototype.o3q = function (type) {
+  Companion_4.prototype.l3q = function (type) {
     return new TypeRefImpl(type);
   };
   var Companion_instance_4;
@@ -502,7 +502,7 @@
   }
   function create_0(_this__u8e3s4, objectConverter, arguments_0) {
     init_properties_TypeUtils_kt_oih1j7();
-    var constructorRef = Companion_getInstance_21().a3q(_this__u8e3s4, objectConverter).t3q(arguments_0);
+    var constructorRef = Companion_getInstance_21().x3p(_this__u8e3s4, objectConverter).q3q(arguments_0);
     return callWithPrologArguments$default(constructorRef, objectConverter, arguments_0, null, 4, null);
   }
   function invoke_0(_this__u8e3s4, objectConverter, methodName, arguments_0) {
@@ -511,7 +511,7 @@
   }
   function invoke_1(_this__u8e3s4, objectConverter, methodName, arguments_0, instance) {
     init_properties_TypeUtils_kt_oih1j7();
-    var methodRef = Companion_getInstance_21().a3q(_this__u8e3s4, objectConverter).u3q(methodName, arguments_0);
+    var methodRef = Companion_getInstance_21().x3p(_this__u8e3s4, objectConverter).r3q(methodName, arguments_0);
     return callWithPrologArguments(methodRef, objectConverter, arguments_0, instance);
   }
   function assign_0(_this__u8e3s4, objectConverter, propertyName, value) {
@@ -520,7 +520,7 @@
   }
   function assign_1(_this__u8e3s4, objectConverter, propertyName, value, instance) {
     init_properties_TypeUtils_kt_oih1j7();
-    var setterRef = get_setterMethod(Companion_getInstance_21().a3q(_this__u8e3s4, objectConverter).v3q(propertyName, value));
+    var setterRef = get_setterMethod(Companion_getInstance_21().x3p(_this__u8e3s4, objectConverter).s3q(propertyName, value));
     return callWithPrologArguments(setterRef, objectConverter, listOf_0(value), instance);
   }
   function isSubtypeOf_0(_this__u8e3s4, other, strict) {
@@ -540,13 +540,13 @@
     var index = 0;
     var tmp0_iterator = arguments_0.j();
     while (tmp0_iterator.m()) {
-      var item = tmp0_iterator.p();
+      var item = tmp0_iterator.n();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.callWithPrologArguments.<anonymous>' call
       var tmp1 = index;
       index = tmp1 + 1 | 0;
       var tmp0__anonymous__q1qw7t = checkIndexOverflow(tmp1);
-      tmp$ret$0 = converter.k3q(formalArgumentsTypes.n(tmp0__anonymous__q1qw7t), item);
+      tmp$ret$0 = converter.h3q(formalArgumentsTypes.o(tmp0__anonymous__q1qw7t), item);
       tmp0_mapIndexedTo.g(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapIndexedTo;
@@ -569,7 +569,7 @@
       var tmp0_any = allSupertypes(other, strict);
       var tmp0_iterator = tmp0_any.j();
       while (tmp0_iterator.m()) {
-        var element = tmp0_iterator.p();
+        var element = tmp0_iterator.n();
         var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.libs.oop.isSupertypeOf.<anonymous>' call
         tmp$ret$0 = element.equals(_this__u8e3s4);
@@ -590,7 +590,7 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.libs.oop.ensureArgumentsListIsOfSize.<anonymous>' call
     // Inline function 'kotlin.require' call
-    var tmp0_require = get_formalParameterTypes(_this__u8e3s4).o() === actualArguments.o();
+    var tmp0_require = get_formalParameterTypes(_this__u8e3s4).p() === actualArguments.p();
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_require) {
       var tmp$ret$3;
@@ -603,7 +603,7 @@
       var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_also, 10));
       var tmp0_iterator = tmp0_also.j();
       while (tmp0_iterator.m()) {
-        var item = tmp0_iterator.p();
+        var item = tmp0_iterator.n();
         var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.libs.oop.ensureArgumentsListIsOfSize.<anonymous>.<anonymous>.<anonymous>' call
         tmp$ret$0 = get_name(item);
@@ -611,7 +611,7 @@
       }
       tmp$ret$1 = tmp0_mapTo;
       tmp$ret$2 = tmp$ret$1;
-      var tmp_0 = '\n            |\n            |Error while invoking ' + tmp + ' the expected argument types \n            |   ' + tmp$ret$2 + ' \n            |are not as many as the as the actual parameters (' + tmp0_also.o() + ' vs. ' + actualArguments.o() + '):\n            |   ' + actualArguments + '\n            |\n            ';
+      var tmp_0 = '\n            |\n            |Error while invoking ' + tmp + ' the expected argument types \n            |   ' + tmp$ret$2 + ' \n            |are not as many as the as the actual parameters (' + tmp0_also.p() + ' vs. ' + actualArguments.p() + '):\n            |   ' + actualArguments + '\n            |\n            ';
       tmp$ret$3 = trimMargin$default(tmp_0, null, 1, null);
       var message = tmp$ret$3;
       throw IllegalArgumentException_init_$Create$(toString_0(message));
@@ -636,13 +636,13 @@
   function MalformedAliasException(dealiasingExpression) {
     var tmp = 'This is not a dealiasing expression `' + dealiasingExpression + '` in the form ' + format(get_DEALIASING_TEMPLATE(), Companion_getInstance_0().prettyExpressionsPrettyVariablesDefaultOperators());
     OopException_init_$Init$_0(tmp, null, 2, null, this);
-    this.w3q_1 = dealiasingExpression;
+    this.t3q_1 = dealiasingExpression;
     captureStack(this, MalformedAliasException);
   }
-  MalformedAliasException.prototype.x3q = function (context, signature) {
+  MalformedAliasException.prototype.u3q = function (context, signature) {
     var tmp = Companion_getInstance_1();
     var tmp_0 = Expected_DEALIASING_EXPRESSION_getInstance();
-    var tmp_1 = this.i26();
+    var tmp_1 = this.f26();
     var tmp_2 = signature.toIndicator();
     var tmp0_safe_receiver = this.message;
     var tmp_3;
@@ -687,15 +687,15 @@
     }
     return tmp.of(context, tmp_0, tmp_1, 'Error in ' + tmp_2 + ': ' + tmp_3);
   };
-  MalformedAliasException.prototype.i26 = function () {
-    return this.w3q_1;
+  MalformedAliasException.prototype.f26 = function () {
+    return this.t3q_1;
   };
   function NoSuchAnAliasException(dealiasingExpression) {
     var tmp = 'There exists no reference whose alias is `' + dealiasingExpression.get(0) + '`';
     OopException_init_$Init$_0(tmp, null, 2, null, this);
-    this.y3q_1 = dealiasingExpression;
+    this.v3q_1 = dealiasingExpression;
     // Inline function 'kotlin.require' call
-    var tmp0_require = Companion_getInstance_2().matches(this.y3q_1, get_DEALIASING_TEMPLATE());
+    var tmp0_require = Companion_getInstance_2().matches(this.v3q_1, get_DEALIASING_TEMPLATE());
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -707,7 +707,7 @@
       throw IllegalArgumentException_init_$Create$(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    var tmp_0 = this.y3q_1.get(0);
+    var tmp_0 = this.v3q_1.get(0);
     var tmp1_require = isInterface(tmp_0, Struct);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
@@ -721,15 +721,15 @@
     }
     captureStack(this, NoSuchAnAliasException);
   }
-  NoSuchAnAliasException.prototype.x3q = function (context, signature) {
+  NoSuchAnAliasException.prototype.u3q = function (context, signature) {
     var tmp = Companion_getInstance_3();
     var tmp_0 = ObjectType_OOP_ALIAS_getInstance();
-    var tmp_1 = this.i26();
+    var tmp_1 = this.f26();
     var tmp0_elvis_lhs = this.message;
     return tmp.of(context, tmp_0, tmp_1, tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs);
   };
-  NoSuchAnAliasException.prototype.i26 = function () {
-    return this.y3q_1;
+  NoSuchAnAliasException.prototype.f26 = function () {
+    return this.v3q_1;
   };
   function OopException_init_$Init$(message, cause, $this) {
     TuPrologException_init_$Init$(message, cause, $this);
@@ -784,349 +784,349 @@
     var tmp1_elvis_lhs = tmp;
     var tmp_0 = tmp1_elvis_lhs == null ? 'Term `' + term + '` cannot be converted into an object' : tmp1_elvis_lhs;
     OopException_init_$Init$_0(tmp_0, null, 2, null, this);
-    this.z3q_1 = term;
-    this.a3r_1 = targetType;
+    this.w3q_1 = term;
+    this.x3q_1 = targetType;
     captureStack(this, TermToObjectConversionException);
   }
-  TermToObjectConversionException.prototype.x3q = function (context, signature) {
-    return Companion_getInstance_4().b28(context, signature, Limit_OOP_OBJECT_getInstance(), this);
+  TermToObjectConversionException.prototype.u3q = function (context, signature) {
+    return Companion_getInstance_4().y27(context, signature, Limit_OOP_OBJECT_getInstance(), this);
   };
   function NullRefImpl() {
     NullRefImpl_instance = this;
-    this.b3r_1 = Companion_getInstance_5().of(Companion_getInstance_19().x3p(null));
+    this.y3q_1 = Companion_getInstance_5().of(Companion_getInstance_19().u3p(null));
   }
-  NullRefImpl.prototype.gw = function () {
-    return this.b3r_1.gw();
-  };
-  NullRefImpl.prototype.yw = function () {
-    return this.b3r_1.yw();
-  };
-  NullRefImpl.prototype.zv = function () {
-    return this.b3r_1.zv();
+  NullRefImpl.prototype.dw = function () {
+    return this.y3q_1.dw();
   };
-  NullRefImpl.prototype.fw = function () {
-    return this.b3r_1.fw();
+  NullRefImpl.prototype.vw = function () {
+    return this.y3q_1.vw();
   };
-  NullRefImpl.prototype.xw = function () {
-    return this.b3r_1.xw();
+  NullRefImpl.prototype.wv = function () {
+    return this.y3q_1.wv();
   };
-  NullRefImpl.prototype.aw = function () {
-    return this.b3r_1.aw();
+  NullRefImpl.prototype.cw = function () {
+    return this.y3q_1.cw();
   };
-  NullRefImpl.prototype.tw = function () {
-    return this.b3r_1.tw();
+  NullRefImpl.prototype.uw = function () {
+    return this.y3q_1.uw();
   };
-  NullRefImpl.prototype.mw = function () {
-    return this.b3r_1.mw();
+  NullRefImpl.prototype.xv = function () {
+    return this.y3q_1.xv();
   };
-  NullRefImpl.prototype.sw = function () {
-    return this.b3r_1.sw();
+  NullRefImpl.prototype.qw = function () {
+    return this.y3q_1.qw();
   };
-  NullRefImpl.prototype.ow = function () {
-    return this.b3r_1.ow();
+  NullRefImpl.prototype.jw = function () {
+    return this.y3q_1.jw();
   };
-  NullRefImpl.prototype.bw = function () {
-    return this.b3r_1.bw();
+  NullRefImpl.prototype.pw = function () {
+    return this.y3q_1.pw();
   };
-  NullRefImpl.prototype.cw = function () {
-    return this.b3r_1.cw();
+  NullRefImpl.prototype.lw = function () {
+    return this.y3q_1.lw();
   };
-  NullRefImpl.prototype.pw = function () {
-    return this.b3r_1.pw();
+  NullRefImpl.prototype.yv = function () {
+    return this.y3q_1.yv();
   };
-  NullRefImpl.prototype.ew = function () {
-    return this.b3r_1.ew();
+  NullRefImpl.prototype.zv = function () {
+    return this.y3q_1.zv();
   };
-  NullRefImpl.prototype.ww = function () {
-    return this.b3r_1.ww();
+  NullRefImpl.prototype.mw = function () {
+    return this.y3q_1.mw();
   };
-  NullRefImpl.prototype.jx = function () {
-    return this.b3r_1.jx();
+  NullRefImpl.prototype.bw = function () {
+    return this.y3q_1.bw();
   };
-  NullRefImpl.prototype.uw = function () {
-    return this.b3r_1.uw();
+  NullRefImpl.prototype.tw = function () {
+    return this.y3q_1.tw();
   };
   NullRefImpl.prototype.gx = function () {
-    return this.b3r_1.gx();
+    return this.y3q_1.gx();
   };
   NullRefImpl.prototype.rw = function () {
-    return this.b3r_1.rw();
+    return this.y3q_1.rw();
   };
-  NullRefImpl.prototype.fx = function () {
-    return this.b3r_1.fx();
+  NullRefImpl.prototype.dx = function () {
+    return this.y3q_1.dx();
   };
-  NullRefImpl.prototype.hx = function () {
-    return this.b3r_1.hx();
+  NullRefImpl.prototype.ow = function () {
+    return this.y3q_1.ow();
   };
-  NullRefImpl.prototype.dx = function () {
-    return this.b3r_1.dx();
+  NullRefImpl.prototype.cx = function () {
+    return this.y3q_1.cx();
   };
-  NullRefImpl.prototype.nw = function () {
-    return this.b3r_1.nw();
+  NullRefImpl.prototype.ex = function () {
+    return this.y3q_1.ex();
   };
-  NullRefImpl.prototype.lw = function () {
-    return this.b3r_1.lw();
+  NullRefImpl.prototype.ax = function () {
+    return this.y3q_1.ax();
   };
-  NullRefImpl.prototype.dw = function () {
-    return this.b3r_1.dw();
+  NullRefImpl.prototype.kw = function () {
+    return this.y3q_1.kw();
   };
-  NullRefImpl.prototype.cx = function () {
-    return this.b3r_1.cx();
+  NullRefImpl.prototype.iw = function () {
+    return this.y3q_1.iw();
   };
-  NullRefImpl.prototype.qw = function () {
-    return this.b3r_1.qw();
+  NullRefImpl.prototype.aw = function () {
+    return this.y3q_1.aw();
   };
-  NullRefImpl.prototype.bx = function () {
-    return this.b3r_1.bx();
+  NullRefImpl.prototype.zw = function () {
+    return this.y3q_1.zw();
   };
-  NullRefImpl.prototype.kt = function () {
-    return this.b3r_1.kt();
+  NullRefImpl.prototype.nw = function () {
+    return this.y3q_1.nw();
+  };
+  NullRefImpl.prototype.yw = function () {
+    return this.y3q_1.yw();
+  };
+  NullRefImpl.prototype.ht = function () {
+    return this.y3q_1.ht();
   };
   NullRefImpl.prototype.b1 = function () {
-    return this.b3r_1.b1();
+    return this.y3q_1.b1();
   };
-  NullRefImpl.prototype.hw = function () {
-    return this.b3r_1.hw();
+  NullRefImpl.prototype.ew = function () {
+    return this.y3q_1.ew();
   };
   NullRefImpl.prototype.addFirst = function (argument) {
-    return this.b3r_1.addFirst(argument);
+    return this.y3q_1.addFirst(argument);
   };
   NullRefImpl.prototype.addLast = function (argument) {
-    return this.b3r_1.addLast(argument);
+    return this.y3q_1.addLast(argument);
   };
   NullRefImpl.prototype.append = function (argument) {
-    return this.b3r_1.append(argument);
+    return this.y3q_1.append(argument);
   };
-  NullRefImpl.prototype.kw = function () {
-    return this.b3r_1.kw();
+  NullRefImpl.prototype.hw = function () {
+    return this.y3q_1.hw();
   };
   NullRefImpl.prototype.asAtom = function () {
-    return this.kw();
+    return this.hw();
   };
   NullRefImpl.prototype.asBlock = function () {
-    return this.b3r_1.asBlock();
+    return this.y3q_1.asBlock();
   };
   NullRefImpl.prototype.asClause = function () {
-    return this.b3r_1.asClause();
+    return this.y3q_1.asClause();
   };
   NullRefImpl.prototype.asCons = function () {
-    return this.b3r_1.asCons();
+    return this.y3q_1.asCons();
   };
   NullRefImpl.prototype.asDirective = function () {
-    return this.b3r_1.asDirective();
+    return this.y3q_1.asDirective();
   };
   NullRefImpl.prototype.asEmptyBlock = function () {
-    return this.b3r_1.asEmptyBlock();
+    return this.y3q_1.asEmptyBlock();
   };
   NullRefImpl.prototype.asEmptyList = function () {
-    return this.b3r_1.asEmptyList();
+    return this.y3q_1.asEmptyList();
   };
   NullRefImpl.prototype.asFact = function () {
-    return this.b3r_1.asFact();
+    return this.y3q_1.asFact();
   };
   NullRefImpl.prototype.asIndicator = function () {
-    return this.b3r_1.asIndicator();
+    return this.y3q_1.asIndicator();
   };
   NullRefImpl.prototype.asInteger = function () {
-    return this.b3r_1.asInteger();
+    return this.y3q_1.asInteger();
   };
   NullRefImpl.prototype.asList = function () {
-    return this.b3r_1.asList();
+    return this.y3q_1.asList();
   };
   NullRefImpl.prototype.asNumeric = function () {
-    return this.b3r_1.asNumeric();
+    return this.y3q_1.asNumeric();
   };
   NullRefImpl.prototype.asReal = function () {
-    return this.b3r_1.asReal();
+    return this.y3q_1.asReal();
   };
   NullRefImpl.prototype.asRecursive = function () {
-    return this.b3r_1.asRecursive();
+    return this.y3q_1.asRecursive();
   };
   NullRefImpl.prototype.asRule = function () {
-    return this.b3r_1.asRule();
+    return this.y3q_1.asRule();
   };
-  NullRefImpl.prototype.vw = function () {
-    return this.b3r_1.vw();
+  NullRefImpl.prototype.sw = function () {
+    return this.y3q_1.sw();
   };
   NullRefImpl.prototype.asStruct = function () {
-    return this.vw();
+    return this.sw();
   };
   NullRefImpl.prototype.asTerm = function () {
-    return this.b3r_1.asTerm();
+    return this.y3q_1.asTerm();
   };
   NullRefImpl.prototype.asTruth = function () {
-    return this.b3r_1.asTruth();
+    return this.y3q_1.asTruth();
   };
   NullRefImpl.prototype.asTuple = function () {
-    return this.b3r_1.asTuple();
+    return this.y3q_1.asTuple();
   };
   NullRefImpl.prototype.asVar = function () {
-    return this.b3r_1.asVar();
+    return this.y3q_1.asVar();
   };
   NullRefImpl.prototype.castToAtom = function () {
-    return this.b3r_1.castToAtom();
+    return this.y3q_1.castToAtom();
   };
   NullRefImpl.prototype.castToBlock = function () {
-    return this.b3r_1.castToBlock();
+    return this.y3q_1.castToBlock();
   };
   NullRefImpl.prototype.castToClause = function () {
-    return this.b3r_1.castToClause();
+    return this.y3q_1.castToClause();
   };
   NullRefImpl.prototype.castToCons = function () {
-    return this.b3r_1.castToCons();
+    return this.y3q_1.castToCons();
   };
   NullRefImpl.prototype.castToConstant = function () {
-    return this.b3r_1.castToConstant();
+    return this.y3q_1.castToConstant();
   };
   NullRefImpl.prototype.castToDirective = function () {
-    return this.b3r_1.castToDirective();
+    return this.y3q_1.castToDirective();
   };
   NullRefImpl.prototype.castToEmptyBlock = function () {
-    return this.b3r_1.castToEmptyBlock();
+    return this.y3q_1.castToEmptyBlock();
   };
   NullRefImpl.prototype.castToEmptyList = function () {
-    return this.b3r_1.castToEmptyList();
+    return this.y3q_1.castToEmptyList();
   };
   NullRefImpl.prototype.castToFact = function () {
-    return this.b3r_1.castToFact();
+    return this.y3q_1.castToFact();
   };
   NullRefImpl.prototype.castToIndicator = function () {
-    return this.b3r_1.castToIndicator();
+    return this.y3q_1.castToIndicator();
   };
   NullRefImpl.prototype.castToInteger = function () {
-    return this.b3r_1.castToInteger();
+    return this.y3q_1.castToInteger();
   };
   NullRefImpl.prototype.castToList = function () {
-    return this.b3r_1.castToList();
+    return this.y3q_1.castToList();
   };
   NullRefImpl.prototype.castToNumeric = function () {
-    return this.b3r_1.castToNumeric();
+    return this.y3q_1.castToNumeric();
   };
   NullRefImpl.prototype.castToReal = function () {
-    return this.b3r_1.castToReal();
+    return this.y3q_1.castToReal();
   };
   NullRefImpl.prototype.castToRecursive = function () {
-    return this.b3r_1.castToRecursive();
+    return this.y3q_1.castToRecursive();
   };
   NullRefImpl.prototype.castToRule = function () {
-    return this.b3r_1.castToRule();
+    return this.y3q_1.castToRule();
   };
   NullRefImpl.prototype.castToStruct = function () {
-    return this.b3r_1.castToStruct();
+    return this.y3q_1.castToStruct();
   };
   NullRefImpl.prototype.castToTerm = function () {
-    return this.b3r_1.castToTerm();
+    return this.y3q_1.castToTerm();
   };
   NullRefImpl.prototype.castToTruth = function () {
-    return this.b3r_1.castToTruth();
+    return this.y3q_1.castToTruth();
   };
   NullRefImpl.prototype.castToTuple = function () {
-    return this.b3r_1.castToTuple();
+    return this.y3q_1.castToTuple();
   };
   NullRefImpl.prototype.castToVar = function () {
-    return this.b3r_1.castToVar();
+    return this.y3q_1.castToVar();
   };
-  NullRefImpl.prototype.ax = function (other) {
-    return this.b3r_1.ax(other);
+  NullRefImpl.prototype.xw = function (other) {
+    return this.y3q_1.xw(other);
   };
   NullRefImpl.prototype.aa = function (other) {
-    return this.ax((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
+    return this.xw((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   NullRefImpl.prototype.containsTag = function (name) {
-    return this.b3r_1.containsTag(name);
+    return this.y3q_1.containsTag(name);
   };
   NullRefImpl.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.b3r_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.y3q_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   NullRefImpl.prototype.equals = function (other) {
-    return this.b3r_1.equals(other);
+    return this.y3q_1.equals(other);
   };
   NullRefImpl.prototype.get = function (index) {
-    return this.b3r_1.get(index);
+    return this.y3q_1.get(index);
   };
   NullRefImpl.prototype.getArgAt = function (index) {
-    return this.b3r_1.getArgAt(index);
+    return this.y3q_1.getArgAt(index);
   };
   NullRefImpl.prototype.getTag = function (name) {
-    return this.b3r_1.getTag(name);
+    return this.y3q_1.getTag(name);
   };
   NullRefImpl.prototype.hashCode = function () {
-    return this.b3r_1.hashCode();
+    return this.y3q_1.hashCode();
   };
   NullRefImpl.prototype.insertAt = function (index, argument) {
-    return this.b3r_1.insertAt(index, argument);
+    return this.y3q_1.insertAt(index, argument);
   };
   NullRefImpl.prototype.resetTags = function (tags) {
-    return this.b3r_1.resetTags(tags);
+    return this.y3q_1.resetTags(tags);
   };
   NullRefImpl.prototype.setArgs = function (args) {
-    return this.b3r_1.setArgs(args);
+    return this.y3q_1.setArgs(args);
   };
   NullRefImpl.prototype.setArgsIterable = function (args) {
-    return this.b3r_1.setArgsIterable(args);
+    return this.y3q_1.setArgsIterable(args);
   };
   NullRefImpl.prototype.setArgsSequence = function (args) {
-    return this.b3r_1.setArgsSequence(args);
+    return this.y3q_1.setArgsSequence(args);
   };
   NullRefImpl.prototype.setFunctor = function (functor) {
-    return this.b3r_1.setFunctor(functor);
+    return this.y3q_1.setFunctor(functor);
   };
   NullRefImpl.prototype.structurallyEquals = function (other) {
-    return this.b3r_1.structurallyEquals(other);
+    return this.y3q_1.structurallyEquals(other);
   };
   NullRefImpl.prototype.toString = function () {
-    return this.b3r_1.toString();
+    return this.y3q_1.toString();
   };
-  NullRefImpl.prototype.ex = function () {
+  NullRefImpl.prototype.bx = function () {
     return true;
   };
-  NullRefImpl.prototype.ix = function () {
+  NullRefImpl.prototype.fx = function () {
     return this;
   };
   NullRefImpl.prototype.asConstant = function () {
-    return this.ix();
+    return this.fx();
   };
-  NullRefImpl.prototype.iw = function () {
+  NullRefImpl.prototype.fw = function () {
     return this;
   };
   NullRefImpl.prototype.freshCopy = function () {
-    return this.iw();
+    return this.fw();
   };
-  NullRefImpl.prototype.jw = function (scope) {
+  NullRefImpl.prototype.gw = function (scope) {
     return this;
   };
   NullRefImpl.prototype.freshCopyFromScope = function (scope) {
-    return this.jw(scope);
+    return this.gw(scope);
   };
-  NullRefImpl.prototype.zw = function () {
+  NullRefImpl.prototype.ww = function () {
     return isInterface(this, Term) ? this : THROW_CCE();
   };
-  NullRefImpl.prototype.qq = function () {
-    return this.zw();
+  NullRefImpl.prototype.nq = function () {
+    return this.ww();
   };
-  NullRefImpl.prototype.s16 = function (substitution) {
+  NullRefImpl.prototype.p16 = function (substitution) {
     return this;
   };
   NullRefImpl.prototype.applySubstitution = function (substitution) {
-    return this.s16(substitution);
+    return this.p16(substitution);
   };
-  NullRefImpl.prototype.f2p = function (substitution, substitutions) {
+  NullRefImpl.prototype.c2p = function (substitution, substitutions) {
     return this;
   };
   NullRefImpl.prototype.apply = function (substitution, substitutions) {
-    return this.f2p(substitution, substitutions);
+    return this.c2p(substitution, substitutions);
   };
-  NullRefImpl.prototype.e2p = function (substitution, substitutions) {
+  NullRefImpl.prototype.b2p = function (substitution, substitutions) {
     return this;
   };
   NullRefImpl.prototype.getSubstituted = function (substitution, substitutions) {
-    return this.e2p(substitution, substitutions);
+    return this.b2p(substitution, substitutions);
   };
-  NullRefImpl.prototype.y15 = function (visitor) {
+  NullRefImpl.prototype.v15 = function (visitor) {
     return visitor.visitAtom(this);
   };
   NullRefImpl.prototype.accept = function (visitor) {
-    return this.y15(visitor);
+    return this.v15(visitor);
   };
   var NullRefImpl_instance;
   function NullRefImpl_getInstance() {
@@ -1135,372 +1135,372 @@
     return NullRefImpl_instance;
   }
   function ObjectRefImpl(object) {
-    this.c3r_1 = object;
-    this.d3r_1 = Companion_getInstance_5().of(Companion_getInstance_19().x3p(object));
+    this.z3q_1 = object;
+    this.a3r_1 = Companion_getInstance_5().of(Companion_getInstance_19().u3p(object));
   }
-  ObjectRefImpl.prototype.l3p = function () {
-    return this.c3r_1;
-  };
-  ObjectRefImpl.prototype.gw = function () {
-    return this.d3r_1.gw();
+  ObjectRefImpl.prototype.i3p = function () {
+    return this.z3q_1;
   };
-  ObjectRefImpl.prototype.yw = function () {
-    return this.d3r_1.yw();
-  };
-  ObjectRefImpl.prototype.zv = function () {
-    return this.d3r_1.zv();
+  ObjectRefImpl.prototype.dw = function () {
+    return this.a3r_1.dw();
   };
-  ObjectRefImpl.prototype.fw = function () {
-    return this.d3r_1.fw();
+  ObjectRefImpl.prototype.vw = function () {
+    return this.a3r_1.vw();
   };
-  ObjectRefImpl.prototype.xw = function () {
-    return this.d3r_1.xw();
+  ObjectRefImpl.prototype.wv = function () {
+    return this.a3r_1.wv();
   };
-  ObjectRefImpl.prototype.aw = function () {
-    return this.d3r_1.aw();
+  ObjectRefImpl.prototype.cw = function () {
+    return this.a3r_1.cw();
   };
-  ObjectRefImpl.prototype.tw = function () {
-    return this.d3r_1.tw();
+  ObjectRefImpl.prototype.uw = function () {
+    return this.a3r_1.uw();
   };
-  ObjectRefImpl.prototype.mw = function () {
-    return this.d3r_1.mw();
+  ObjectRefImpl.prototype.xv = function () {
+    return this.a3r_1.xv();
   };
-  ObjectRefImpl.prototype.sw = function () {
-    return this.d3r_1.sw();
+  ObjectRefImpl.prototype.qw = function () {
+    return this.a3r_1.qw();
   };
-  ObjectRefImpl.prototype.ow = function () {
-    return this.d3r_1.ow();
+  ObjectRefImpl.prototype.jw = function () {
+    return this.a3r_1.jw();
   };
-  ObjectRefImpl.prototype.bw = function () {
-    return this.d3r_1.bw();
+  ObjectRefImpl.prototype.pw = function () {
+    return this.a3r_1.pw();
   };
-  ObjectRefImpl.prototype.cw = function () {
-    return this.d3r_1.cw();
+  ObjectRefImpl.prototype.lw = function () {
+    return this.a3r_1.lw();
   };
-  ObjectRefImpl.prototype.pw = function () {
-    return this.d3r_1.pw();
+  ObjectRefImpl.prototype.yv = function () {
+    return this.a3r_1.yv();
   };
-  ObjectRefImpl.prototype.ew = function () {
-    return this.d3r_1.ew();
+  ObjectRefImpl.prototype.zv = function () {
+    return this.a3r_1.zv();
   };
-  ObjectRefImpl.prototype.ww = function () {
-    return this.d3r_1.ww();
+  ObjectRefImpl.prototype.mw = function () {
+    return this.a3r_1.mw();
   };
-  ObjectRefImpl.prototype.jx = function () {
-    return this.d3r_1.jx();
+  ObjectRefImpl.prototype.bw = function () {
+    return this.a3r_1.bw();
   };
-  ObjectRefImpl.prototype.uw = function () {
-    return this.d3r_1.uw();
+  ObjectRefImpl.prototype.tw = function () {
+    return this.a3r_1.tw();
   };
   ObjectRefImpl.prototype.gx = function () {
-    return this.d3r_1.gx();
+    return this.a3r_1.gx();
   };
   ObjectRefImpl.prototype.rw = function () {
-    return this.d3r_1.rw();
+    return this.a3r_1.rw();
   };
-  ObjectRefImpl.prototype.fx = function () {
-    return this.d3r_1.fx();
+  ObjectRefImpl.prototype.dx = function () {
+    return this.a3r_1.dx();
   };
-  ObjectRefImpl.prototype.hx = function () {
-    return this.d3r_1.hx();
+  ObjectRefImpl.prototype.ow = function () {
+    return this.a3r_1.ow();
   };
-  ObjectRefImpl.prototype.dx = function () {
-    return this.d3r_1.dx();
+  ObjectRefImpl.prototype.cx = function () {
+    return this.a3r_1.cx();
   };
-  ObjectRefImpl.prototype.nw = function () {
-    return this.d3r_1.nw();
+  ObjectRefImpl.prototype.ex = function () {
+    return this.a3r_1.ex();
   };
-  ObjectRefImpl.prototype.lw = function () {
-    return this.d3r_1.lw();
+  ObjectRefImpl.prototype.ax = function () {
+    return this.a3r_1.ax();
   };
-  ObjectRefImpl.prototype.dw = function () {
-    return this.d3r_1.dw();
+  ObjectRefImpl.prototype.kw = function () {
+    return this.a3r_1.kw();
   };
-  ObjectRefImpl.prototype.cx = function () {
-    return this.d3r_1.cx();
+  ObjectRefImpl.prototype.iw = function () {
+    return this.a3r_1.iw();
   };
-  ObjectRefImpl.prototype.qw = function () {
-    return this.d3r_1.qw();
+  ObjectRefImpl.prototype.aw = function () {
+    return this.a3r_1.aw();
   };
-  ObjectRefImpl.prototype.bx = function () {
-    return this.d3r_1.bx();
+  ObjectRefImpl.prototype.zw = function () {
+    return this.a3r_1.zw();
   };
-  ObjectRefImpl.prototype.kt = function () {
-    return this.d3r_1.kt();
+  ObjectRefImpl.prototype.nw = function () {
+    return this.a3r_1.nw();
+  };
+  ObjectRefImpl.prototype.yw = function () {
+    return this.a3r_1.yw();
+  };
+  ObjectRefImpl.prototype.ht = function () {
+    return this.a3r_1.ht();
   };
   ObjectRefImpl.prototype.b1 = function () {
-    return this.d3r_1.b1();
+    return this.a3r_1.b1();
   };
-  ObjectRefImpl.prototype.hw = function () {
-    return this.d3r_1.hw();
+  ObjectRefImpl.prototype.ew = function () {
+    return this.a3r_1.ew();
   };
   ObjectRefImpl.prototype.addFirst = function (argument) {
-    return this.d3r_1.addFirst(argument);
+    return this.a3r_1.addFirst(argument);
   };
   ObjectRefImpl.prototype.addLast = function (argument) {
-    return this.d3r_1.addLast(argument);
+    return this.a3r_1.addLast(argument);
   };
   ObjectRefImpl.prototype.append = function (argument) {
-    return this.d3r_1.append(argument);
+    return this.a3r_1.append(argument);
   };
-  ObjectRefImpl.prototype.kw = function () {
-    return this.d3r_1.kw();
+  ObjectRefImpl.prototype.hw = function () {
+    return this.a3r_1.hw();
   };
   ObjectRefImpl.prototype.asAtom = function () {
-    return this.kw();
+    return this.hw();
   };
   ObjectRefImpl.prototype.asBlock = function () {
-    return this.d3r_1.asBlock();
+    return this.a3r_1.asBlock();
   };
   ObjectRefImpl.prototype.asClause = function () {
-    return this.d3r_1.asClause();
+    return this.a3r_1.asClause();
   };
   ObjectRefImpl.prototype.asCons = function () {
-    return this.d3r_1.asCons();
+    return this.a3r_1.asCons();
   };
   ObjectRefImpl.prototype.asDirective = function () {
-    return this.d3r_1.asDirective();
+    return this.a3r_1.asDirective();
   };
   ObjectRefImpl.prototype.asEmptyBlock = function () {
-    return this.d3r_1.asEmptyBlock();
+    return this.a3r_1.asEmptyBlock();
   };
   ObjectRefImpl.prototype.asEmptyList = function () {
-    return this.d3r_1.asEmptyList();
+    return this.a3r_1.asEmptyList();
   };
   ObjectRefImpl.prototype.asFact = function () {
-    return this.d3r_1.asFact();
+    return this.a3r_1.asFact();
   };
   ObjectRefImpl.prototype.asIndicator = function () {
-    return this.d3r_1.asIndicator();
+    return this.a3r_1.asIndicator();
   };
   ObjectRefImpl.prototype.asInteger = function () {
-    return this.d3r_1.asInteger();
+    return this.a3r_1.asInteger();
   };
   ObjectRefImpl.prototype.asList = function () {
-    return this.d3r_1.asList();
+    return this.a3r_1.asList();
   };
   ObjectRefImpl.prototype.asNumeric = function () {
-    return this.d3r_1.asNumeric();
+    return this.a3r_1.asNumeric();
   };
   ObjectRefImpl.prototype.asReal = function () {
-    return this.d3r_1.asReal();
+    return this.a3r_1.asReal();
   };
   ObjectRefImpl.prototype.asRecursive = function () {
-    return this.d3r_1.asRecursive();
+    return this.a3r_1.asRecursive();
   };
   ObjectRefImpl.prototype.asRule = function () {
-    return this.d3r_1.asRule();
+    return this.a3r_1.asRule();
   };
-  ObjectRefImpl.prototype.vw = function () {
-    return this.d3r_1.vw();
+  ObjectRefImpl.prototype.sw = function () {
+    return this.a3r_1.sw();
   };
   ObjectRefImpl.prototype.asStruct = function () {
-    return this.vw();
+    return this.sw();
   };
   ObjectRefImpl.prototype.asTerm = function () {
-    return this.d3r_1.asTerm();
+    return this.a3r_1.asTerm();
   };
   ObjectRefImpl.prototype.asTruth = function () {
-    return this.d3r_1.asTruth();
+    return this.a3r_1.asTruth();
   };
   ObjectRefImpl.prototype.asTuple = function () {
-    return this.d3r_1.asTuple();
+    return this.a3r_1.asTuple();
   };
   ObjectRefImpl.prototype.asVar = function () {
-    return this.d3r_1.asVar();
+    return this.a3r_1.asVar();
   };
   ObjectRefImpl.prototype.castToAtom = function () {
-    return this.d3r_1.castToAtom();
+    return this.a3r_1.castToAtom();
   };
   ObjectRefImpl.prototype.castToBlock = function () {
-    return this.d3r_1.castToBlock();
+    return this.a3r_1.castToBlock();
   };
   ObjectRefImpl.prototype.castToClause = function () {
-    return this.d3r_1.castToClause();
+    return this.a3r_1.castToClause();
   };
   ObjectRefImpl.prototype.castToCons = function () {
-    return this.d3r_1.castToCons();
+    return this.a3r_1.castToCons();
   };
   ObjectRefImpl.prototype.castToConstant = function () {
-    return this.d3r_1.castToConstant();
+    return this.a3r_1.castToConstant();
   };
   ObjectRefImpl.prototype.castToDirective = function () {
-    return this.d3r_1.castToDirective();
+    return this.a3r_1.castToDirective();
   };
   ObjectRefImpl.prototype.castToEmptyBlock = function () {
-    return this.d3r_1.castToEmptyBlock();
+    return this.a3r_1.castToEmptyBlock();
   };
   ObjectRefImpl.prototype.castToEmptyList = function () {
-    return this.d3r_1.castToEmptyList();
+    return this.a3r_1.castToEmptyList();
   };
   ObjectRefImpl.prototype.castToFact = function () {
-    return this.d3r_1.castToFact();
+    return this.a3r_1.castToFact();
   };
   ObjectRefImpl.prototype.castToIndicator = function () {
-    return this.d3r_1.castToIndicator();
+    return this.a3r_1.castToIndicator();
   };
   ObjectRefImpl.prototype.castToInteger = function () {
-    return this.d3r_1.castToInteger();
+    return this.a3r_1.castToInteger();
   };
   ObjectRefImpl.prototype.castToList = function () {
-    return this.d3r_1.castToList();
+    return this.a3r_1.castToList();
   };
   ObjectRefImpl.prototype.castToNumeric = function () {
-    return this.d3r_1.castToNumeric();
+    return this.a3r_1.castToNumeric();
   };
   ObjectRefImpl.prototype.castToReal = function () {
-    return this.d3r_1.castToReal();
+    return this.a3r_1.castToReal();
   };
   ObjectRefImpl.prototype.castToRecursive = function () {
-    return this.d3r_1.castToRecursive();
+    return this.a3r_1.castToRecursive();
   };
   ObjectRefImpl.prototype.castToRule = function () {
-    return this.d3r_1.castToRule();
+    return this.a3r_1.castToRule();
   };
   ObjectRefImpl.prototype.castToStruct = function () {
-    return this.d3r_1.castToStruct();
+    return this.a3r_1.castToStruct();
   };
   ObjectRefImpl.prototype.castToTerm = function () {
-    return this.d3r_1.castToTerm();
+    return this.a3r_1.castToTerm();
   };
   ObjectRefImpl.prototype.castToTruth = function () {
-    return this.d3r_1.castToTruth();
+    return this.a3r_1.castToTruth();
   };
   ObjectRefImpl.prototype.castToTuple = function () {
-    return this.d3r_1.castToTuple();
+    return this.a3r_1.castToTuple();
   };
   ObjectRefImpl.prototype.castToVar = function () {
-    return this.d3r_1.castToVar();
+    return this.a3r_1.castToVar();
   };
-  ObjectRefImpl.prototype.ax = function (other) {
-    return this.d3r_1.ax(other);
+  ObjectRefImpl.prototype.xw = function (other) {
+    return this.a3r_1.xw(other);
   };
   ObjectRefImpl.prototype.aa = function (other) {
-    return this.ax((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
+    return this.xw((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   ObjectRefImpl.prototype.containsTag = function (name) {
-    return this.d3r_1.containsTag(name);
+    return this.a3r_1.containsTag(name);
   };
   ObjectRefImpl.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.d3r_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.a3r_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   ObjectRefImpl.prototype.equals = function (other) {
-    return this.d3r_1.equals(other);
+    return this.a3r_1.equals(other);
   };
   ObjectRefImpl.prototype.get = function (index) {
-    return this.d3r_1.get(index);
+    return this.a3r_1.get(index);
   };
   ObjectRefImpl.prototype.getArgAt = function (index) {
-    return this.d3r_1.getArgAt(index);
+    return this.a3r_1.getArgAt(index);
   };
   ObjectRefImpl.prototype.getTag = function (name) {
-    return this.d3r_1.getTag(name);
+    return this.a3r_1.getTag(name);
   };
   ObjectRefImpl.prototype.hashCode = function () {
-    return this.d3r_1.hashCode();
+    return this.a3r_1.hashCode();
   };
   ObjectRefImpl.prototype.insertAt = function (index, argument) {
-    return this.d3r_1.insertAt(index, argument);
+    return this.a3r_1.insertAt(index, argument);
   };
   ObjectRefImpl.prototype.resetTags = function (tags) {
-    return this.d3r_1.resetTags(tags);
+    return this.a3r_1.resetTags(tags);
   };
   ObjectRefImpl.prototype.setArgs = function (args) {
-    return this.d3r_1.setArgs(args);
+    return this.a3r_1.setArgs(args);
   };
   ObjectRefImpl.prototype.setArgsIterable = function (args) {
-    return this.d3r_1.setArgsIterable(args);
+    return this.a3r_1.setArgsIterable(args);
   };
   ObjectRefImpl.prototype.setArgsSequence = function (args) {
-    return this.d3r_1.setArgsSequence(args);
+    return this.a3r_1.setArgsSequence(args);
   };
   ObjectRefImpl.prototype.setFunctor = function (functor) {
-    return this.d3r_1.setFunctor(functor);
+    return this.a3r_1.setFunctor(functor);
   };
   ObjectRefImpl.prototype.structurallyEquals = function (other) {
-    return this.d3r_1.structurallyEquals(other);
+    return this.a3r_1.structurallyEquals(other);
   };
   ObjectRefImpl.prototype.toString = function () {
-    return this.d3r_1.toString();
+    return this.a3r_1.toString();
   };
-  ObjectRefImpl.prototype.ex = function () {
+  ObjectRefImpl.prototype.bx = function () {
     return true;
   };
-  ObjectRefImpl.prototype.ix = function () {
+  ObjectRefImpl.prototype.fx = function () {
     return this;
   };
   ObjectRefImpl.prototype.asConstant = function () {
-    return this.ix();
+    return this.fx();
   };
-  ObjectRefImpl.prototype.m3p = function (objectConverter, methodName, arguments_0) {
-    return invoke_0(this.c3r_1, objectConverter, methodName, arguments_0);
+  ObjectRefImpl.prototype.j3p = function (objectConverter, methodName, arguments_0) {
+    return invoke_0(this.z3q_1, objectConverter, methodName, arguments_0);
   };
-  ObjectRefImpl.prototype.n3p = function (objectConverter, propertyName, value) {
-    assign_0(this.c3r_1, objectConverter, propertyName, value);
+  ObjectRefImpl.prototype.k3p = function (objectConverter, propertyName, value) {
+    assign_0(this.z3q_1, objectConverter, propertyName, value);
     return true;
   };
-  ObjectRefImpl.prototype.iw = function () {
+  ObjectRefImpl.prototype.fw = function () {
     return this;
   };
   ObjectRefImpl.prototype.freshCopy = function () {
-    return this.iw();
+    return this.fw();
   };
-  ObjectRefImpl.prototype.jw = function (scope) {
+  ObjectRefImpl.prototype.gw = function (scope) {
     return this;
   };
   ObjectRefImpl.prototype.freshCopyFromScope = function (scope) {
-    return this.jw(scope);
+    return this.gw(scope);
   };
-  ObjectRefImpl.prototype.zw = function () {
+  ObjectRefImpl.prototype.ww = function () {
     return isInterface(this, Term) ? this : THROW_CCE();
   };
-  ObjectRefImpl.prototype.qq = function () {
-    return this.zw();
+  ObjectRefImpl.prototype.nq = function () {
+    return this.ww();
   };
-  ObjectRefImpl.prototype.s16 = function (substitution) {
+  ObjectRefImpl.prototype.p16 = function (substitution) {
     return this;
   };
   ObjectRefImpl.prototype.applySubstitution = function (substitution) {
-    return this.s16(substitution);
+    return this.p16(substitution);
   };
-  ObjectRefImpl.prototype.f2p = function (substitution, substitutions) {
+  ObjectRefImpl.prototype.c2p = function (substitution, substitutions) {
     return this;
   };
   ObjectRefImpl.prototype.apply = function (substitution, substitutions) {
-    return this.f2p(substitution, substitutions);
+    return this.c2p(substitution, substitutions);
   };
-  ObjectRefImpl.prototype.e2p = function (substitution, substitutions) {
+  ObjectRefImpl.prototype.b2p = function (substitution, substitutions) {
     return this;
   };
   ObjectRefImpl.prototype.getSubstituted = function (substitution, substitutions) {
-    return this.e2p(substitution, substitutions);
+    return this.b2p(substitution, substitutions);
   };
-  ObjectRefImpl.prototype.y15 = function (visitor) {
+  ObjectRefImpl.prototype.v15 = function (visitor) {
     return visitor.visitAtom(this);
   };
   ObjectRefImpl.prototype.accept = function (visitor) {
-    return this.y15(visitor);
+    return this.v15(visitor);
   };
   function ObjectToTermConverterImpl() {
-    this.e3r_1 = new NumberTypeTester();
+    this.b3r_1 = new NumberTypeTester();
   }
-  ObjectToTermConverterImpl.prototype.e3q = function (source) {
+  ObjectToTermConverterImpl.prototype.b3q = function (source) {
     var tmp$ret$2;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.e3r_1;
+    var tmp0_with = this.b3r_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$1;
     // Inline function 'it.unibo.tuprolog.solve.libs.oop.impl.ObjectToTermConverterImpl.convert.<anonymous>' call
     var tmp0_subject = source;
     var tmp;
     if (tmp0_subject == null) {
-      tmp = Companion_getInstance_19().w3p_1;
+      tmp = Companion_getInstance_19().t3p_1;
     } else {
       if (!(tmp0_subject == null) ? typeof tmp0_subject === 'string' : false) {
         tmp = Companion_getInstance_5().of(source);
       } else {
         if (isNumber(tmp0_subject)) {
-          tmp = tmp0_with.ct(source) ? Companion_getInstance_8().ofBigInteger(tmp0_with.dt(source)) : Companion_getInstance_7().ofBigDecimal(tmp0_with.et(source));
+          tmp = tmp0_with.zs(source) ? Companion_getInstance_8().ofBigInteger(tmp0_with.at(source)) : Companion_getInstance_7().ofBigDecimal(tmp0_with.bt(source));
         } else {
           if (tmp0_subject instanceof Char) {
             var tmp_0 = Companion_getInstance_5();
@@ -1513,7 +1513,7 @@
             if (!(tmp0_subject == null) ? typeof tmp0_subject === 'boolean' : false) {
               tmp = Companion_getInstance_6().of(source);
             } else {
-              tmp = Companion_getInstance_19().y3p(source);
+              tmp = Companion_getInstance_19().v3p(source);
             }
           }
         }
@@ -1526,7 +1526,7 @@
   function explicitConversion($this, castExpression, term, type) {
     var targetType = getType($this, castExpression, type);
     try {
-      return $this.k3q(targetType, term);
+      return $this.h3q(targetType, term);
     } catch ($p) {
       if ($p instanceof TermToObjectConversionException) {
         throw $p;
@@ -1543,10 +1543,10 @@
     var tmp0_subject = typeTerm;
     var tmp;
     if (isInterface(tmp0_subject, TypeRef)) {
-      tmp = typeTerm.k25();
+      tmp = typeTerm.h25();
     } else {
       if (isInterface(tmp0_subject, Atom)) {
-        var tmp1_elvis_lhs = $this.f3r_1.p3q(typeTerm.b1());
+        var tmp1_elvis_lhs = $this.c3r_1.m3q(typeTerm.b1());
         var tmp_0;
         if (tmp1_elvis_lhs == null) {
           throw TermToObjectConversionException_init_$Create$(castExpression);
@@ -1558,10 +1558,10 @@
         if (isInterface(tmp0_subject, Struct)) {
           var tmp_1;
           if (Companion_getInstance_2().matches(typeTerm, get_DEALIASING_TEMPLATE())) {
-            var ref = $this.g3r_1(typeTerm);
+            var ref = $this.d3r_1(typeTerm);
             var tmp_2;
             if (!(ref == null) ? isInterface(ref, TypeRef) : false) {
-              tmp_2 = ref.k25();
+              tmp_2 = ref.h25();
             } else {
               throw TermToObjectConversionException_init_$Create$(castExpression);
             }
@@ -1590,7 +1590,7 @@
       tmp = sequenceOf([PrimitiveClasses_getInstance().wd()]);
     } else {
       if (isInterface(tmp0_subject, ObjectRef)) {
-        tmp = sequenceOf([getKClassFromExpression(term.l3p())]);
+        tmp = sequenceOf([getKClassFromExpression(term.i3p())]);
       } else {
         if (isInterface(tmp0_subject, Truth)) {
           tmp = sequenceOf([PrimitiveClasses_getInstance().xd(), PrimitiveClasses_getInstance().ee()]);
@@ -1612,36 +1612,36 @@
                 var tmp_2 = tmp_1.ofLong(new Long(0, -2147483648));
                 var tmp_3 = Companion_getInstance_9();
                 Companion_getInstance_10();
-                if (tmp_2.rangeTo(tmp_3.ofLong(new Long(-1, 2147483647))).l3(term.p10())) {
+                if (tmp_2.rangeTo(tmp_3.ofLong(new Long(-1, 2147483647))).l3(term.m10())) {
                   admissible_0 = plus(admissible_0, sequenceOf([getKClass(Long)]));
                 }
-                if (Companion_getInstance_9().of(IntCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(IntCompanionObject_getInstance().MAX_VALUE)).l3(term.p10())) {
+                if (Companion_getInstance_9().of(IntCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(IntCompanionObject_getInstance().MAX_VALUE)).l3(term.m10())) {
                   admissible_0 = plus(admissible_0, sequenceOf([PrimitiveClasses_getInstance().ae()]));
                 }
-                if (Companion_getInstance_9().of(ShortCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(ShortCompanionObject_getInstance().MAX_VALUE)).l3(term.p10())) {
+                if (Companion_getInstance_9().of(ShortCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(ShortCompanionObject_getInstance().MAX_VALUE)).l3(term.m10())) {
                   admissible_0 = plus(admissible_0, sequenceOf([PrimitiveClasses_getInstance().zd()]));
                 }
-                if (Companion_getInstance_9().of(ByteCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(ByteCompanionObject_getInstance().MAX_VALUE)).l3(term.p10())) {
+                if (Companion_getInstance_9().of(ByteCompanionObject_getInstance().MIN_VALUE).rangeTo(Companion_getInstance_9().of(ByteCompanionObject_getInstance().MAX_VALUE)).l3(term.m10())) {
                   admissible_0 = plus(admissible_0, sequenceOf([PrimitiveClasses_getInstance().yd()]));
                 }
                 admissible_0 = plus(admissible_0, sequenceOf([getKClass(BigDecimal)]));
                 var tmp_4 = Companion_getInstance_11();
                 DoubleCompanionObject_getInstance();
-                var containsLower = tmp_4.oj(4.9E-324, null, 2, null);
+                var containsLower = tmp_4.lj(4.9E-324, null, 2, null);
                 var tmp_5 = Companion_getInstance_11();
                 DoubleCompanionObject_getInstance();
-                var containsUpper = tmp_5.oj(1.7976931348623157E308, null, 2, null);
-                var containsArg = term.x10();
+                var containsUpper = tmp_5.lj(1.7976931348623157E308, null, 2, null);
+                var containsArg = term.u10();
                 if (0 <= compareTo(containsArg, containsLower) ? compareTo(containsArg, containsUpper) <= 0 : false) {
                   admissible_0 = plus(admissible_0, sequenceOf([PrimitiveClasses_getInstance().ce()]));
                 }
                 var tmp_6 = Companion_getInstance_11();
                 FloatCompanionObject_getInstance();
-                var containsLower_0 = tmp_6.qj(1.4E-45, null, 2, null);
+                var containsLower_0 = tmp_6.nj(1.4E-45, null, 2, null);
                 var tmp_7 = Companion_getInstance_11();
                 FloatCompanionObject_getInstance();
-                var containsUpper_0 = tmp_7.qj(3.4028235E38, null, 2, null);
-                var containsArg_0 = term.x10();
+                var containsUpper_0 = tmp_7.nj(3.4028235E38, null, 2, null);
+                var containsArg_0 = term.u10();
                 if (0 <= compareTo(containsArg_0, containsLower_0) ? compareTo(containsArg_0, containsUpper_0) <= 0 : false) {
                   admissible_0 = plus(admissible_0, sequenceOf([PrimitiveClasses_getInstance().be()]));
                 }
@@ -1652,7 +1652,7 @@
                   if (Companion_getInstance_2().matches(term, get_CAST_TEMPLATE())) {
                     tmp_8 = sequenceOf([getType($this, term, term.get(1))]);
                   } else if (Companion_getInstance_2().matches(term, get_DEALIASING_TEMPLATE())) {
-                    var ref = $this.g3r_1(term);
+                    var ref = $this.d3r_1(term);
                     var tmp_9;
                     if (!(ref == null) ? isInterface(ref, ObjectRef) : false) {
                       tmp_9 = admissibleTypesByPriority($this, ref);
@@ -1676,10 +1676,10 @@
     return tmp;
   }
   function TermToObjectConverterImpl(typeFactory, dealiaser) {
-    this.f3r_1 = typeFactory;
-    this.g3r_1 = dealiaser;
+    this.c3r_1 = typeFactory;
+    this.d3r_1 = dealiaser;
   }
-  TermToObjectConverterImpl.prototype.k3q = function (type, term) {
+  TermToObjectConverterImpl.prototype.h3q = function (type, term) {
     var tmp0_subject = term;
     var tmp;
     var tmp_0;
@@ -1699,8 +1699,8 @@
     } else {
       if (isInterface(tmp0_subject, ObjectRef)) {
         var tmp_2;
-        if (isSubtypeOf(getKClassFromExpression(term.l3p()), type)) {
-          tmp_2 = term.l3p();
+        if (isSubtypeOf(getKClassFromExpression(term.i3p()), type)) {
+          tmp_2 = term.i3p();
         } else {
           throw new TermToObjectConversionException(term, type);
         }
@@ -1709,7 +1709,7 @@
         if (isInterface(tmp0_subject, Truth)) {
           var tmp_3;
           if (isSubtypeOf(PrimitiveClasses_getInstance().xd(), type)) {
-            tmp_3 = term.dw();
+            tmp_3 = term.aw();
           } else if (isSubtypeOf(PrimitiveClasses_getInstance().ee(), type)) {
             tmp_3 = term.b1();
           } else {
@@ -1737,11 +1737,11 @@
             if (isInterface(tmp0_subject, Real)) {
               var tmp_6;
               if (isSubtypeOf(getKClass(BigDecimal), type)) {
-                tmp_6 = term.x10();
+                tmp_6 = term.u10();
               } else if (isSubtypeOf(PrimitiveClasses_getInstance().ce(), type)) {
-                tmp_6 = term.x10().toDouble();
+                tmp_6 = term.u10().toDouble();
               } else if (isSubtypeOf(PrimitiveClasses_getInstance().be(), type)) {
-                tmp_6 = term.x10().toFloat();
+                tmp_6 = term.u10().toFloat();
               } else {
                 throw new TermToObjectConversionException(term, type);
               }
@@ -1750,21 +1750,21 @@
               if (isInterface(tmp0_subject, Integer)) {
                 var tmp_7;
                 if (isSubtypeOf(getKClass(BigInteger), type)) {
-                  tmp_7 = term.p10();
+                  tmp_7 = term.m10();
                 } else if (isSubtypeOf(getKClass(Long), type)) {
-                  tmp_7 = term.p10().toLongExact();
+                  tmp_7 = term.m10().toLongExact();
                 } else if (isSubtypeOf(PrimitiveClasses_getInstance().ae(), type)) {
-                  tmp_7 = term.p10().toIntExact();
+                  tmp_7 = term.m10().toIntExact();
                 } else if (isSubtypeOf(PrimitiveClasses_getInstance().zd(), type)) {
-                  tmp_7 = term.p10().toShortExact();
+                  tmp_7 = term.m10().toShortExact();
                 } else if (isSubtypeOf(PrimitiveClasses_getInstance().yd(), type)) {
-                  tmp_7 = term.p10().toByteExact();
+                  tmp_7 = term.m10().toByteExact();
                 } else if (isSubtypeOf(getKClass(BigDecimal), type)) {
-                  tmp_7 = term.x10();
+                  tmp_7 = term.u10();
                 } else if (isSubtypeOf(PrimitiveClasses_getInstance().ce(), type)) {
-                  tmp_7 = term.x10().toDouble();
+                  tmp_7 = term.u10().toDouble();
                 } else if (isSubtypeOf(PrimitiveClasses_getInstance().be(), type)) {
-                  tmp_7 = term.x10().toFloat();
+                  tmp_7 = term.u10().toFloat();
                 } else {
                   throw new TermToObjectConversionException(term, type);
                 }
@@ -1777,10 +1777,10 @@
                   if (Companion_getInstance_2().matches(term, get_CAST_TEMPLATE())) {
                     tmp_8 = explicitConversion(this, term, term.get(0), term.get(1));
                   } else if (Companion_getInstance_2().matches(term, get_DEALIASING_TEMPLATE())) {
-                    var ref = this.g3r_1(term);
+                    var ref = this.d3r_1(term);
                     var tmp_9;
                     if (!(ref == null) ? isInterface(ref, ObjectRef) : false) {
-                      tmp_9 = this.k3q(type, ref);
+                      tmp_9 = this.h3q(type, ref);
                     } else {
                       throw TermToObjectConversionException_init_$Create$(term);
                     }
@@ -1807,15 +1807,15 @@
     }
     return tmp;
   };
-  TermToObjectConverterImpl.prototype.m3q = function (term) {
+  TermToObjectConverterImpl.prototype.j3q = function (term) {
     return first(admissibleTypesByPriority(this, term));
   };
-  TermToObjectConverterImpl.prototype.l3q = function (term) {
+  TermToObjectConverterImpl.prototype.i3q = function (term) {
     return toSet(admissibleTypesByPriority(this, term));
   };
   function TypeFactoryImpl() {
   }
-  TypeFactoryImpl.prototype.p3q = function (typeName) {
+  TypeFactoryImpl.prototype.m3q = function (typeName) {
     return kClassFromName(typeName).b1();
   };
   function nameOf_0($this, type) {
@@ -1832,372 +1832,372 @@
   }
   function TypeRefImpl(type) {
     Companion_getInstance_26();
-    this.h3r_1 = type;
-    this.i3r_1 = Companion_getInstance_5().of(nameOf_0(Companion_getInstance_26(), type));
+    this.e3r_1 = type;
+    this.f3r_1 = Companion_getInstance_5().of(nameOf_0(Companion_getInstance_26(), type));
   }
-  TypeRefImpl.prototype.k25 = function () {
-    return this.h3r_1;
+  TypeRefImpl.prototype.h25 = function () {
+    return this.e3r_1;
   };
-  TypeRefImpl.prototype.gw = function () {
-    return this.i3r_1.gw();
-  };
-  TypeRefImpl.prototype.yw = function () {
-    return this.i3r_1.yw();
-  };
-  TypeRefImpl.prototype.zv = function () {
-    return this.i3r_1.zv();
+  TypeRefImpl.prototype.dw = function () {
+    return this.f3r_1.dw();
   };
-  TypeRefImpl.prototype.fw = function () {
-    return this.i3r_1.fw();
+  TypeRefImpl.prototype.vw = function () {
+    return this.f3r_1.vw();
   };
-  TypeRefImpl.prototype.xw = function () {
-    return this.i3r_1.xw();
+  TypeRefImpl.prototype.wv = function () {
+    return this.f3r_1.wv();
   };
-  TypeRefImpl.prototype.aw = function () {
-    return this.i3r_1.aw();
+  TypeRefImpl.prototype.cw = function () {
+    return this.f3r_1.cw();
   };
-  TypeRefImpl.prototype.tw = function () {
-    return this.i3r_1.tw();
+  TypeRefImpl.prototype.uw = function () {
+    return this.f3r_1.uw();
   };
-  TypeRefImpl.prototype.mw = function () {
-    return this.i3r_1.mw();
+  TypeRefImpl.prototype.xv = function () {
+    return this.f3r_1.xv();
   };
-  TypeRefImpl.prototype.sw = function () {
-    return this.i3r_1.sw();
+  TypeRefImpl.prototype.qw = function () {
+    return this.f3r_1.qw();
   };
-  TypeRefImpl.prototype.ow = function () {
-    return this.i3r_1.ow();
+  TypeRefImpl.prototype.jw = function () {
+    return this.f3r_1.jw();
   };
-  TypeRefImpl.prototype.bw = function () {
-    return this.i3r_1.bw();
+  TypeRefImpl.prototype.pw = function () {
+    return this.f3r_1.pw();
   };
-  TypeRefImpl.prototype.cw = function () {
-    return this.i3r_1.cw();
+  TypeRefImpl.prototype.lw = function () {
+    return this.f3r_1.lw();
   };
-  TypeRefImpl.prototype.pw = function () {
-    return this.i3r_1.pw();
+  TypeRefImpl.prototype.yv = function () {
+    return this.f3r_1.yv();
   };
-  TypeRefImpl.prototype.ew = function () {
-    return this.i3r_1.ew();
+  TypeRefImpl.prototype.zv = function () {
+    return this.f3r_1.zv();
   };
-  TypeRefImpl.prototype.ww = function () {
-    return this.i3r_1.ww();
+  TypeRefImpl.prototype.mw = function () {
+    return this.f3r_1.mw();
   };
-  TypeRefImpl.prototype.jx = function () {
-    return this.i3r_1.jx();
+  TypeRefImpl.prototype.bw = function () {
+    return this.f3r_1.bw();
   };
-  TypeRefImpl.prototype.uw = function () {
-    return this.i3r_1.uw();
+  TypeRefImpl.prototype.tw = function () {
+    return this.f3r_1.tw();
   };
   TypeRefImpl.prototype.gx = function () {
-    return this.i3r_1.gx();
+    return this.f3r_1.gx();
   };
   TypeRefImpl.prototype.rw = function () {
-    return this.i3r_1.rw();
+    return this.f3r_1.rw();
   };
-  TypeRefImpl.prototype.fx = function () {
-    return this.i3r_1.fx();
+  TypeRefImpl.prototype.dx = function () {
+    return this.f3r_1.dx();
   };
-  TypeRefImpl.prototype.hx = function () {
-    return this.i3r_1.hx();
+  TypeRefImpl.prototype.ow = function () {
+    return this.f3r_1.ow();
   };
-  TypeRefImpl.prototype.dx = function () {
-    return this.i3r_1.dx();
+  TypeRefImpl.prototype.cx = function () {
+    return this.f3r_1.cx();
   };
-  TypeRefImpl.prototype.nw = function () {
-    return this.i3r_1.nw();
+  TypeRefImpl.prototype.ex = function () {
+    return this.f3r_1.ex();
   };
-  TypeRefImpl.prototype.lw = function () {
-    return this.i3r_1.lw();
+  TypeRefImpl.prototype.ax = function () {
+    return this.f3r_1.ax();
   };
-  TypeRefImpl.prototype.dw = function () {
-    return this.i3r_1.dw();
+  TypeRefImpl.prototype.kw = function () {
+    return this.f3r_1.kw();
   };
-  TypeRefImpl.prototype.cx = function () {
-    return this.i3r_1.cx();
+  TypeRefImpl.prototype.iw = function () {
+    return this.f3r_1.iw();
   };
-  TypeRefImpl.prototype.qw = function () {
-    return this.i3r_1.qw();
+  TypeRefImpl.prototype.aw = function () {
+    return this.f3r_1.aw();
   };
-  TypeRefImpl.prototype.bx = function () {
-    return this.i3r_1.bx();
+  TypeRefImpl.prototype.zw = function () {
+    return this.f3r_1.zw();
   };
-  TypeRefImpl.prototype.kt = function () {
-    return this.i3r_1.kt();
+  TypeRefImpl.prototype.nw = function () {
+    return this.f3r_1.nw();
+  };
+  TypeRefImpl.prototype.yw = function () {
+    return this.f3r_1.yw();
+  };
+  TypeRefImpl.prototype.ht = function () {
+    return this.f3r_1.ht();
   };
   TypeRefImpl.prototype.b1 = function () {
-    return this.i3r_1.b1();
+    return this.f3r_1.b1();
   };
-  TypeRefImpl.prototype.hw = function () {
-    return this.i3r_1.hw();
+  TypeRefImpl.prototype.ew = function () {
+    return this.f3r_1.ew();
   };
   TypeRefImpl.prototype.addFirst = function (argument) {
-    return this.i3r_1.addFirst(argument);
+    return this.f3r_1.addFirst(argument);
   };
   TypeRefImpl.prototype.addLast = function (argument) {
-    return this.i3r_1.addLast(argument);
+    return this.f3r_1.addLast(argument);
   };
   TypeRefImpl.prototype.append = function (argument) {
-    return this.i3r_1.append(argument);
+    return this.f3r_1.append(argument);
   };
-  TypeRefImpl.prototype.kw = function () {
-    return this.i3r_1.kw();
+  TypeRefImpl.prototype.hw = function () {
+    return this.f3r_1.hw();
   };
   TypeRefImpl.prototype.asAtom = function () {
-    return this.kw();
+    return this.hw();
   };
   TypeRefImpl.prototype.asBlock = function () {
-    return this.i3r_1.asBlock();
+    return this.f3r_1.asBlock();
   };
   TypeRefImpl.prototype.asClause = function () {
-    return this.i3r_1.asClause();
+    return this.f3r_1.asClause();
   };
   TypeRefImpl.prototype.asCons = function () {
-    return this.i3r_1.asCons();
+    return this.f3r_1.asCons();
   };
   TypeRefImpl.prototype.asDirective = function () {
-    return this.i3r_1.asDirective();
+    return this.f3r_1.asDirective();
   };
   TypeRefImpl.prototype.asEmptyBlock = function () {
-    return this.i3r_1.asEmptyBlock();
+    return this.f3r_1.asEmptyBlock();
   };
   TypeRefImpl.prototype.asEmptyList = function () {
-    return this.i3r_1.asEmptyList();
+    return this.f3r_1.asEmptyList();
   };
   TypeRefImpl.prototype.asFact = function () {
-    return this.i3r_1.asFact();
+    return this.f3r_1.asFact();
   };
   TypeRefImpl.prototype.asIndicator = function () {
-    return this.i3r_1.asIndicator();
+    return this.f3r_1.asIndicator();
   };
   TypeRefImpl.prototype.asInteger = function () {
-    return this.i3r_1.asInteger();
+    return this.f3r_1.asInteger();
   };
   TypeRefImpl.prototype.asList = function () {
-    return this.i3r_1.asList();
+    return this.f3r_1.asList();
   };
   TypeRefImpl.prototype.asNumeric = function () {
-    return this.i3r_1.asNumeric();
+    return this.f3r_1.asNumeric();
   };
   TypeRefImpl.prototype.asReal = function () {
-    return this.i3r_1.asReal();
+    return this.f3r_1.asReal();
   };
   TypeRefImpl.prototype.asRecursive = function () {
-    return this.i3r_1.asRecursive();
+    return this.f3r_1.asRecursive();
   };
   TypeRefImpl.prototype.asRule = function () {
-    return this.i3r_1.asRule();
+    return this.f3r_1.asRule();
   };
-  TypeRefImpl.prototype.vw = function () {
-    return this.i3r_1.vw();
+  TypeRefImpl.prototype.sw = function () {
+    return this.f3r_1.sw();
   };
   TypeRefImpl.prototype.asStruct = function () {
-    return this.vw();
+    return this.sw();
   };
   TypeRefImpl.prototype.asTerm = function () {
-    return this.i3r_1.asTerm();
+    return this.f3r_1.asTerm();
   };
   TypeRefImpl.prototype.asTruth = function () {
-    return this.i3r_1.asTruth();
+    return this.f3r_1.asTruth();
   };
   TypeRefImpl.prototype.asTuple = function () {
-    return this.i3r_1.asTuple();
+    return this.f3r_1.asTuple();
   };
   TypeRefImpl.prototype.asVar = function () {
-    return this.i3r_1.asVar();
+    return this.f3r_1.asVar();
   };
   TypeRefImpl.prototype.castToAtom = function () {
-    return this.i3r_1.castToAtom();
+    return this.f3r_1.castToAtom();
   };
   TypeRefImpl.prototype.castToBlock = function () {
-    return this.i3r_1.castToBlock();
+    return this.f3r_1.castToBlock();
   };
   TypeRefImpl.prototype.castToClause = function () {
-    return this.i3r_1.castToClause();
+    return this.f3r_1.castToClause();
   };
   TypeRefImpl.prototype.castToCons = function () {
-    return this.i3r_1.castToCons();
+    return this.f3r_1.castToCons();
   };
   TypeRefImpl.prototype.castToConstant = function () {
-    return this.i3r_1.castToConstant();
+    return this.f3r_1.castToConstant();
   };
   TypeRefImpl.prototype.castToDirective = function () {
-    return this.i3r_1.castToDirective();
+    return this.f3r_1.castToDirective();
   };
   TypeRefImpl.prototype.castToEmptyBlock = function () {
-    return this.i3r_1.castToEmptyBlock();
+    return this.f3r_1.castToEmptyBlock();
   };
   TypeRefImpl.prototype.castToEmptyList = function () {
-    return this.i3r_1.castToEmptyList();
+    return this.f3r_1.castToEmptyList();
   };
   TypeRefImpl.prototype.castToFact = function () {
-    return this.i3r_1.castToFact();
+    return this.f3r_1.castToFact();
   };
   TypeRefImpl.prototype.castToIndicator = function () {
-    return this.i3r_1.castToIndicator();
+    return this.f3r_1.castToIndicator();
   };
   TypeRefImpl.prototype.castToInteger = function () {
-    return this.i3r_1.castToInteger();
+    return this.f3r_1.castToInteger();
   };
   TypeRefImpl.prototype.castToList = function () {
-    return this.i3r_1.castToList();
+    return this.f3r_1.castToList();
   };
   TypeRefImpl.prototype.castToNumeric = function () {
-    return this.i3r_1.castToNumeric();
+    return this.f3r_1.castToNumeric();
   };
   TypeRefImpl.prototype.castToReal = function () {
-    return this.i3r_1.castToReal();
+    return this.f3r_1.castToReal();
   };
   TypeRefImpl.prototype.castToRecursive = function () {
-    return this.i3r_1.castToRecursive();
+    return this.f3r_1.castToRecursive();
   };
   TypeRefImpl.prototype.castToRule = function () {
-    return this.i3r_1.castToRule();
+    return this.f3r_1.castToRule();
   };
   TypeRefImpl.prototype.castToStruct = function () {
-    return this.i3r_1.castToStruct();
+    return this.f3r_1.castToStruct();
   };
   TypeRefImpl.prototype.castToTerm = function () {
-    return this.i3r_1.castToTerm();
+    return this.f3r_1.castToTerm();
   };
   TypeRefImpl.prototype.castToTruth = function () {
-    return this.i3r_1.castToTruth();
+    return this.f3r_1.castToTruth();
   };
   TypeRefImpl.prototype.castToTuple = function () {
-    return this.i3r_1.castToTuple();
+    return this.f3r_1.castToTuple();
   };
   TypeRefImpl.prototype.castToVar = function () {
-    return this.i3r_1.castToVar();
+    return this.f3r_1.castToVar();
   };
-  TypeRefImpl.prototype.ax = function (other) {
-    return this.i3r_1.ax(other);
+  TypeRefImpl.prototype.xw = function (other) {
+    return this.f3r_1.xw(other);
   };
   TypeRefImpl.prototype.aa = function (other) {
-    return this.ax((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
+    return this.xw((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   TypeRefImpl.prototype.containsTag = function (name) {
-    return this.i3r_1.containsTag(name);
+    return this.f3r_1.containsTag(name);
   };
   TypeRefImpl.prototype.equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.i3r_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.f3r_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   TypeRefImpl.prototype.equals = function (other) {
-    return this.i3r_1.equals(other);
+    return this.f3r_1.equals(other);
   };
   TypeRefImpl.prototype.get = function (index) {
-    return this.i3r_1.get(index);
+    return this.f3r_1.get(index);
   };
   TypeRefImpl.prototype.getArgAt = function (index) {
-    return this.i3r_1.getArgAt(index);
+    return this.f3r_1.getArgAt(index);
   };
   TypeRefImpl.prototype.getTag = function (name) {
-    return this.i3r_1.getTag(name);
+    return this.f3r_1.getTag(name);
   };
   TypeRefImpl.prototype.hashCode = function () {
-    return this.i3r_1.hashCode();
+    return this.f3r_1.hashCode();
   };
   TypeRefImpl.prototype.insertAt = function (index, argument) {
-    return this.i3r_1.insertAt(index, argument);
+    return this.f3r_1.insertAt(index, argument);
   };
   TypeRefImpl.prototype.resetTags = function (tags) {
-    return this.i3r_1.resetTags(tags);
+    return this.f3r_1.resetTags(tags);
   };
   TypeRefImpl.prototype.setArgs = function (args) {
-    return this.i3r_1.setArgs(args);
+    return this.f3r_1.setArgs(args);
   };
   TypeRefImpl.prototype.setArgsIterable = function (args) {
-    return this.i3r_1.setArgsIterable(args);
+    return this.f3r_1.setArgsIterable(args);
   };
   TypeRefImpl.prototype.setArgsSequence = function (args) {
-    return this.i3r_1.setArgsSequence(args);
+    return this.f3r_1.setArgsSequence(args);
   };
   TypeRefImpl.prototype.setFunctor = function (functor) {
-    return this.i3r_1.setFunctor(functor);
+    return this.f3r_1.setFunctor(functor);
   };
   TypeRefImpl.prototype.structurallyEquals = function (other) {
-    return this.i3r_1.structurallyEquals(other);
+    return this.f3r_1.structurallyEquals(other);
   };
   TypeRefImpl.prototype.toString = function () {
-    return this.i3r_1.toString();
+    return this.f3r_1.toString();
   };
-  TypeRefImpl.prototype.s3q = function (objectConverter, arguments_0) {
-    return create_0(this.h3r_1, objectConverter, arguments_0);
+  TypeRefImpl.prototype.p3q = function (objectConverter, arguments_0) {
+    return create_0(this.e3r_1, objectConverter, arguments_0);
   };
-  TypeRefImpl.prototype.m3p = function (objectConverter, methodName, arguments_0) {
-    var companionObjectRef = get_companionObjectRef(this.h3r_1);
+  TypeRefImpl.prototype.j3p = function (objectConverter, methodName, arguments_0) {
+    var companionObjectRef = get_companionObjectRef(this.e3r_1);
     var tmp;
     if (companionObjectRef instanceof Some) {
-      tmp = invoke_0(companionObjectRef.jq_1, objectConverter, methodName, arguments_0);
+      tmp = invoke_0(companionObjectRef.gq_1, objectConverter, methodName, arguments_0);
     } else {
-      tmp = invoke_1(this.h3r_1, objectConverter, methodName, arguments_0, null);
+      tmp = invoke_1(this.e3r_1, objectConverter, methodName, arguments_0, null);
     }
     return tmp;
   };
-  TypeRefImpl.prototype.ex = function () {
+  TypeRefImpl.prototype.bx = function () {
     return true;
   };
-  TypeRefImpl.prototype.ix = function () {
+  TypeRefImpl.prototype.fx = function () {
     return this;
   };
   TypeRefImpl.prototype.asConstant = function () {
-    return this.ix();
+    return this.fx();
   };
-  TypeRefImpl.prototype.iw = function () {
+  TypeRefImpl.prototype.fw = function () {
     return this;
   };
   TypeRefImpl.prototype.freshCopy = function () {
-    return this.iw();
+    return this.fw();
   };
-  TypeRefImpl.prototype.jw = function (scope) {
+  TypeRefImpl.prototype.gw = function (scope) {
     return this;
   };
   TypeRefImpl.prototype.freshCopyFromScope = function (scope) {
-    return this.jw(scope);
+    return this.gw(scope);
   };
-  TypeRefImpl.prototype.zw = function () {
+  TypeRefImpl.prototype.ww = function () {
     return isInterface(this, Term) ? this : THROW_CCE();
   };
-  TypeRefImpl.prototype.qq = function () {
-    return this.zw();
+  TypeRefImpl.prototype.nq = function () {
+    return this.ww();
   };
-  TypeRefImpl.prototype.s16 = function (substitution) {
+  TypeRefImpl.prototype.p16 = function (substitution) {
     return this;
   };
   TypeRefImpl.prototype.applySubstitution = function (substitution) {
-    return this.s16(substitution);
+    return this.p16(substitution);
   };
-  TypeRefImpl.prototype.f2p = function (substitution, substitutions) {
+  TypeRefImpl.prototype.c2p = function (substitution, substitutions) {
     return this;
   };
   TypeRefImpl.prototype.apply = function (substitution, substitutions) {
-    return this.f2p(substitution, substitutions);
+    return this.c2p(substitution, substitutions);
   };
-  TypeRefImpl.prototype.e2p = function (substitution, substitutions) {
+  TypeRefImpl.prototype.b2p = function (substitution, substitutions) {
     return this;
   };
   TypeRefImpl.prototype.getSubstituted = function (substitution, substitutions) {
-    return this.e2p(substitution, substitutions);
+    return this.b2p(substitution, substitutions);
   };
-  TypeRefImpl.prototype.y15 = function (visitor) {
+  TypeRefImpl.prototype.v15 = function (visitor) {
     return visitor.visitAtom(this);
   };
   TypeRefImpl.prototype.accept = function (visitor) {
-    return this.y15(visitor);
+    return this.v15(visitor);
   };
-  TypeRefImpl.prototype.n3p = function (objectConverter, propertyName, value) {
-    var companionObjectRef = get_companionObjectRef(this.h3r_1);
+  TypeRefImpl.prototype.k3p = function (objectConverter, propertyName, value) {
+    var companionObjectRef = get_companionObjectRef(this.e3r_1);
     if (companionObjectRef instanceof Some) {
-      assign_0(companionObjectRef.jq_1, objectConverter, propertyName, value);
+      assign_0(companionObjectRef.gq_1, objectConverter, propertyName, value);
     } else {
-      assign_1(this.h3r_1, objectConverter, propertyName, value, null);
+      assign_1(this.e3r_1, objectConverter, propertyName, value, null);
     }
     return true;
   };
   function actuallyInvoke(_this__u8e3s4, $this, ref, method, resultTerm) {
-    var result = ref.m3p(get_termToObjectConverter(_this__u8e3s4), method.fw(), method.gw());
+    var result = ref.j3p(get_termToObjectConverter(_this__u8e3s4), method.cw(), method.dw());
     var tmp;
     if (result instanceof Value) {
-      tmp = Companion_getInstance_13().e2h(_this__u8e3s4, resultTerm, $this.k3r(result));
+      tmp = Companion_getInstance_13().b2h(_this__u8e3s4, resultTerm, $this.h3r(result));
     } else {
       tmp = Companion_getInstance_12().failed();
     }
@@ -2206,9 +2206,9 @@
   function AbstractInvoke(suffix) {
     Functional.call(this, 'invoke_' + suffix);
   }
-  AbstractInvoke.prototype.n2q = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_13().o2h(_this__u8e3s4, 0);
-    Companion_getInstance_13().o2h(_this__u8e3s4, 1);
+  AbstractInvoke.prototype.k2q = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_13().l2h(_this__u8e3s4, 0);
+    Companion_getInstance_13().l2h(_this__u8e3s4, 1);
     var method = isInterface(second, Struct) ? second : THROW_CCE();
     var tmp$ret$1;
     $l$block: {
@@ -2233,7 +2233,7 @@
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
-          throw $p.x3q(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw $p.u3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             throw Companion_getInstance_14().forUncaughtKtException(_this__u8e3s4.context, $p);
@@ -2245,22 +2245,22 @@
     }
     return tmp$ret$1;
   };
-  AbstractInvoke.prototype.w2j = function (_this__u8e3s4, first, second, third) {
-    return this.n2q(_this__u8e3s4, first, second, third);
+  AbstractInvoke.prototype.t2j = function (_this__u8e3s4, first, second, third) {
+    return this.k2q(_this__u8e3s4, first, second, third);
   };
   function AbstractIterableItems$computeOneSubstitution$lambda($converter) {
     return function (it) {
-      return $converter.n3q(it);
+      return $converter.k3q(it);
     };
   }
   function AbstractIterableItems$computeOneSubstitution$lambda_0(it) {
-    return Companion_getInstance_20().z3p_1.e3q(it);
+    return Companion_getInstance_20().w3p_1.b3q(it);
   }
   function AbstractIterableItems(iterable, target) {
     Functional_0.call(this, iterable + '_items');
-    this.m3r_1 = target;
+    this.j3r_1 = target;
   }
-  AbstractIterableItems.prototype.k2q = function (_this__u8e3s4, first, second) {
+  AbstractIterableItems.prototype.h2q = function (_this__u8e3s4, first, second) {
     var tmp;
     var tmp_0;
     if (isInterface(first, Var)) {
@@ -2271,7 +2271,7 @@
     if (tmp_0) {
       var tmp$ret$1;
       // Inline function 'kotlin.let' call
-      var tmp0_let = Companion_getInstance_13().b2g(_this__u8e3s4);
+      var tmp0_let = Companion_getInstance_13().y2f(_this__u8e3s4);
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.AbstractIterableItems.computeOneSubstitution.<anonymous>' call
@@ -2281,51 +2281,51 @@
     } else {
       if (isInterface(second, List_0)) {
         var converter = get_termToObjectConverter(_this__u8e3s4);
-        var tmp_1 = second.ju();
-        var items = this.n3r(map(tmp_1, AbstractIterableItems$computeOneSubstitution$lambda(converter)));
-        var objectRef = Companion_getInstance_19().y3p(items);
-        tmp = Companion_getInstance_13().e2h(_this__u8e3s4, first, objectRef);
+        var tmp_1 = second.gu();
+        var items = this.k3r(map(tmp_1, AbstractIterableItems$computeOneSubstitution$lambda(converter)));
+        var objectRef = Companion_getInstance_19().v3p(items);
+        tmp = Companion_getInstance_13().b2h(_this__u8e3s4, first, objectRef);
       } else {
         if (isInterface(first, ObjectRef)) {
-          var obj = first.l3p();
+          var obj = first.i3p();
           var tmp_2;
-          if (this.o3r(obj)) {
-            var tmp_3 = this.p3r(isObject(obj) ? obj : THROW_CCE());
+          if (this.l3r(obj)) {
+            var tmp_3 = this.m3r(isObject(obj) ? obj : THROW_CCE());
             var items_0 = map(tmp_3, AbstractIterableItems$computeOneSubstitution$lambda_0);
-            tmp_2 = Companion_getInstance_13().e2h(_this__u8e3s4, second, Companion_getInstance_15().ofSequence(items_0));
+            tmp_2 = Companion_getInstance_13().b2h(_this__u8e3s4, second, Companion_getInstance_15().ofSequence(items_0));
           } else {
             tmp_2 = Companion_getInstance_12().failed();
           }
           tmp = tmp_2;
         } else {
-          throw Companion_getInstance_1().y25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_OBJECT_REFERENCE_getInstance(), first, 0);
+          throw Companion_getInstance_1().v25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_OBJECT_REFERENCE_getInstance(), first, 0);
         }
       }
     }
     return tmp;
   };
-  AbstractIterableItems.prototype.n2g = function (_this__u8e3s4, first, second) {
-    return this.k2q(_this__u8e3s4, first, second);
+  AbstractIterableItems.prototype.k2g = function (_this__u8e3s4, first, second) {
+    return this.h2q(_this__u8e3s4, first, second);
   };
   function ArrayItems() {
     ArrayItems_instance = this;
     AbstractIterableItems.call(this, 'array', PrimitiveClasses_getInstance().de());
   }
-  ArrayItems.prototype.n3r = function (_this__u8e3s4) {
+  ArrayItems.prototype.k3r = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'kotlin.collections.toTypedArray' call
     var tmp0_toTypedArray = toList(_this__u8e3s4);
     tmp$ret$0 = copyToArray(tmp0_toTypedArray);
     return tmp$ret$0;
   };
-  ArrayItems.prototype.o3r = function (_this__u8e3s4) {
+  ArrayItems.prototype.l3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isArray(_this__u8e3s4) : false;
   };
-  ArrayItems.prototype.s3r = function (_this__u8e3s4) {
+  ArrayItems.prototype.p3r = function (_this__u8e3s4) {
     return asSequence(_this__u8e3s4);
   };
-  ArrayItems.prototype.p3r = function (_this__u8e3s4) {
-    return this.s3r(isArray(_this__u8e3s4) ? _this__u8e3s4 : THROW_CCE());
+  ArrayItems.prototype.m3r = function (_this__u8e3s4) {
+    return this.p3r(isArray(_this__u8e3s4) ? _this__u8e3s4 : THROW_CCE());
   };
   var ArrayItems_instance;
   function ArrayItems_getInstance() {
@@ -2337,9 +2337,9 @@
     Assign_instance = this;
     Predicative.call(this, 'assign');
   }
-  Assign.prototype.u3r = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_13().t2h(_this__u8e3s4, 0);
-    Companion_getInstance_13().t2h(_this__u8e3s4, 1);
+  Assign.prototype.r3r = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_13().q2h(_this__u8e3s4, 0);
+    Companion_getInstance_13().q2h(_this__u8e3s4, 1);
     var tmp$ret$1;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2355,19 +2355,19 @@
         }
         var ref = tmp;
         var tmp_0;
-        if (Companion_getInstance_13().f2h(_this__u8e3s4, third, get_DEALIASING_TEMPLATE())) {
+        if (Companion_getInstance_13().c2h(_this__u8e3s4, third, get_DEALIASING_TEMPLATE())) {
           tmp_0 = findRefFromAlias(_this__u8e3s4, isInterface(third, Struct) ? third : THROW_CCE());
         } else {
           tmp_0 = third;
         }
         var value = tmp_0;
         var tmp_1 = get_termToObjectConverter(_this__u8e3s4);
-        tmp$ret$0 = ref.n3p(tmp_1, (isInterface(second, Atom) ? second : THROW_CCE()).b1(), value);
+        tmp$ret$0 = ref.k3p(tmp_1, (isInterface(second, Atom) ? second : THROW_CCE()).b1(), value);
         tmp$ret$1 = tmp$ret$0;
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
-          throw $p.x3q(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw $p.u3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             throw Companion_getInstance_14().forUncaughtKtException(_this__u8e3s4.context, $p);
@@ -2379,8 +2379,8 @@
     }
     return tmp$ret$1;
   };
-  Assign.prototype.y2j = function (_this__u8e3s4, first, second, third) {
-    return this.u3r(_this__u8e3s4, first, second, third);
+  Assign.prototype.v2j = function (_this__u8e3s4, first, second, third) {
+    return this.r3r(_this__u8e3s4, first, second, third);
   };
   var Assign_instance;
   function Assign_getInstance() {
@@ -2393,8 +2393,8 @@
     if (type == null) {
       tmp = Companion_getInstance_12().failed();
     } else {
-      var casted = get_termToObjectConverter(_this__u8e3s4).k3q(type, term);
-      tmp = Companion_getInstance_13().e2h(_this__u8e3s4, result, Companion_getInstance_19().y3p(casted));
+      var casted = get_termToObjectConverter(_this__u8e3s4).h3q(type, term);
+      tmp = Companion_getInstance_13().b2h(_this__u8e3s4, result, Companion_getInstance_19().v3p(casted));
     }
     return tmp;
   }
@@ -2403,19 +2403,19 @@
   }
   function Cast$computeAll$lambda_0($this_computeAll, $first, $third, $second) {
     return function (it) {
-      return cast($this_computeAll, Cast_getInstance(), $first, it, $third).plus(Companion_getInstance_13().e2h($this_computeAll, $second, Companion_getInstance_24().o3q(it)));
+      return cast($this_computeAll, Cast_getInstance(), $first, it, $third).plus(Companion_getInstance_13().b2h($this_computeAll, $second, Companion_getInstance_24().l3q(it)));
     };
   }
   function Cast$computeAll$lambda_1($this_computeAll) {
     return function (it) {
-      return $this_computeAll.j2g(it, null, [], 6, null);
+      return $this_computeAll.g2g(it, null, [], 6, null);
     };
   }
   function Cast() {
     Cast_instance = this;
     TernaryRelation.call(this, 'cast');
   }
-  Cast.prototype.w3r = function (_this__u8e3s4, first, second, third) {
+  Cast.prototype.t3r = function (_this__u8e3s4, first, second, third) {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2431,12 +2431,12 @@
           try {
             var tmp_1 = Cast_getInstance();
             var tmp1_safe_receiver = type;
-            var tmp_2 = cast(_this__u8e3s4, tmp_1, first, tmp1_safe_receiver == null ? null : tmp1_safe_receiver.k25(), third);
-            tmp_0 = sequenceOf([_this__u8e3s4.j2g(tmp_2, null, [], 6, null)]);
+            var tmp_2 = cast(_this__u8e3s4, tmp_1, first, tmp1_safe_receiver == null ? null : tmp1_safe_receiver.h25(), third);
+            tmp_0 = sequenceOf([_this__u8e3s4.g2g(tmp_2, null, [], 6, null)]);
           } catch ($p) {
             var tmp_3;
             if ($p instanceof TermToObjectConversionException) {
-              tmp_3 = sequenceOf([_this__u8e3s4.o2g(null, [], 3, null)]);
+              tmp_3 = sequenceOf([_this__u8e3s4.l2g(null, [], 3, null)]);
             } else {
               throw $p;
             }
@@ -2445,13 +2445,13 @@
           tmp = tmp_0;
         } else {
           if (isInterface(tmp0_subject, Var)) {
-            var tmp_4 = asSequence_0(get_termToObjectConverter(_this__u8e3s4).l3q(first));
+            var tmp_4 = asSequence_0(get_termToObjectConverter(_this__u8e3s4).i3q(first));
             var tmp_5 = distinct(flatMap(tmp_4, Cast$computeAll$lambda));
             var tmp_6 = map(tmp_5, Cast$computeAll$lambda_0(_this__u8e3s4, first, third, second));
             tmp = map(tmp_6, Cast$computeAll$lambda_1(_this__u8e3s4));
           } else {
             ensuringArgumentIsTypeRef(_this__u8e3s4, 1);
-            tmp = sequenceOf([_this__u8e3s4.o2g(null, [], 3, null)]);
+            tmp = sequenceOf([_this__u8e3s4.l2g(null, [], 3, null)]);
           }
         }
         tmp$ret$0 = tmp;
@@ -2459,7 +2459,7 @@
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
-          throw $p.x3q(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw $p.u3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             throw Companion_getInstance_14().forUncaughtKtException(_this__u8e3s4.context, $p);
@@ -2471,8 +2471,8 @@
     }
     return tmp$ret$1;
   };
-  Cast.prototype.r2j = function (_this__u8e3s4, first, second, third) {
-    return this.w3r(_this__u8e3s4, first, second, third);
+  Cast.prototype.o2j = function (_this__u8e3s4, first, second, third) {
+    return this.t3r(_this__u8e3s4, first, second, third);
   };
   var Cast_instance;
   function Cast_getInstance() {
@@ -2484,8 +2484,8 @@
     InvokeMethod_instance = this;
     AbstractInvoke.call(this, 'method');
   }
-  InvokeMethod.prototype.k3r = function (_this__u8e3s4) {
-    return _this__u8e3s4.r1i();
+  InvokeMethod.prototype.h3r = function (_this__u8e3s4) {
+    return _this__u8e3s4.o1i();
   };
   var InvokeMethod_instance;
   function InvokeMethod_getInstance() {
@@ -2497,8 +2497,8 @@
     InvokeStrict_instance = this;
     AbstractInvoke.call(this, 'strict');
   }
-  InvokeStrict.prototype.k3r = function (_this__u8e3s4) {
-    return _this__u8e3s4.f3q();
+  InvokeStrict.prototype.h3r = function (_this__u8e3s4) {
+    return _this__u8e3s4.c3q();
   };
   var InvokeStrict_instance;
   function InvokeStrict_getInstance() {
@@ -2510,17 +2510,17 @@
     ListItems_instance = this;
     AbstractIterableItems.call(this, 'list', getKClass(List));
   }
-  ListItems.prototype.n3r = function (_this__u8e3s4) {
+  ListItems.prototype.k3r = function (_this__u8e3s4) {
     return toList(_this__u8e3s4);
   };
-  ListItems.prototype.o3r = function (_this__u8e3s4) {
+  ListItems.prototype.l3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isInterface(_this__u8e3s4, List) : false;
   };
-  ListItems.prototype.b3s = function (_this__u8e3s4) {
+  ListItems.prototype.y3r = function (_this__u8e3s4) {
     return asSequence_0(_this__u8e3s4);
   };
-  ListItems.prototype.p3r = function (_this__u8e3s4) {
-    return this.b3s(isInterface(_this__u8e3s4, List) ? _this__u8e3s4 : THROW_CCE());
+  ListItems.prototype.m3r = function (_this__u8e3s4) {
+    return this.y3r(isInterface(_this__u8e3s4, List) ? _this__u8e3s4 : THROW_CCE());
   };
   var ListItems_instance;
   function ListItems_getInstance() {
@@ -2532,9 +2532,9 @@
     NewObject3_instance = this;
     Functional.call(this, 'new_object');
   }
-  NewObject3.prototype.n2q = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_13().o2h(_this__u8e3s4, 0);
-    Companion_getInstance_13().y2h(_this__u8e3s4, 1);
+  NewObject3.prototype.k2q = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_13().l2h(_this__u8e3s4, 0);
+    Companion_getInstance_13().v2h(_this__u8e3s4, 1);
     var tmp$ret$3;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2544,8 +2544,8 @@
         var type = getArgumentAsTypeRef(_this__u8e3s4, 0);
         var arguments_0 = (isInterface(second, List_0) ? second : THROW_CCE()).toArray();
         var tmp0_safe_receiver = type;
-        var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r3q(get_termToObjectConverter(_this__u8e3s4), arguments_0.slice());
-        var objectReference = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.f3q();
+        var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o3q(get_termToObjectConverter(_this__u8e3s4), arguments_0.slice());
+        var objectReference = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.c3q();
         var tmp2_safe_receiver = objectReference;
         var tmp;
         if (tmp2_safe_receiver == null) {
@@ -2556,7 +2556,7 @@
           // Inline function 'kotlin.contracts.contract' call
           var tmp$ret$0;
           // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.NewObject3.computeOneSubstitution.<anonymous>.<anonymous>' call
-          tmp$ret$0 = Companion_getInstance_13().e2h(_this__u8e3s4, tmp2_safe_receiver, third);
+          tmp$ret$0 = Companion_getInstance_13().b2h(_this__u8e3s4, tmp2_safe_receiver, third);
           tmp$ret$1 = tmp$ret$0;
           tmp = tmp$ret$1;
         }
@@ -2566,7 +2566,7 @@
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
-          throw $p.x3q(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw $p.u3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             throw Companion_getInstance_14().forUncaughtKtException(_this__u8e3s4.context, $p);
@@ -2578,8 +2578,8 @@
     }
     return tmp$ret$3;
   };
-  NewObject3.prototype.w2j = function (_this__u8e3s4, first, second, third) {
-    return this.n2q(_this__u8e3s4, first, second, third);
+  NewObject3.prototype.t2j = function (_this__u8e3s4, first, second, third) {
+    return this.k2q(_this__u8e3s4, first, second, third);
   };
   var NewObject3_instance;
   function NewObject3_getInstance() {
@@ -2591,7 +2591,7 @@
     NullRef_instance = this;
     TypeTester.call(this, 'null_ref');
   }
-  NullRef_0.prototype.i2k = function (term) {
+  NullRef_0.prototype.f2k = function (term) {
     return isInterface(term, NullRef);
   };
   var NullRef_instance;
@@ -2604,7 +2604,7 @@
     ObjectRef_instance = this;
     TypeTester.call(this, 'object_ref');
   }
-  ObjectRef_0.prototype.i2k = function (term) {
+  ObjectRef_0.prototype.f2k = function (term) {
     return isInterface(term, ObjectRef);
   };
   var ObjectRef_instance;
@@ -2637,11 +2637,11 @@
   function get_termToObjectConverter(_this__u8e3s4) {
     init_properties_PrimitiveExtensions_kt_j3o48p();
     var tmp = Companion_getInstance_22();
-    return tmp.h3q(null, _get_termToObjectConverter_$lambda_4bacq4(_this__u8e3s4), 1, null);
+    return tmp.e3q(null, _get_termToObjectConverter_$lambda_4bacq4(_this__u8e3s4), 1, null);
   }
   function ensuringArgumentIsTypeRef(_this__u8e3s4, index) {
     init_properties_PrimitiveExtensions_kt_j3o48p();
-    var arg = _this__u8e3s4.arguments.n(index);
+    var arg = _this__u8e3s4.arguments.o(index);
     var tmp;
     var tmp_0;
     if (matchesDealiasingTemplate(_this__u8e3s4, arg)) {
@@ -2654,7 +2654,7 @@
       tmp = _this__u8e3s4;
     } else {
       if (!isInterface(arg, TypeRef)) {
-        throw Companion_getInstance_1().y25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_TYPE_REFERENCE_getInstance(), arg, index);
+        throw Companion_getInstance_1().v25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_TYPE_REFERENCE_getInstance(), arg, index);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -2663,14 +2663,14 @@
   }
   function getArgumentAsTypeRef(_this__u8e3s4, index) {
     init_properties_PrimitiveExtensions_kt_j3o48p();
-    Companion_getInstance_13().o2h(_this__u8e3s4, index);
-    var arg = _this__u8e3s4.arguments.n(index);
+    Companion_getInstance_13().l2h(_this__u8e3s4, index);
+    var arg = _this__u8e3s4.arguments.o(index);
     var tmp;
     if (isInterface(arg, TypeRef)) {
       tmp = arg;
     } else {
       if (isInterface(arg, Atom)) {
-        tmp = Companion_getInstance_23().j3q_1.q3q(arg.b1());
+        tmp = Companion_getInstance_23().g3q_1.n3q(arg.b1());
       } else {
         if (isDealiasingExpression(_this__u8e3s4, arg)) {
           var tmp_0 = findRefFromAlias(_this__u8e3s4, arg.castToStruct());
@@ -2685,13 +2685,13 @@
   }
   function ensuringArgumentIsRef(_this__u8e3s4, index) {
     init_properties_PrimitiveExtensions_kt_j3o48p();
-    var arg = _this__u8e3s4.arguments.n(index);
+    var arg = _this__u8e3s4.arguments.o(index);
     var tmp;
     if (matchesDealiasingTemplate(_this__u8e3s4, arg) ? ensureAliasIsRegistered(_this__u8e3s4, arg.castToStruct()) : false) {
       tmp = _this__u8e3s4;
     } else {
       if (!isInterface(arg, Ref)) {
-        throw Companion_getInstance_1().y25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_REFERENCE_getInstance(), arg, index);
+        throw Companion_getInstance_1().v25(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_REFERENCE_getInstance(), arg, index);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -2714,19 +2714,19 @@
     var tmp_1 = Companion_getInstance_17();
     Companion_getInstance_27();
     var tmp_2 = tmp_1.of('alias', [actualAlias, ActualRef]);
-    var tmp0_filterIsInstance = _this__u8e3s4.h2j(tmp_2, new Long(0, 0), 2, null);
+    var tmp0_filterIsInstance = _this__u8e3s4.e2j(tmp_2, new Long(0, 0), 2, null);
     var tmp_3 = filter(tmp0_filterIsInstance, findRefFromAliasOrNull$lambda);
     tmp$ret$0 = isInterface(tmp_3, Sequence) ? tmp_3 : THROW_CCE();
     var tmp0_safe_receiver = firstOrNull(tmp$ret$0);
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w1v();
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.t1v();
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.get(1);
-    return tmp2_safe_receiver == null ? null : tmp2_safe_receiver.zw();
+    return tmp2_safe_receiver == null ? null : tmp2_safe_receiver.ww();
   }
   function matchesDealiasingTemplate(_this__u8e3s4, term) {
     init_properties_PrimitiveExtensions_kt_j3o48p();
     var tmp;
     if (isInterface(term, Struct)) {
-      tmp = Companion_getInstance_13().f2h(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
+      tmp = Companion_getInstance_13().c2h(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
     } else {
       tmp = false;
     }
@@ -2737,12 +2737,12 @@
     var tmp;
     var tmp_0;
     if (isInterface(term, Struct)) {
-      tmp_0 = Companion_getInstance_13().f2h(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
+      tmp_0 = Companion_getInstance_13().c2h(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      var tmp_1 = term.gw().n(0);
+      var tmp_1 = term.dw().o(0);
       tmp = isInterface(tmp_1, Atom);
     } else {
       tmp = false;
@@ -2789,7 +2789,7 @@
     Ref_instance = this;
     TypeTester.call(this, 'ref');
   }
-  Ref_0.prototype.i2k = function (term) {
+  Ref_0.prototype.f2k = function (term) {
     return isInterface(term, Ref);
   };
   var Ref_instance;
@@ -2802,8 +2802,8 @@
     return function ($this$replySuccess) {
       var tmp = Companion_getInstance_27();
       var tmp_0 = isInterface($second, Struct) ? $second : THROW_CCE();
-      var tmp_1 = [tmp.g3s(tmp_0, isInterface($first, Ref) ? $first : THROW_CCE()).j1u()];
-      $this$replySuccess.y2m(tmp_1, false, 2, null);
+      var tmp_1 = [tmp.d3s(tmp_0, isInterface($first, Ref) ? $first : THROW_CCE()).g1u()];
+      $this$replySuccess.v2m(tmp_1, false, 2, null);
       return Unit_getInstance();
     };
   }
@@ -2811,17 +2811,17 @@
     Register_instance = this;
     NonBacktrackable.call(this, 'register');
   }
-  Register.prototype.a2q = function (_this__u8e3s4, first_0, second) {
-    Companion_getInstance_13().b2g(_this__u8e3s4);
+  Register.prototype.x2p = function (_this__u8e3s4, first_0, second) {
+    Companion_getInstance_13().y2f(_this__u8e3s4);
     ensuringArgumentIsRef(_this__u8e3s4, 0);
-    Companion_getInstance_13().o2h(_this__u8e3s4, 1);
-    if (!second.jx()) {
-      throw Companion_getInstance_18().b27(_this__u8e3s4.context, _this__u8e3s4.signature, first(second.hw()), 0);
+    Companion_getInstance_13().l2h(_this__u8e3s4, 1);
+    if (!second.gx()) {
+      throw Companion_getInstance_18().y26(_this__u8e3s4.context, _this__u8e3s4.signature, first(second.ew()), 0);
     }
-    return _this__u8e3s4.e2j(null, null, Register$computeOne$lambda(second, first_0), 3, null);
+    return _this__u8e3s4.b2j(null, null, Register$computeOne$lambda(second, first_0), 3, null);
   };
-  Register.prototype.d2g = function (_this__u8e3s4, first, second) {
-    return this.a2q(_this__u8e3s4, first, second);
+  Register.prototype.a2g = function (_this__u8e3s4, first, second) {
+    return this.x2p(_this__u8e3s4, first, second);
   };
   var Register_instance;
   function Register_getInstance() {
@@ -2833,17 +2833,17 @@
     SetItems_instance = this;
     AbstractIterableItems.call(this, 'set', getKClass(Set));
   }
-  SetItems.prototype.n3r = function (_this__u8e3s4) {
+  SetItems.prototype.k3r = function (_this__u8e3s4) {
     return toSet(_this__u8e3s4);
   };
-  SetItems.prototype.o3r = function (_this__u8e3s4) {
+  SetItems.prototype.l3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isInterface(_this__u8e3s4, Set) : false;
   };
-  SetItems.prototype.k3s = function (_this__u8e3s4) {
+  SetItems.prototype.h3s = function (_this__u8e3s4) {
     return asSequence_0(_this__u8e3s4);
   };
-  SetItems.prototype.p3r = function (_this__u8e3s4) {
-    return this.k3s(isInterface(_this__u8e3s4, Set) ? _this__u8e3s4 : THROW_CCE());
+  SetItems.prototype.m3r = function (_this__u8e3s4) {
+    return this.h3s(isInterface(_this__u8e3s4, Set) ? _this__u8e3s4 : THROW_CCE());
   };
   var SetItems_instance;
   function SetItems_getInstance() {
@@ -2854,9 +2854,9 @@
   function Type() {
     Type_instance = this;
     Functional_0.call(this, 'type');
-    this.m3s_1 = Companion_getInstance_23().j3q_1;
+    this.j3s_1 = Companion_getInstance_23().g3q_1;
   }
-  Type.prototype.k2q = function (_this__u8e3s4, first, second) {
+  Type.prototype.h2q = function (_this__u8e3s4, first, second) {
     var tmp$ret$3;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2871,20 +2871,20 @@
           tmp_0 = false;
         }
         if (tmp_0) {
-          Companion_getInstance_13().k2h(_this__u8e3s4, 0);
+          Companion_getInstance_13().h2h(_this__u8e3s4, 0);
           tmp = Companion_getInstance_12().failed();
         } else {
           if (isInterface(first, Var)) {
-            Companion_getInstance_13().t2h(_this__u8e3s4, 1);
+            Companion_getInstance_13().q2h(_this__u8e3s4, 1);
             ensuringArgumentIsTypeRef(_this__u8e3s4, 1);
             var tmp_1 = Companion_getInstance_13();
             var tmp_2 = Companion_getInstance_5();
-            tmp = tmp_1.e2h(_this__u8e3s4, first, tmp_2.of(get_name((isInterface(second, TypeRef) ? second : THROW_CCE()).k25())));
+            tmp = tmp_1.b2h(_this__u8e3s4, first, tmp_2.of(get_name((isInterface(second, TypeRef) ? second : THROW_CCE()).h25())));
           } else {
             if (isInterface(second, Var)) {
-              Companion_getInstance_13().t2h(_this__u8e3s4, 0);
-              var tmp_3 = Type_getInstance().m3s_1;
-              var tmp0_safe_receiver = tmp_3.q3q((isInterface(first, Atom) ? first : THROW_CCE()).b1());
+              Companion_getInstance_13().q2h(_this__u8e3s4, 0);
+              var tmp_3 = Type_getInstance().j3s_1;
+              var tmp0_safe_receiver = tmp_3.n3q((isInterface(first, Atom) ? first : THROW_CCE()).b1());
               var tmp_4;
               if (tmp0_safe_receiver == null) {
                 tmp_4 = null;
@@ -2894,14 +2894,14 @@
                 // Inline function 'kotlin.contracts.contract' call
                 var tmp$ret$0;
                 // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.Type.computeOneSubstitution.<anonymous>.<anonymous>' call
-                tmp$ret$0 = Companion_getInstance_13().e2h(_this__u8e3s4, tmp0_safe_receiver, second);
+                tmp$ret$0 = Companion_getInstance_13().b2h(_this__u8e3s4, tmp0_safe_receiver, second);
                 tmp$ret$1 = tmp$ret$0;
                 tmp_4 = tmp$ret$1;
               }
               var tmp1_elvis_lhs = tmp_4;
               tmp = tmp1_elvis_lhs == null ? Companion_getInstance_12().failed() : tmp1_elvis_lhs;
             } else {
-              Companion_getInstance_13().t2h(_this__u8e3s4, 0);
+              Companion_getInstance_13().q2h(_this__u8e3s4, 0);
               tmp = Companion_getInstance_12().failed();
             }
           }
@@ -2911,7 +2911,7 @@
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
-          throw $p.x3q(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw $p.u3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             throw Companion_getInstance_14().forUncaughtKtException(_this__u8e3s4.context, $p);
@@ -2923,8 +2923,8 @@
     }
     return tmp$ret$3;
   };
-  Type.prototype.n2g = function (_this__u8e3s4, first, second) {
-    return this.k2q(_this__u8e3s4, first, second);
+  Type.prototype.k2g = function (_this__u8e3s4, first, second) {
+    return this.h2q(_this__u8e3s4, first, second);
   };
   var Type_instance;
   function Type_getInstance() {
@@ -2936,7 +2936,7 @@
     TypeRef_instance = this;
     TypeTester.call(this, 'type_ref');
   }
-  TypeRef_0.prototype.i2k = function (term) {
+  TypeRef_0.prototype.f2k = function (term) {
     return isInterface(term, TypeRef);
   };
   var TypeRef_instance;
@@ -2947,12 +2947,12 @@
   }
   function Unregister$computeOne$lambda($first) {
     return function (it) {
-      return it.ly().get(0).equals($first);
+      return it.iy().get(0).equals($first);
     };
   }
   function Unregister$computeOne$lambda_0($toBeRemoved) {
     return function ($this$replySuccess) {
-      $this$replySuccess.z2m($toBeRemoved);
+      $this$replySuccess.w2m($toBeRemoved);
       return Unit_getInstance();
     };
   }
@@ -2960,26 +2960,26 @@
     Unregister_instance = this;
     NonBacktrackable_0.call(this, 'unregister');
   }
-  Unregister.prototype.j2p = function (_this__u8e3s4, first_0) {
-    Companion_getInstance_13().o2h(_this__u8e3s4, 0);
-    if (!first_0.jx()) {
-      throw Companion_getInstance_18().b27(_this__u8e3s4.context, _this__u8e3s4.signature, first(first_0.hw()), 0);
+  Unregister.prototype.g2p = function (_this__u8e3s4, first_0) {
+    Companion_getInstance_13().l2h(_this__u8e3s4, 0);
+    if (!first_0.gx()) {
+      throw Companion_getInstance_18().y26(_this__u8e3s4.context, _this__u8e3s4.signature, first(first_0.ew()), 0);
     }
     var tmp = Companion_getInstance_17();
     Companion_getInstance_27();
     var pattern = tmp.of('alias', [first_0, Companion_getInstance_16().anonymous()]);
-    var tmp_0 = _this__u8e3s4.context.y1u().getByHead(pattern);
+    var tmp_0 = _this__u8e3s4.context.v1u().getByHead(pattern);
     var toBeRemoved = toList(filter(tmp_0, Unregister$computeOne$lambda(first_0)));
     var tmp_1;
     if (toBeRemoved.d()) {
-      tmp_1 = _this__u8e3s4.o2g(null, [], 3, null);
+      tmp_1 = _this__u8e3s4.l2g(null, [], 3, null);
     } else {
-      tmp_1 = _this__u8e3s4.e2j(null, null, Unregister$computeOne$lambda_0(toBeRemoved), 3, null);
+      tmp_1 = _this__u8e3s4.b2j(null, null, Unregister$computeOne$lambda_0(toBeRemoved), 3, null);
     }
     return tmp_1;
   };
-  Unregister.prototype.d2k = function (_this__u8e3s4, first) {
-    return this.j2p(_this__u8e3s4, first);
+  Unregister.prototype.a2k = function (_this__u8e3s4, first) {
+    return this.g2p(_this__u8e3s4, first);
   };
   var Unregister_instance;
   function Unregister_getInstance() {
@@ -2989,12 +2989,12 @@
   }
   function Companion_7() {
     Companion_instance_7 = this;
-    this.u3p_1 = 'alias';
+    this.r3p_1 = 'alias';
   }
-  Companion_7.prototype.v3p = function (alias, type) {
-    return new Alias(Companion_getInstance_5().of(alias), Companion_getInstance_24().o3q(type));
+  Companion_7.prototype.s3p = function (alias, type) {
+    return new Alias(Companion_getInstance_5().of(alias), Companion_getInstance_24().l3q(type));
   };
-  Companion_7.prototype.g3s = function (alias, ref) {
+  Companion_7.prototype.d3s = function (alias, ref) {
     return new Alias(alias, ref);
   };
   var Companion_instance_7;
@@ -3007,66 +3007,66 @@
     Companion_getInstance_27();
     Companion_getInstance_27();
     RuleWrapper_init_$Init$('alias', 2, false, 4, null, this);
-    this.s3s_1 = alias;
-    this.t3s_1 = ref;
+    this.p3s_1 = alias;
+    this.q3s_1 = ref;
     // Inline function 'kotlin.require' call
-    var tmp0_require = this.s3s_1.jx();
+    var tmp0_require = this.p3s_1.gx();
     // Inline function 'kotlin.contracts.contract' call
     if (!tmp0_require) {
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.rules.Alias.<anonymous>' call
-      tmp$ret$0 = 'Alias must be a ground term, got: ' + this.s3s_1;
+      tmp$ret$0 = 'Alias must be a ground term, got: ' + this.p3s_1;
       var message = tmp$ret$0;
       throw IllegalArgumentException_init_$Create$(toString_0(message));
     }
   }
-  Alias.prototype.j2k = function (_this__u8e3s4) {
-    return toList(sequenceOf([this.s3s_1, this.t3s_1]));
+  Alias.prototype.g2k = function (_this__u8e3s4) {
+    return toList(sequenceOf([this.p3s_1, this.q3s_1]));
   };
   function _get_R__7mlo3j($this) {
-    return $this.x3s_1.k1i($this, R$factory());
+    return $this.u3s_1.h1i($this, R$factory());
   }
   function _get_X__7mlo8p($this) {
-    return $this.y3s_1.k1i($this, X$factory());
+    return $this.v3s_1.h1i($this, X$factory());
   }
   function _get_Y__7mlo9k($this) {
-    return $this.z3s_1.k1i($this, Y$factory());
+    return $this.w3s_1.h1i($this, Y$factory());
   }
   function _get_T__7mlo59($this) {
-    return $this.a3t_1.k1i($this, T$factory());
+    return $this.x3s_1.h1i($this, T$factory());
   }
   function _get_R__7mlo3j_0($this) {
-    return $this.e3t_1.k1i($this, R$factory_0());
+    return $this.b3t_1.h1i($this, R$factory_0());
   }
   function _get_M__7mlnz8($this) {
-    return $this.f3t_1.k1i($this, M$factory());
+    return $this.c3t_1.h1i($this, M$factory());
   }
   function _get_C__7mlnqm($this) {
-    return $this.j3t_1.k1i($this, C$factory());
+    return $this.g3t_1.h1i($this, C$factory());
   }
   function _get_P__7mlo1t($this) {
-    return $this.k3t_1.k1i($this, P$factory());
+    return $this.h3t_1.h1i($this, P$factory());
   }
   function _get_R__7mlo3j_1($this) {
-    return $this.l3t_1.k1i($this, R$factory_1());
+    return $this.i3t_1.h1i($this, R$factory_1());
   }
   function _get_V__7mlo6z($this) {
-    return $this.m3t_1.k1i($this, V$factory());
+    return $this.j3t_1.h1i($this, V$factory());
   }
   function Cast_0() {
     Cast_instance_0 = this;
     ColonEquals.call(this);
-    this.x3s_1 = this.g1z_1;
-    this.y3s_1 = this.g1z_1;
-    this.z3s_1 = this.g1z_1;
-    this.a3t_1 = this.g1z_1;
+    this.u3s_1 = this.d1z_1;
+    this.v3s_1 = this.d1z_1;
+    this.w3s_1 = this.d1z_1;
+    this.x3s_1 = this.d1z_1;
   }
-  Cast_0.prototype.j2k = function (_this__u8e3s4) {
+  Cast_0.prototype.g2k = function (_this__u8e3s4) {
     var tmp = _get_R__7mlo3j(this);
     OOP_getInstance();
     return _this__u8e3s4.ktListOf([tmp, _this__u8e3s4.structOf('as', [_get_X__7mlo8p(this), _get_T__7mlo59(this)])]);
   };
-  Cast_0.prototype.k2k = function (_this__u8e3s4) {
+  Cast_0.prototype.h2k = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = Var_getInstance();
@@ -3090,13 +3090,13 @@
   function Invocation() {
     Invocation_instance = this;
     ColonEquals.call(this);
-    this.e3t_1 = this.g1z_1;
-    this.f3t_1 = this.g1z_1;
+    this.b3t_1 = this.d1z_1;
+    this.c3t_1 = this.d1z_1;
   }
-  Invocation.prototype.j2k = function (_this__u8e3s4) {
+  Invocation.prototype.g2k = function (_this__u8e3s4) {
     return listOf([_get_R__7mlo3j_0(this), _get_M__7mlnz8(this)]);
   };
-  Invocation.prototype.k2k = function (_this__u8e3s4) {
+  Invocation.prototype.h2k = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = Var_getInstance();
@@ -3115,15 +3115,15 @@
   function Assignment() {
     Assignment_instance = this;
     ColonEquals.call(this);
-    this.j3t_1 = this.g1z_1;
-    this.k3t_1 = this.g1z_1;
-    this.l3t_1 = this.g1z_1;
-    this.m3t_1 = this.g1z_1;
+    this.g3t_1 = this.d1z_1;
+    this.h3t_1 = this.d1z_1;
+    this.i3t_1 = this.d1z_1;
+    this.j3t_1 = this.d1z_1;
   }
-  Assignment.prototype.j2k = function (_this__u8e3s4) {
+  Assignment.prototype.g2k = function (_this__u8e3s4) {
     return listOf([_get_C__7mlnqm(this), _get_V__7mlo6z(this)]);
   };
-  Assignment.prototype.k2k = function (_this__u8e3s4) {
+  Assignment.prototype.h2k = function (_this__u8e3s4) {
     Companion_getInstance_29();
     var tmp = _this__u8e3s4.structOf('property_reduce', [_get_C__7mlnqm(this), _get_R__7mlo3j_1(this), _get_P__7mlo1t(this)]);
     var tmp$ret$0;
@@ -3193,24 +3193,24 @@
     }, null);
   }
   function _get_Method__a3idyi($this) {
-    return $this.q3t_1.k1i($this, Method$factory());
+    return $this.n3t_1.h1i($this, Method$factory());
   }
   function _get_Ref__e5vi4e($this) {
-    return $this.r3t_1.k1i($this, Ref$factory());
+    return $this.o3t_1.h1i($this, Ref$factory());
   }
   function Dot() {
     Dot_instance = this;
     OOP_getInstance();
     RuleWrapper_init_$Init$('.', 2, false, 4, null, this);
-    this.q3t_1 = this.g1z_1;
-    this.r3t_1 = this.g1z_1;
+    this.n3t_1 = this.d1z_1;
+    this.o3t_1 = this.d1z_1;
   }
-  Dot.prototype.j2k = function (_this__u8e3s4) {
+  Dot.prototype.g2k = function (_this__u8e3s4) {
     return listOf([_get_Ref__e5vi4e(this), _get_Method__a3idyi(this)]);
   };
-  Dot.prototype.k2k = function (_this__u8e3s4) {
+  Dot.prototype.h2k = function (_this__u8e3s4) {
     Companion_getInstance_28();
-    return _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_Ref__e5vi4e(this), _get_Method__a3idyi(this)), _this__u8e3s4.w11()]);
+    return _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_Ref__e5vi4e(this), _get_Method__a3idyi(this)), _this__u8e3s4.t11()]);
   };
   var Dot_instance;
   function Dot_getInstance() {
@@ -3229,27 +3229,27 @@
     }, null);
   }
   function _get_P__7mlo1t_0($this) {
-    return $this.w3t_1.k1i($this, P$factory_0());
+    return $this.t3t_1.h1i($this, P$factory_0());
   }
   function _get_M__7mlnz8_0($this) {
-    return $this.x3t_1.k1i($this, M$factory_0());
+    return $this.u3t_1.h1i($this, M$factory_0());
   }
   function _get_P1__ndbjd6($this) {
-    return $this.y3t_1.k1i($this, P1$factory());
+    return $this.v3t_1.h1i($this, P1$factory());
   }
   function _get_X__7mlo8p_0($this) {
-    return $this.z3t_1.k1i($this, X$factory_0());
+    return $this.w3t_1.h1i($this, X$factory_0());
   }
   function _get_P__7mlo1t_1($this) {
-    return $this.e3u_1.k1i($this, P$factory_1());
+    return $this.b3u_1.h1i($this, P$factory_1());
   }
   function _get_M__7mlnz8_1($this) {
-    return $this.f3u_1.k1i($this, M$factory_1());
+    return $this.c3u_1.h1i($this, M$factory_1());
   }
   function Companion_8() {
     Companion_instance_8 = this;
-    this.g3u_1 = 'fluent_reduce';
-    this.h3u_1 = 2;
+    this.d3u_1 = 'fluent_reduce';
+    this.e3u_1 = 2;
   }
   var Companion_instance_8;
   function Companion_getInstance_28() {
@@ -3260,15 +3260,15 @@
   function Recursive() {
     Recursive_instance = this;
     FluentReduce.call(this);
-    this.w3t_1 = this.g1z_1;
-    this.x3t_1 = this.g1z_1;
-    this.y3t_1 = this.g1z_1;
-    this.z3t_1 = this.g1z_1;
+    this.t3t_1 = this.d1z_1;
+    this.u3t_1 = this.d1z_1;
+    this.v3t_1 = this.d1z_1;
+    this.w3t_1 = this.d1z_1;
   }
-  Recursive.prototype.j2k = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.x11([_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this)], _get_X__7mlo8p_0(this)), this.m3u()]);
+  Recursive.prototype.g2k = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.u11([_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this)], _get_X__7mlo8p_0(this)), this.j3u()]);
   };
-  Recursive.prototype.k2k = function (_this__u8e3s4) {
+  Recursive.prototype.h2k = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
@@ -3276,7 +3276,7 @@
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
     var tmp_0 = _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this), _get_P1__ndbjd6(this)]);
     Companion_getInstance_28();
-    return _this__u8e3s4.tupleOf([tmp, tmp_0, _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_P1__ndbjd6(this), _get_X__7mlo8p_0(this)), this.m3u()])]);
+    return _this__u8e3s4.tupleOf([tmp, tmp_0, _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_P1__ndbjd6(this), _get_X__7mlo8p_0(this)), this.j3u()])]);
   };
   var Recursive_instance;
   function Recursive_getInstance() {
@@ -3287,19 +3287,19 @@
   function Couple() {
     Couple_instance = this;
     FluentReduce.call(this);
-    this.e3u_1 = this.g1z_1;
-    this.f3u_1 = this.g1z_1;
+    this.b3u_1 = this.d1z_1;
+    this.c3u_1 = this.d1z_1;
   }
-  Couple.prototype.j2k = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.consOf(_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this)), this.m3u()]);
+  Couple.prototype.g2k = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.consOf(_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this)), this.j3u()]);
   };
-  Couple.prototype.k2k = function (_this__u8e3s4) {
+  Couple.prototype.h2k = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = InvokeMethod_getInstance();
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this), this.m3u()])]);
+    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this), this.j3u()])]);
   };
   var Couple_instance;
   function Couple_getInstance() {
@@ -3311,8 +3311,8 @@
     Trivial_instance = this;
     FluentReduce.call(this);
   }
-  Trivial.prototype.j2k = function (_this__u8e3s4) {
-    return listOf([this.m3u(), this.m3u()]);
+  Trivial.prototype.g2k = function (_this__u8e3s4) {
+    return listOf([this.j3u(), this.j3u()]);
   };
   var Trivial_instance;
   function Trivial_getInstance() {
@@ -3325,17 +3325,17 @@
     Companion_getInstance_28();
     Companion_getInstance_28();
     RuleWrapper_init_$Init$('fluent_reduce', 2, false, 4, null, this);
-    this.l3u_1 = this.g1z_1;
+    this.i3u_1 = this.d1z_1;
   }
-  FluentReduce.prototype.m3u = function () {
-    return this.l3u_1.k1i(this, R$factory_2());
+  FluentReduce.prototype.j3u = function () {
+    return this.i3u_1.h1i(this, R$factory_2());
   };
-  FluentReduce.prototype.k2k = function (_this__u8e3s4) {
+  FluentReduce.prototype.h2k = function (_this__u8e3s4) {
     return _this__u8e3s4.atomOf('!');
   };
   function R$factory_2() {
     return getPropertyCallableRef('R', 1, KProperty1, function (receiver) {
-      return receiver.m3u();
+      return receiver.j3u();
     }, null);
   }
   function P$factory_0() {
@@ -3369,10 +3369,10 @@
     }, null);
   }
   function _get_Type__cwwv8x($this) {
-    return $this.u3u_1.k1i($this, Type$factory());
+    return $this.r3u_1.h1i($this, Type$factory());
   }
   function _get_Instance__cwfjuy($this) {
-    return $this.v3u_1.k1i($this, Instance$factory());
+    return $this.s3u_1.h1i($this, Instance$factory());
   }
   function NewObject2() {
     NewObject2_instance = this;
@@ -3382,18 +3382,18 @@
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
     var tmp = tmp$ret$0;
     RuleWrapper_init_$Init$(tmp, 2, false, 4, null, this);
-    this.u3u_1 = this.g1z_1;
-    this.v3u_1 = this.g1z_1;
+    this.r3u_1 = this.d1z_1;
+    this.s3u_1 = this.d1z_1;
   }
-  NewObject2.prototype.j2k = function (_this__u8e3s4) {
+  NewObject2.prototype.g2k = function (_this__u8e3s4) {
     return listOf([_get_Type__cwwv8x(this), _get_Instance__cwfjuy(this)]);
   };
-  NewObject2.prototype.k2k = function (_this__u8e3s4) {
+  NewObject2.prototype.h2k = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = NewObject3_getInstance();
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-    return _this__u8e3s4.structOf(tmp$ret$0, [_get_Type__cwwv8x(this), _this__u8e3s4.v11(), _get_Instance__cwfjuy(this)]);
+    return _this__u8e3s4.structOf(tmp$ret$0, [_get_Type__cwwv8x(this), _this__u8e3s4.s11(), _get_Instance__cwfjuy(this)]);
   };
   var NewObject2_instance;
   function NewObject2_getInstance() {
@@ -3412,21 +3412,21 @@
     }, null);
   }
   function _get_B1__ndb8zg($this) {
-    return $this.b3v_1.k1i($this, B1$factory());
+    return $this.y3u_1.h1i($this, B1$factory());
   }
   function _get_C__7mlnqm_0($this) {
-    return $this.c3v_1.k1i($this, C$factory_0());
+    return $this.z3u_1.h1i($this, C$factory_0());
   }
   function _get_O__7mlo0y($this) {
-    return $this.d3v_1.k1i($this, O$factory());
+    return $this.a3v_1.h1i($this, O$factory());
   }
   function _get_P__7mlo1t_2($this) {
-    return $this.e3v_1.k1i($this, P$factory_2());
+    return $this.b3v_1.h1i($this, P$factory_2());
   }
   function Companion_9() {
     Companion_instance_9 = this;
-    this.f3v_1 = 'property_reduce';
-    this.g3v_1 = 3;
+    this.c3v_1 = 'property_reduce';
+    this.d3v_1 = 3;
   }
   var Companion_instance_9;
   function Companion_getInstance_29() {
@@ -3437,21 +3437,21 @@
   function Recursive_0() {
     Recursive_instance_0 = this;
     PropertyReduce.call(this);
-    this.b3v_1 = this.g1z_1;
-    this.c3v_1 = this.g1z_1;
-    this.d3v_1 = this.g1z_1;
-    this.e3v_1 = this.g1z_1;
+    this.y3u_1 = this.d1z_1;
+    this.z3u_1 = this.d1z_1;
+    this.a3v_1 = this.d1z_1;
+    this.b3v_1 = this.d1z_1;
   }
-  Recursive_0.prototype.j2k = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.x11([this.m3v(), this.n3v()], _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)]);
+  Recursive_0.prototype.g2k = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.u11([this.j3v(), this.k3v()], _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)]);
   };
-  Recursive_0.prototype.k2k = function (_this__u8e3s4) {
+  Recursive_0.prototype.h2k = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = InvokeMethod_getInstance();
     tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-    var tmp_0 = _this__u8e3s4.structOf(tmp$ret$0, [this.m3v(), this.n3v(), _get_B1__ndb8zg(this)]);
+    var tmp_0 = _this__u8e3s4.structOf(tmp$ret$0, [this.j3v(), this.k3v(), _get_B1__ndb8zg(this)]);
     Companion_getInstance_29();
     return _this__u8e3s4.tupleOf([tmp, tmp_0, _this__u8e3s4.structOf('property_reduce', [_this__u8e3s4.consOf(_get_B1__ndb8zg(this), _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)])]);
   };
@@ -3465,8 +3465,8 @@
     Base_instance = this;
     PropertyReduce.call(this);
   }
-  Base.prototype.j2k = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.consOf(this.m3v(), this.n3v()), this.m3v(), this.n3v()]);
+  Base.prototype.g2k = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.consOf(this.j3v(), this.k3v()), this.j3v(), this.k3v()]);
   };
   var Base_instance;
   function Base_getInstance() {
@@ -3479,26 +3479,26 @@
     Companion_getInstance_29();
     Companion_getInstance_29();
     RuleWrapper_init_$Init$('property_reduce', 3, false, 4, null, this);
-    this.k3v_1 = this.g1z_1;
-    this.l3v_1 = this.g1z_1;
+    this.h3v_1 = this.d1z_1;
+    this.i3v_1 = this.d1z_1;
   }
-  PropertyReduce.prototype.m3v = function () {
-    return this.k3v_1.k1i(this, A$factory());
+  PropertyReduce.prototype.j3v = function () {
+    return this.h3v_1.h1i(this, A$factory());
   };
-  PropertyReduce.prototype.n3v = function () {
-    return this.l3v_1.k1i(this, B$factory());
+  PropertyReduce.prototype.k3v = function () {
+    return this.i3v_1.h1i(this, B$factory());
   };
-  PropertyReduce.prototype.k2k = function (_this__u8e3s4) {
+  PropertyReduce.prototype.h2k = function (_this__u8e3s4) {
     return _this__u8e3s4.atomOf('!');
   };
   function A$factory() {
     return getPropertyCallableRef('A', 1, KProperty1, function (receiver) {
-      return receiver.m3v();
+      return receiver.j3v();
     }, null);
   }
   function B$factory() {
     return getPropertyCallableRef('B', 1, KProperty1, function (receiver) {
-      return receiver.n3v();
+      return receiver.k3v();
     }, null);
   }
   function B1$factory() {
@@ -3555,7 +3555,7 @@
   }
   function get_companionObjectRef(_this__u8e3s4) {
     init_properties_TypeUtilsJs_kt_pjy9o4();
-    return Companion_getInstance().oq();
+    return Companion_getInstance().lq();
   }
   function kClassFromName(qualifiedName) {
     init_properties_TypeUtilsJs_kt_pjy9o4();
@@ -3570,8 +3570,8 @@
       var message = tmp$ret$0;
       throw IllegalArgumentException_init_$Create$(toString_0(message));
     }
-    var module_0 = ensureNotNull(match.l9().n(1)).qf_1;
-    var tmp = ensureNotNull(match.l9().n(2)).qf_1;
+    var module_0 = ensureNotNull(match.l9().o(1)).qf_1;
+    var tmp = ensureNotNull(match.l9().o(2)).qf_1;
     var tmp_0 = charArrayOf([_Char___init__impl__6a9atx(46)]);
     var packageSteps = split$default(tmp, tmp_0, false, 0, 6, null);
     var kClass = require(module_0);
@@ -3580,7 +3580,7 @@
     var tmp1_let = packageSteps.j();
     // Inline function 'kotlin.contracts.contract' call
     while ((tmp1_let.m() ? kClass != null : false) ? kClass != undefined : false) {
-      kClass = kClass[tmp1_let.p()];
+      kClass = kClass[tmp1_let.n()];
     }
     tmp$ret$1 = Unit_getInstance();
     var tmp_1;
@@ -3590,9 +3590,9 @@
       // Inline function 'kotlin.js.unsafeCast' call
       var tmp2_unsafeCast = kClass;
       tmp$ret$2 = tmp2_unsafeCast;
-      tmp_1 = tmp_2.ft(get_kotlin(tmp$ret$2));
+      tmp_1 = tmp_2.ct(get_kotlin(tmp$ret$2));
     } else {
-      tmp_1 = Companion_getInstance().oq();
+      tmp_1 = Companion_getInstance().lq();
     }
     return tmp_1;
   }
@@ -3638,14 +3638,14 @@
   OOPLib.prototype.containsOperator = containsOperator;
   OOPLib.prototype.hasPrimitive = hasPrimitive;
   OOPLib.prototype.hasFunction = hasFunction;
-  OOPLib.prototype.p2e = get_ruleSignatures;
+  OOPLib.prototype.m2e = get_ruleSignatures;
   OOPLib.prototype.hasProtected = hasProtected;
-  NullRefImpl.prototype.l3p = get_object;
-  NullRefImpl.prototype.m3p = invoke;
-  NullRefImpl.prototype.n3p = assign;
-  TermToObjectConverterImpl.prototype.n3q = convert;
-  TypeFactoryImpl.prototype.q3q = typeRefFromName;
-  TypeRefImpl.prototype.r3q = create;
+  NullRefImpl.prototype.i3p = get_object;
+  NullRefImpl.prototype.j3p = invoke;
+  NullRefImpl.prototype.k3p = assign;
+  TermToObjectConverterImpl.prototype.k3q = convert;
+  TypeFactoryImpl.prototype.n3q = typeRefFromName;
+  TypeRefImpl.prototype.o3q = create;
   //endregion
   //region block: init
   id = '[a-zA-Z_][a-zA-Z0-9_]*';