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

package/2p-solve-classic.js

@@ -192,7 +192,7 @@
   }
   setMetadataFor(State, 'State', interfaceMeta, undefined, undefined, undefined, undefined, []);
   function get_hasOpenAlternatives() {
-    return this.k2j().d1w() ? this.j5().j35() : false;
+    return this.h2j().a1w() ? this.j5().g35() : false;
   }
   function get_isEndState_0() {
     return true;
@@ -201,7 +201,7 @@
     return this;
   }
   function asEndState_1() {
-    return this.h38();
+    return this.e38();
   }
   setMetadataFor(EndState, 'EndState', interfaceMeta, undefined, [State], undefined, undefined, []);
   setMetadataFor(AbstractState, 'AbstractState', classMeta, undefined, [State], undefined, undefined, []);
@@ -234,12 +234,12 @@
   setMetadataFor(Companion_1, 'Companion', objectMeta, undefined, undefined, undefined, undefined, []);
   //endregion
   function AbstractClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_getInstance().p1y(stdIn), Companion_getInstance_0().s1y(stdOut, stdErr, warnings), trustKb);
+    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_getInstance().m1y(stdIn), Companion_getInstance_0().p1y(stdOut, stdErr, warnings), trustKb);
     return $this;
   }
   function updateCurrentContextAfterStateTransition($this, source, destination, index) {
     // Inline function 'kotlin.require' call
-    var tmp0_require = destination.j5().f34_1.equals(index);
+    var tmp0_require = destination.j5().c34_1.equals(index);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -250,7 +250,7 @@
       var message = tmp$ret$0;
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    $this.m34(destination.j5());
+    $this.j34(destination.j5());
   }
   function AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref($boundThis) {
     var l = function (p0, p1, p2) {
@@ -263,21 +263,21 @@
   function AbstractClassicSolver(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb) {
     AbstractSolver.call(this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
   }
-  AbstractClassicSolver.prototype.m34 = function (_set____db54di) {
-    this.l34_1 = _set____db54di;
+  AbstractClassicSolver.prototype.j34 = function (_set____db54di) {
+    this.i34_1 = _set____db54di;
   };
-  AbstractClassicSolver.prototype.x2b = function (_set____db54di) {
-    return this.m34(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
+  AbstractClassicSolver.prototype.u2b = function (_set____db54di) {
+    return this.j34(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
   };
-  AbstractClassicSolver.prototype.v2b = function () {
-    var tmp = this.l34_1;
+  AbstractClassicSolver.prototype.s2b = function () {
+    var tmp = this.i34_1;
     if (!(tmp == null))
       return tmp;
     else {
       throwUninitializedPropertyAccessException('currentContext');
     }
   };
-  AbstractClassicSolver.prototype.w2b = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
+  AbstractClassicSolver.prototype.t2b = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
     var tmp = trustKb ? staticKb.toImmutableTheory() : Companion_getInstance_1().empty(unificator);
     var tmp_0 = trustKb ? dynamicKb.toMutableTheory() : Companion_getInstance_2().empty(unificator);
     var tmp_1 = toOperatorSet(getAllOperators(libraries, []));
@@ -286,93 +286,93 @@
     var tmp_4 = new Long(0, 0);
     return ClassicExecutionContext_init_$Create$(null, unificator, libraries, flags, tmp, tmp_0, tmp_1, inputChannels, outputChannels, null, null, null, null, null, null, tmp_2, tmp_3, null, null, 0, tmp_4, null, 4161025, null);
   };
-  AbstractClassicSolver.prototype.d2c = function (goal, options) {
-    var tmp0_unificator = this.k1l();
-    var tmp1_libraries = this.w1u();
-    var tmp2_flags = this.x1u();
-    var tmp3_staticKb = this.y1u().toImmutableTheory();
-    var tmp4_dynamicKb = this.z1u().toMutableTheory();
-    var tmp5_operators = this.h1v();
-    var tmp6_inputChannels = this.a1v();
-    var tmp7_outputChannels = this.b1v();
-    var tmp8_customData = this.v2b().u33_1;
+  AbstractClassicSolver.prototype.a2c = function (goal, options) {
+    var tmp0_unificator = this.h1l();
+    var tmp1_libraries = this.t1u();
+    var tmp2_flags = this.u1u();
+    var tmp3_staticKb = this.v1u().toImmutableTheory();
+    var tmp4_dynamicKb = this.w1u().toMutableTheory();
+    var tmp5_operators = this.e1v();
+    var tmp6_inputChannels = this.x1u();
+    var tmp7_outputChannels = this.y1u();
+    var tmp8_customData = this.s2b().r33_1;
     var tmp9_startTime = currentTimeInstant();
-    var tmp10_maxDuration = options.j1x();
+    var tmp10_maxDuration = options.g1x();
     var tmp = new Long(0, 0);
-    this.m34(ClassicExecutionContext_init_$Create$(null, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, null, goal, null, null, null, tmp9_startTime, tmp10_maxDuration, null, null, 0, tmp, null, 4092929, null));
-    var tmp_0 = new StateInit(this.v2b());
-    return asSequence(this.n34(tmp_0, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
+    this.j34(ClassicExecutionContext_init_$Create$(null, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, null, goal, null, null, null, tmp9_startTime, tmp10_maxDuration, null, null, 0, tmp, null, 4092929, null));
+    var tmp_0 = new StateInit(this.s2b());
+    return asSequence(this.k34(tmp_0, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
   };
   function Primitives(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.s34_1 = alternatives;
-    this.t34_1 = executionContext;
-    this.u34_1 = parent;
-    this.v34_1 = depth;
+    this.p34_1 = alternatives;
+    this.q34_1 = executionContext;
+    this.r34_1 = parent;
+    this.s34_1 = depth;
   }
-  Primitives.prototype.w34 = function () {
-    return this.s34_1;
+  Primitives.prototype.t34 = function () {
+    return this.p34_1;
   };
-  Primitives.prototype.x34 = function () {
-    return this.t34_1;
+  Primitives.prototype.u34 = function () {
+    return this.q34_1;
   };
-  Primitives.prototype.y34 = function () {
-    return this.u34_1;
+  Primitives.prototype.v34 = function () {
+    return this.r34_1;
   };
-  Primitives.prototype.z34 = function () {
-    return this.v34_1;
+  Primitives.prototype.w34 = function () {
+    return this.s34_1;
   };
   Primitives.prototype.toString = function () {
     return ChoicePointContext.prototype.toString.call(this);
   };
-  Primitives.prototype.a35 = function () {
+  Primitives.prototype.x34 = function () {
     return 'Primitives';
   };
-  Primitives.prototype.b35 = function (context) {
-    var tmp0_$this = ensureNotNull(this.t34_1);
-    var tmp1_primitives = this.s34_1;
+  Primitives.prototype.y34 = function (context) {
+    var tmp0_$this = ensureNotNull(this.q34_1);
+    var tmp1_primitives = this.p34_1;
     var tmp$ret$0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = context.f34_1;
-    tmp$ret$0 = tmp0_plus.bh(new Long(1, 0));
+    var tmp0_plus = context.c34_1;
+    tmp$ret$0 = tmp0_plus.zg(new Long(1, 0));
     var tmp2_step = tmp$ret$0;
-    var tmp3_startTime = context.a34_1;
-    var tmp4_flags = context.o33_1;
-    var tmp5_dynamicKb = context.q33_1;
-    var tmp6_staticKb = context.p33_1;
-    var tmp7_operators = context.r33_1;
-    var tmp8_inputChannels = context.s33_1;
-    var tmp9_outputChannels = context.t33_1;
-    var tmp10_libraries = context.n33_1;
-    var tmp11_customData = context.u33_1.discardEphemeral();
+    var tmp3_startTime = context.x33_1;
+    var tmp4_flags = context.l33_1;
+    var tmp5_dynamicKb = context.n33_1;
+    var tmp6_staticKb = context.m33_1;
+    var tmp7_operators = context.o33_1;
+    var tmp8_inputChannels = context.p33_1;
+    var tmp9_outputChannels = context.q33_1;
+    var tmp10_libraries = context.k33_1;
+    var tmp11_customData = context.r33_1.discardEphemeral();
     var tmp = new Long(0, 0);
-    var tempContext = tmp0_$this.c35(null, null, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, null, null, null, null, tmp1_primitives, tmp3_startTime, tmp, null, null, 0, tmp2_step, null, 3095555, null);
-    var tmp_0 = this.s34_1.tq();
-    var nextChoicePointContext = this.d35(tmp_0, tempContext, null, 0, 12, null);
+    var tempContext = tmp0_$this.z34(null, null, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, null, null, null, null, tmp1_primitives, tmp3_startTime, tmp, null, null, 0, tmp2_step, null, 3095555, null);
+    var tmp_0 = this.p34_1.qq();
+    var nextChoicePointContext = this.a35(tmp_0, tempContext, null, 0, 12, null);
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
     var tmp_3 = new Long(0, 0);
-    return tempContext.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, nextChoicePointContext, null, 0, tmp_3, null, 4063231, null);
+    return tempContext.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, nextChoicePointContext, null, 0, tmp_3, null, 4063231, null);
   };
-  Primitives.prototype.e35 = function (alternatives, executionContext, parent, depth) {
+  Primitives.prototype.b35 = function (alternatives, executionContext, parent, depth) {
     return new Primitives(alternatives, executionContext, parent, depth);
   };
-  Primitives.prototype.d35 = function (alternatives, executionContext, parent, depth, $mask0, $handler) {
+  Primitives.prototype.a35 = function (alternatives, executionContext, parent, depth, $mask0, $handler) {
     if (!(($mask0 & 1) === 0))
-      alternatives = this.s34_1;
+      alternatives = this.p34_1;
     if (!(($mask0 & 2) === 0))
-      executionContext = this.t34_1;
+      executionContext = this.q34_1;
     if (!(($mask0 & 4) === 0))
-      parent = this.u34_1;
+      parent = this.r34_1;
     if (!(($mask0 & 8) === 0))
-      depth = this.v34_1;
-    return this.e35(alternatives, executionContext, parent, depth);
+      depth = this.s34_1;
+    return this.b35(alternatives, executionContext, parent, depth);
   };
   Primitives.prototype.hashCode = function () {
-    var result = hashCode(this.s34_1);
-    result = imul(result, 31) + (this.t34_1 == null ? 0 : this.t34_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.u34_1 == null ? 0 : hashCode(this.u34_1)) | 0;
-    result = imul(result, 31) + this.v34_1 | 0;
+    var result = hashCode(this.p34_1);
+    result = imul(result, 31) + (this.q34_1 == null ? 0 : this.q34_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.r34_1 == null ? 0 : hashCode(this.r34_1)) | 0;
+    result = imul(result, 31) + this.s34_1 | 0;
     return result;
   };
   Primitives.prototype.equals = function (other) {
@@ -381,86 +381,86 @@
     if (!(other instanceof Primitives))
       return false;
     var tmp0_other_with_cast = other instanceof Primitives ? other : THROW_CCE();
-    if (!equals(this.s34_1, tmp0_other_with_cast.s34_1))
+    if (!equals(this.p34_1, tmp0_other_with_cast.p34_1))
       return false;
-    if (!equals(this.t34_1, tmp0_other_with_cast.t34_1))
+    if (!equals(this.q34_1, tmp0_other_with_cast.q34_1))
       return false;
-    if (!equals(this.u34_1, tmp0_other_with_cast.u34_1))
+    if (!equals(this.r34_1, tmp0_other_with_cast.r34_1))
       return false;
-    if (!(this.v34_1 === tmp0_other_with_cast.v34_1))
+    if (!(this.s34_1 === tmp0_other_with_cast.s34_1))
       return false;
     return true;
   };
   function Rules(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.r35_1 = alternatives;
-    this.s35_1 = executionContext;
-    this.t35_1 = parent;
-    this.u35_1 = depth;
+    this.o35_1 = alternatives;
+    this.p35_1 = executionContext;
+    this.q35_1 = parent;
+    this.r35_1 = depth;
   }
-  Rules.prototype.w34 = function () {
-    return this.r35_1;
+  Rules.prototype.t34 = function () {
+    return this.o35_1;
   };
-  Rules.prototype.x34 = function () {
-    return this.s35_1;
+  Rules.prototype.u34 = function () {
+    return this.p35_1;
   };
-  Rules.prototype.y34 = function () {
-    return this.t35_1;
+  Rules.prototype.v34 = function () {
+    return this.q35_1;
   };
-  Rules.prototype.z34 = function () {
-    return this.u35_1;
+  Rules.prototype.w34 = function () {
+    return this.r35_1;
   };
   Rules.prototype.toString = function () {
     return ChoicePointContext.prototype.toString.call(this);
   };
-  Rules.prototype.a35 = function () {
+  Rules.prototype.x34 = function () {
     return 'Rules';
   };
-  Rules.prototype.b35 = function (context) {
-    var tmp0_$this = ensureNotNull(this.s35_1);
-    var tmp1_rules = this.r35_1;
+  Rules.prototype.y34 = function (context) {
+    var tmp0_$this = ensureNotNull(this.p35_1);
+    var tmp1_rules = this.o35_1;
     var tmp$ret$0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = context.f34_1;
-    tmp$ret$0 = tmp0_plus.bh(new Long(1, 0));
+    var tmp0_plus = context.c34_1;
+    tmp$ret$0 = tmp0_plus.zg(new Long(1, 0));
     var tmp2_step = tmp$ret$0;
-    var tmp3_startTime = context.a34_1;
-    var tmp4_flags = context.o33_1;
-    var tmp5_dynamicKb = context.q33_1;
-    var tmp6_staticKb = context.p33_1;
-    var tmp7_operators = context.r33_1;
-    var tmp8_inputChannels = context.s33_1;
-    var tmp9_outputChannels = context.t33_1;
-    var tmp10_libraries = context.n33_1;
-    var tmp11_customData = context.u33_1.discardEphemeral();
+    var tmp3_startTime = context.x33_1;
+    var tmp4_flags = context.l33_1;
+    var tmp5_dynamicKb = context.n33_1;
+    var tmp6_staticKb = context.m33_1;
+    var tmp7_operators = context.o33_1;
+    var tmp8_inputChannels = context.p33_1;
+    var tmp9_outputChannels = context.q33_1;
+    var tmp10_libraries = context.k33_1;
+    var tmp11_customData = context.r33_1.discardEphemeral();
     var tmp = new Long(0, 0);
-    var tempContext = tmp0_$this.c35(null, null, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, null, null, null, tmp1_rules, null, tmp3_startTime, tmp, null, null, 0, tmp2_step, null, 3103747, null);
-    var tmp_0 = this.r35_1.tq();
-    var nextChoicePointContext = this.v35(tmp_0, tempContext, null, 0, 12, null);
+    var tempContext = tmp0_$this.z34(null, null, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, null, null, null, tmp1_rules, null, tmp3_startTime, tmp, null, null, 0, tmp2_step, null, 3103747, null);
+    var tmp_0 = this.o35_1.qq();
+    var nextChoicePointContext = this.s35(tmp_0, tempContext, null, 0, 12, null);
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
     var tmp_3 = new Long(0, 0);
-    return tempContext.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, nextChoicePointContext, null, 0, tmp_3, null, 4063231, null);
+    return tempContext.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, nextChoicePointContext, null, 0, tmp_3, null, 4063231, null);
   };
-  Rules.prototype.w35 = function (alternatives, executionContext, parent, depth) {
+  Rules.prototype.t35 = function (alternatives, executionContext, parent, depth) {
     return new Rules(alternatives, executionContext, parent, depth);
   };
-  Rules.prototype.v35 = function (alternatives, executionContext, parent, depth, $mask0, $handler) {
+  Rules.prototype.s35 = function (alternatives, executionContext, parent, depth, $mask0, $handler) {
     if (!(($mask0 & 1) === 0))
-      alternatives = this.r35_1;
+      alternatives = this.o35_1;
     if (!(($mask0 & 2) === 0))
-      executionContext = this.s35_1;
+      executionContext = this.p35_1;
     if (!(($mask0 & 4) === 0))
-      parent = this.t35_1;
+      parent = this.q35_1;
     if (!(($mask0 & 8) === 0))
-      depth = this.u35_1;
-    return this.w35(alternatives, executionContext, parent, depth);
+      depth = this.r35_1;
+    return this.t35(alternatives, executionContext, parent, depth);
   };
   Rules.prototype.hashCode = function () {
-    var result = hashCode(this.r35_1);
-    result = imul(result, 31) + (this.s35_1 == null ? 0 : this.s35_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.t35_1 == null ? 0 : hashCode(this.t35_1)) | 0;
-    result = imul(result, 31) + this.u35_1 | 0;
+    var result = hashCode(this.o35_1);
+    result = imul(result, 31) + (this.p35_1 == null ? 0 : this.p35_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.q35_1 == null ? 0 : hashCode(this.q35_1)) | 0;
+    result = imul(result, 31) + this.r35_1 | 0;
     return result;
   };
   Rules.prototype.equals = function (other) {
@@ -469,114 +469,114 @@
     if (!(other instanceof Rules))
       return false;
     var tmp0_other_with_cast = other instanceof Rules ? other : THROW_CCE();
-    if (!equals(this.r35_1, tmp0_other_with_cast.r35_1))
+    if (!equals(this.o35_1, tmp0_other_with_cast.o35_1))
       return false;
-    if (!equals(this.s35_1, tmp0_other_with_cast.s35_1))
+    if (!equals(this.p35_1, tmp0_other_with_cast.p35_1))
       return false;
-    if (!equals(this.t35_1, tmp0_other_with_cast.t35_1))
+    if (!equals(this.q35_1, tmp0_other_with_cast.q35_1))
       return false;
-    if (!(this.u35_1 === tmp0_other_with_cast.u35_1))
+    if (!(this.r35_1 === tmp0_other_with_cast.r35_1))
       return false;
     return true;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation) {
-    this.f36_1 = this$0;
+    this.c36_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.i36 = function ($this$sequence, $cont) {
-    var tmp = this.j36($this$sequence, $cont);
-    tmp.ei_1 = Unit_getInstance();
-    tmp.fi_1 = null;
-    return tmp.ki();
+  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.f36 = function ($this$sequence, $cont) {
+    var tmp = this.g36($this$sequence, $cont);
+    tmp.bi_1 = Unit_getInstance();
+    tmp.ci_1 = null;
+    return tmp.hi();
   };
-  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.wi = function (p1, $cont) {
-    return this.i36(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.ti = function (p1, $cont) {
+    return this.f36(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
-  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.ki = function () {
-    var suspendResult = this.ei_1;
+  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.hi = function () {
+    var suspendResult = this.bi_1;
     $sm: do
       try {
-        var tmp = this.ci_1;
+        var tmp = this.zh_1;
         switch (tmp) {
           case 0:
-            this.di_1 = 4;
-            this.h36_1 = this.f36_1;
-            this.ci_1 = 1;
+            this.ai_1 = 4;
+            this.e36_1 = this.c36_1;
+            this.zh_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.h36_1 == null)) {
-              this.ci_1 = 3;
+            if (!!(this.e36_1 == null)) {
+              this.zh_1 = 3;
               continue $sm;
             }
 
-            this.ci_1 = 2;
-            suspendResult = this.g36_1.z4(ensureNotNull(this.h36_1), this);
+            this.zh_1 = 2;
+            suspendResult = this.d36_1.z4(ensureNotNull(this.e36_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.h36_1 = this.h36_1.y34();
-            this.ci_1 = 1;
+            this.e36_1 = this.e36_1.v34();
+            this.zh_1 = 1;
             continue $sm;
           case 3:
             return Unit_getInstance();
           case 4:
-            throw this.fi_1;
+            throw this.ci_1;
         }
       } catch ($p) {
-        if (this.di_1 === 4) {
+        if (this.ai_1 === 4) {
           throw $p;
         } else {
-          this.ci_1 = this.di_1;
-          this.fi_1 = $p;
+          this.zh_1 = this.ai_1;
+          this.ci_1 = $p;
         }
       }
      while (true);
   };
-  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.j36 = function ($this$sequence, completion) {
-    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.f36_1, completion);
-    i.g36_1 = $this$sequence;
+  ChoicePointContext$_get_pathToRoot_$slambda_q0myjn.prototype.g36 = function ($this$sequence, completion) {
+    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.c36_1, completion);
+    i.d36_1 = $this$sequence;
     return i;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this$0, resultContinuation) {
     var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.i36($this$sequence, $cont);
+      return i.f36($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
   }
   function ChoicePointContext(alternatives, executionContext, parent, depth) {
-    this.f35_1 = alternatives;
-    this.g35_1 = executionContext;
-    this.h35_1 = parent;
-    this.i35_1 = depth;
+    this.c35_1 = alternatives;
+    this.d35_1 = executionContext;
+    this.e35_1 = parent;
+    this.f35_1 = depth;
   }
-  ChoicePointContext.prototype.w34 = function () {
-    return this.f35_1;
+  ChoicePointContext.prototype.t34 = function () {
+    return this.c35_1;
   };
-  ChoicePointContext.prototype.x34 = function () {
-    return this.g35_1;
+  ChoicePointContext.prototype.u34 = function () {
+    return this.d35_1;
   };
-  ChoicePointContext.prototype.y34 = function () {
-    return this.h35_1;
+  ChoicePointContext.prototype.v34 = function () {
+    return this.e35_1;
   };
-  ChoicePointContext.prototype.z34 = function () {
-    return this.i35_1;
+  ChoicePointContext.prototype.w34 = function () {
+    return this.f35_1;
   };
-  ChoicePointContext.prototype.j35 = function () {
+  ChoicePointContext.prototype.g35 = function () {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.sequences.any' call
-      var tmp0_any = this.k35();
+      var tmp0_any = this.h35();
       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.classic.ChoicePointContext.<get-hasOpenAlternatives>.<anonymous>' call
-        tmp$ret$0 = element.w34().vq();
+        tmp$ret$0 = element.t34().sq();
         if (tmp$ret$0) {
           tmp$ret$1 = true;
           break $l$block;
@@ -586,33 +586,33 @@
     }
     return tmp$ret$1;
   };
-  ChoicePointContext.prototype.k35 = function () {
+  ChoicePointContext.prototype.h35 = function () {
     return sequence(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this, null));
   };
-  ChoicePointContext.prototype.l35 = function () {
-    var tmp0_safe_receiver = this.x34();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.e34_1;
+  ChoicePointContext.prototype.i35 = function () {
+    var tmp0_safe_receiver = this.u34();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b34_1;
   };
-  ChoicePointContext.prototype.m35 = function () {
-    var tmp0_safe_receiver = this.x34();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l33_1;
+  ChoicePointContext.prototype.j35 = function () {
+    var tmp0_safe_receiver = this.u34();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i33_1;
   };
   ChoicePointContext.prototype.toString = function () {
-    var tmp = this.a35() + '(' + ('alternatives=' + this.w34() + ', ');
+    var tmp = this.x34() + '(' + ('alternatives=' + this.t34() + ', ');
     var tmp_0;
-    if (this.x34() === null) {
-      tmp_0 = 'executionContext=' + this.x34() + ', ';
+    if (this.u34() === null) {
+      tmp_0 = 'executionContext=' + this.u34() + ', ';
     } else {
-      'executionContextDepth=' + this.l35() + ', ';
-      tmp_0 = 'executionContextProcedure=' + this.m35() + ', ';
+      'executionContextDepth=' + this.i35() + ', ';
+      tmp_0 = 'executionContextProcedure=' + this.j35() + ', ';
     }
-    return tmp + tmp_0 + ('depth=' + this.z34()) + ')';
+    return tmp + tmp_0 + ('depth=' + this.w34()) + ')';
   };
   function appendRules(_this__u8e3s4, alternatives, executionContext) {
     return new Rules(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
   }
   function nextDepth(_this__u8e3s4) {
-    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.z34() + 1 | 0;
+    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.w34() + 1 | 0;
   }
   function appendPrimitives(_this__u8e3s4, alternatives, executionContext) {
     return new Primitives(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
@@ -621,7 +621,7 @@
     if (!(($mask0 & 1) === 0))
       procedure = null;
     if (!(($mask0 & 2) === 0))
-      unificator = Companion_getInstance_3().h1l();
+      unificator = Companion_getInstance_3().e1l();
     if (!(($mask0 & 4) === 0))
       libraries = Companion_getInstance_4().empty();
     if (!(($mask0 & 8) === 0))
@@ -634,18 +634,18 @@
       operators = toOperatorSet(getAllOperators(libraries, [staticKb, dynamicKb]));
     if (!(($mask0 & 128) === 0)) {
       var tmp = Companion_getInstance();
-      inputChannels = tmp.v1z(null, 1, null);
+      inputChannels = tmp.s1z(null, 1, null);
     }
     if (!(($mask0 & 256) === 0)) {
       var tmp_0 = Companion_getInstance_0();
-      outputChannels = tmp_0.w1z(null, null, null, 7, null);
+      outputChannels = tmp_0.t1z(null, null, null, 7, null);
     }
     if (!(($mask0 & 512) === 0))
       customData = Companion_getInstance_6().empty();
     if (!(($mask0 & 1024) === 0))
       substitution = Companion_getInstance_7().empty();
     if (!(($mask0 & 2048) === 0))
-      query = Companion_getInstance_8().wv_1;
+      query = Companion_getInstance_8().tv_1;
     if (!(($mask0 & 4096) === 0))
       goals = Companion_getInstance_9().empty();
     if (!(($mask0 & 8192) === 0))
@@ -673,83 +673,83 @@
     return ClassicExecutionContext_init_$Init$(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $mask0, $marker, Object.create(ClassicExecutionContext.prototype));
   }
   function _get_locallyInterestingVariables__39cqti($this) {
-    var tmp = asSequence_0($this.g34_1);
-    var tmp0_safe_receiver = $this.x33_1.uq();
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.hw();
+    var tmp = asSequence_0($this.d34_1);
+    var tmp0_safe_receiver = $this.u33_1.rq();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ew();
     return plus(tmp, tmp1_elvis_lhs == null ? emptySequence() : tmp1_elvis_lhs);
   }
   function _get_interestingVariables__k6uw5o($this) {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = interestingVariables$factory();
-    tmp$ret$0 = $this.j34_1.b1();
+    tmp$ret$0 = $this.g34_1.b1();
     return tmp$ret$0;
   }
   function ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation) {
-    this.s36_1 = this$0;
+    this.p36_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  ClassicExecutionContext$pathToRoot$slambda.prototype.v36 = function ($this$sequence, $cont) {
-    var tmp = this.w36($this$sequence, $cont);
-    tmp.ei_1 = Unit_getInstance();
-    tmp.fi_1 = null;
-    return tmp.ki();
+  ClassicExecutionContext$pathToRoot$slambda.prototype.s36 = function ($this$sequence, $cont) {
+    var tmp = this.t36($this$sequence, $cont);
+    tmp.bi_1 = Unit_getInstance();
+    tmp.ci_1 = null;
+    return tmp.hi();
   };
-  ClassicExecutionContext$pathToRoot$slambda.prototype.wi = function (p1, $cont) {
-    return this.v36(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
+  ClassicExecutionContext$pathToRoot$slambda.prototype.ti = function (p1, $cont) {
+    return this.s36(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $cont);
   };
-  ClassicExecutionContext$pathToRoot$slambda.prototype.ki = function () {
-    var suspendResult = this.ei_1;
+  ClassicExecutionContext$pathToRoot$slambda.prototype.hi = function () {
+    var suspendResult = this.bi_1;
     $sm: do
       try {
-        var tmp = this.ci_1;
+        var tmp = this.zh_1;
         switch (tmp) {
           case 0:
-            this.di_1 = 4;
-            this.u36_1 = this.s36_1;
-            this.ci_1 = 1;
+            this.ai_1 = 4;
+            this.r36_1 = this.p36_1;
+            this.zh_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.u36_1 == null)) {
-              this.ci_1 = 3;
+            if (!!(this.r36_1 == null)) {
+              this.zh_1 = 3;
               continue $sm;
             }
 
-            this.ci_1 = 2;
-            suspendResult = this.t36_1.z4(this.u36_1, this);
+            this.zh_1 = 2;
+            suspendResult = this.q36_1.z4(this.r36_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.u36_1 = this.u36_1.d34_1;
-            this.ci_1 = 1;
+            this.r36_1 = this.r36_1.a34_1;
+            this.zh_1 = 1;
             continue $sm;
           case 3:
             return Unit_getInstance();
           case 4:
-            throw this.fi_1;
+            throw this.ci_1;
         }
       } catch ($p) {
-        if (this.di_1 === 4) {
+        if (this.ai_1 === 4) {
           throw $p;
         } else {
-          this.ci_1 = this.di_1;
-          this.fi_1 = $p;
+          this.zh_1 = this.ai_1;
+          this.ci_1 = $p;
         }
       }
      while (true);
   };
-  ClassicExecutionContext$pathToRoot$slambda.prototype.w36 = function ($this$sequence, completion) {
-    var i = new ClassicExecutionContext$pathToRoot$slambda(this.s36_1, completion);
-    i.t36_1 = $this$sequence;
+  ClassicExecutionContext$pathToRoot$slambda.prototype.t36 = function ($this$sequence, completion) {
+    var i = new ClassicExecutionContext$pathToRoot$slambda(this.p36_1, completion);
+    i.q36_1 = $this$sequence;
     return i;
   };
   function ClassicExecutionContext$pathToRoot$slambda_0(this$0, resultContinuation) {
     var i = new ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation);
     var l = function ($this$sequence, $cont) {
-      return i.v36($this$sequence, $cont);
+      return i.s36($this$sequence, $cont);
     };
     l.$arity = 1;
     return l;
@@ -757,11 +757,11 @@
   function ClassicExecutionContext$currentGoal$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.x33_1.wq()) {
+      if (this$0.u33_1.tq()) {
         tmp = null;
       } else {
-        var tmp0_safe_receiver = this$0.x33_1.uq();
-        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.v33_1);
+        var tmp0_safe_receiver = this$0.u33_1.rq();
+        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.s33_1);
       }
       return tmp;
     };
@@ -771,50 +771,50 @@
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda(this$0) {
     return function () {
-      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.w33_1.hw());
-      return cached(distinct(plus(tmp, flatMap(this$0.h34_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
+      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.t33_1.ew());
+      return cached(distinct(plus(tmp, flatMap(this$0.e34_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda(it) {
-    return it.x36();
+    return it.u36();
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0) {
     return function (it) {
-      var tmp0_elvis_lhs = it.l33_1;
-      return tmp0_elvis_lhs == null ? Companion_getInstance_11().of('?-', [this$0.w33_1]) : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = it.i33_1;
+      return tmp0_elvis_lhs == null ? Companion_getInstance_11().of('?-', [this$0.t33_1]) : tmp0_elvis_lhs;
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda(this$0) {
     return function () {
-      var tmp = filter(this$0.h34_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
+      var tmp = filter(this$0.e34_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
       return toList(map(tmp, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0)));
     };
   }
   function ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
-    this.l33_1 = procedure;
-    this.m33_1 = unificator;
-    this.n33_1 = libraries;
-    this.o33_1 = flags;
-    this.p33_1 = staticKb;
-    this.q33_1 = dynamicKb;
-    this.r33_1 = operators;
-    this.s33_1 = inputChannels;
-    this.t33_1 = outputChannels;
-    this.u33_1 = customData;
-    this.v33_1 = substitution;
-    this.w33_1 = query;
-    this.x33_1 = goals;
-    this.y33_1 = rules;
-    this.z33_1 = primitives;
-    this.a34_1 = startTime;
-    this.b34_1 = maxDuration;
-    this.c34_1 = choicePoints;
-    this.d34_1 = parent;
-    this.e34_1 = depth;
-    this.f34_1 = step;
-    this.g34_1 = relevantVariables;
+    this.i33_1 = procedure;
+    this.j33_1 = unificator;
+    this.k33_1 = libraries;
+    this.l33_1 = flags;
+    this.m33_1 = staticKb;
+    this.n33_1 = dynamicKb;
+    this.o33_1 = operators;
+    this.p33_1 = inputChannels;
+    this.q33_1 = outputChannels;
+    this.r33_1 = customData;
+    this.s33_1 = substitution;
+    this.t33_1 = query;
+    this.u33_1 = goals;
+    this.v33_1 = rules;
+    this.w33_1 = primitives;
+    this.x33_1 = startTime;
+    this.y33_1 = maxDuration;
+    this.z33_1 = choicePoints;
+    this.a34_1 = parent;
+    this.b34_1 = depth;
+    this.c34_1 = step;
+    this.d34_1 = relevantVariables;
     // Inline function 'kotlin.require' call
-    var tmp0_require = (this.e34_1 === 0 ? this.d34_1 == null : false) ? true : this.e34_1 > 0 ? !(this.d34_1 == null) : false;
+    var tmp0_require = (this.b34_1 === 0 ? this.a34_1 == null : false) ? true : this.b34_1 > 0 ? !(this.a34_1 == null) : false;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -826,7 +826,7 @@
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    var tmp1_require = this.a34_1.jd(new Long(0, 0)) >= 0;
+    var tmp1_require = this.x33_1.jd(new Long(0, 0)) >= 0;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -838,7 +838,7 @@
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    var tmp2_require = this.b34_1.jd(new Long(0, 0)) >= 0;
+    var tmp2_require = this.y33_1.jd(new Long(0, 0)) >= 0;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -850,170 +850,173 @@
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     var tmp = this;
-    tmp.h34_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
+    tmp.e34_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
     var tmp_0 = this;
-    tmp_0.i34_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
+    tmp_0.f34_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.j34_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
+    tmp_1.g34_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
     var tmp_2 = this;
-    tmp_2.k34_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
+    tmp_2.h34_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
   }
-  ClassicExecutionContext.prototype.q1u = function () {
+  ClassicExecutionContext.prototype.n1u = function () {
+    return this.i33_1;
+  };
+  ClassicExecutionContext.prototype.h1l = function () {
+    return this.j33_1;
+  };
+  ClassicExecutionContext.prototype.t1u = function () {
+    return this.k33_1;
+  };
+  ClassicExecutionContext.prototype.u1u = function () {
     return this.l33_1;
   };
-  ClassicExecutionContext.prototype.k1l = function () {
+  ClassicExecutionContext.prototype.v1u = function () {
     return this.m33_1;
   };
   ClassicExecutionContext.prototype.w1u = function () {
     return this.n33_1;
   };
-  ClassicExecutionContext.prototype.x1u = function () {
+  ClassicExecutionContext.prototype.e1v = function () {
     return this.o33_1;
   };
-  ClassicExecutionContext.prototype.y1u = function () {
+  ClassicExecutionContext.prototype.x1u = function () {
     return this.p33_1;
   };
-  ClassicExecutionContext.prototype.z1u = function () {
+  ClassicExecutionContext.prototype.y1u = function () {
     return this.q33_1;
   };
-  ClassicExecutionContext.prototype.h1v = function () {
+  ClassicExecutionContext.prototype.q1u = function () {
     return this.r33_1;
   };
-  ClassicExecutionContext.prototype.a1v = function () {
+  ClassicExecutionContext.prototype.o1u = function () {
     return this.s33_1;
   };
-  ClassicExecutionContext.prototype.b1v = function () {
-    return this.t33_1;
-  };
-  ClassicExecutionContext.prototype.t1u = function () {
-    return this.u33_1;
-  };
-  ClassicExecutionContext.prototype.r1u = function () {
-    return this.v33_1;
-  };
-  ClassicExecutionContext.prototype.l1u = function () {
-    return this.a34_1;
+  ClassicExecutionContext.prototype.i1u = function () {
+    return this.x33_1;
   };
-  ClassicExecutionContext.prototype.n1u = function () {
-    return this.b34_1;
+  ClassicExecutionContext.prototype.k1u = function () {
+    return this.y33_1;
   };
-  ClassicExecutionContext.prototype.y36 = function () {
-    return this.e34_1 === 0;
+  ClassicExecutionContext.prototype.v36 = function () {
+    return this.b34_1 === 0;
   };
-  ClassicExecutionContext.prototype.j35 = function () {
-    var tmp0_safe_receiver = this.c34_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.j35();
+  ClassicExecutionContext.prototype.g35 = function () {
+    var tmp0_safe_receiver = this.z33_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g35();
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  ClassicExecutionContext.prototype.x36 = function () {
-    return this.d34_1 == null ? true : (this.e34_1 - this.d34_1.e34_1 | 0) >= 1;
+  ClassicExecutionContext.prototype.u36 = function () {
+    return this.a34_1 == null ? true : (this.b34_1 - this.a34_1.b34_1 | 0) >= 1;
   };
-  ClassicExecutionContext.prototype.z36 = function () {
+  ClassicExecutionContext.prototype.w36 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = currentGoal$factory();
-    tmp$ret$0 = this.i34_1.b1();
+    tmp$ret$0 = this.f34_1.b1();
     return tmp$ret$0;
   };
-  ClassicExecutionContext.prototype.a37 = function (variable) {
+  ClassicExecutionContext.prototype.x36 = function (variable) {
     return contains(_get_interestingVariables__k6uw5o(this), variable);
   };
-  ClassicExecutionContext.prototype.s1u = function () {
+  ClassicExecutionContext.prototype.p1u = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = logicStackTrace$factory();
-    tmp$ret$0 = this.k34_1.b1();
+    tmp$ret$0 = this.h34_1.b1();
     return tmp$ret$0;
   };
-  ClassicExecutionContext.prototype.u1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  ClassicExecutionContext.prototype.r1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
-  ClassicExecutionContext.prototype.c1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  ClassicExecutionContext.prototype.z1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
-  ClassicExecutionContext.prototype.f1v = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
+  ClassicExecutionContext.prototype.c1v = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
     var tmp = dynamicKb.toMutableTheory();
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
-    return this.c35(null, unificator, libraries, flags, staticKb, tmp, operators, inputChannels, outputChannels, customData, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4193281, null);
+    return this.z34(null, unificator, libraries, flags, staticKb, tmp, operators, inputChannels, outputChannels, customData, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4193281, null);
   };
-  ClassicExecutionContext.prototype.b37 = function (sideEffect) {
+  ClassicExecutionContext.prototype.y36 = function (sideEffect) {
     var tmp = apply.call(this, sideEffect);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   ClassicExecutionContext.prototype.apply = function (sideEffect) {
-    return this.b37(sideEffect);
+    return this.y36(sideEffect);
   };
-  ClassicExecutionContext.prototype.c37 = function (sideEffects) {
+  ClassicExecutionContext.prototype.z36 = function (sideEffects) {
     var tmp = applyIterable.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   ClassicExecutionContext.prototype.applyIterable = function (sideEffects) {
-    return this.c37(sideEffects);
+    return this.z36(sideEffects);
   };
-  ClassicExecutionContext.prototype.d37 = function (sideEffects) {
+  ClassicExecutionContext.prototype.a37 = function (sideEffects) {
     var tmp = applySequence.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   ClassicExecutionContext.prototype.applySequence = function (sideEffects) {
-    return this.d37(sideEffects);
+    return this.a37(sideEffects);
   };
   ClassicExecutionContext.prototype.toString = function () {
-    return 'ClassicExecutionContext(' + ('step=' + toString(this.f34_1) + ', ') + ('depth=' + this.e34_1 + ', ') + ('substitution=' + this.v33_1 + ', ') + ('logicStackTrace=' + this.s1u() + ', ') + ('goals=' + this.x33_1 + ', ') + ('rules=' + this.y33_1 + ', ') + ('primitives=' + this.z33_1 + ', ') + ('startTime=' + toString(this.a34_1) + ', ') + ('endTime=' + toString(this.m1u()) + ', ') + ('maxDuration=' + toString(this.b34_1) + ', ') + ('unificator=' + this.m33_1 + ', ') + ('choicePoints=' + this.c34_1) + ')';
+    return 'ClassicExecutionContext(' + ('step=' + toString(this.c34_1) + ', ') + ('depth=' + this.b34_1 + ', ') + ('substitution=' + this.s33_1 + ', ') + ('logicStackTrace=' + this.p1u() + ', ') + ('goals=' + this.u33_1 + ', ') + ('rules=' + this.v33_1 + ', ') + ('primitives=' + this.w33_1 + ', ') + ('startTime=' + toString(this.x33_1) + ', ') + ('endTime=' + toString(this.j1u()) + ', ') + ('maxDuration=' + toString(this.y33_1) + ', ') + ('unificator=' + this.j33_1 + ', ') + ('choicePoints=' + this.z33_1) + ')';
   };
-  ClassicExecutionContext.prototype.e37 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
+  ClassicExecutionContext.prototype.b37 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
     return new ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
   };
-  ClassicExecutionContext.prototype.c35 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $mask0, $handler) {
+  ClassicExecutionContext.prototype.z34 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $mask0, $handler) {
     if (!(($mask0 & 1) === 0))
-      procedure = this.l33_1;
+      procedure = this.i33_1;
     if (!(($mask0 & 2) === 0))
-      unificator = this.m33_1;
+      unificator = this.j33_1;
     if (!(($mask0 & 4) === 0))
-      libraries = this.n33_1;
+      libraries = this.k33_1;
     if (!(($mask0 & 8) === 0))
-      flags = this.o33_1;
+      flags = this.l33_1;
     if (!(($mask0 & 16) === 0))
-      staticKb = this.p33_1;
+      staticKb = this.m33_1;
     if (!(($mask0 & 32) === 0))
-      dynamicKb = this.q33_1;
+      dynamicKb = this.n33_1;
     if (!(($mask0 & 64) === 0))
-      operators = this.r33_1;
+      operators = this.o33_1;
     if (!(($mask0 & 128) === 0))
-      inputChannels = this.s33_1;
+      inputChannels = this.p33_1;
     if (!(($mask0 & 256) === 0))
-      outputChannels = this.t33_1;
+      outputChannels = this.q33_1;
     if (!(($mask0 & 512) === 0))
-      customData = this.u33_1;
+      customData = this.r33_1;
     if (!(($mask0 & 1024) === 0))
-      substitution = this.v33_1;
+      substitution = this.s33_1;
     if (!(($mask0 & 2048) === 0))
-      query = this.w33_1;
+      query = this.t33_1;
     if (!(($mask0 & 4096) === 0))
-      goals = this.x33_1;
+      goals = this.u33_1;
     if (!(($mask0 & 8192) === 0))
-      rules = this.y33_1;
+      rules = this.v33_1;
     if (!(($mask0 & 16384) === 0))
-      primitives = this.z33_1;
+      primitives = this.w33_1;
     if (!(($mask0 & 32768) === 0))
-      startTime = this.a34_1;
+      startTime = this.x33_1;
     if (!(($mask0 & 65536) === 0))
-      maxDuration = this.b34_1;
+      maxDuration = this.y33_1;
     if (!(($mask0 & 131072) === 0))
-      choicePoints = this.c34_1;
+      choicePoints = this.z33_1;
     if (!(($mask0 & 262144) === 0))
-      parent = this.d34_1;
+      parent = this.a34_1;
     if (!(($mask0 & 524288) === 0))
-      depth = this.e34_1;
+      depth = this.b34_1;
     if (!(($mask0 & 1048576) === 0))
-      step = this.f34_1;
+      step = this.c34_1;
     if (!(($mask0 & 2097152) === 0))
-      relevantVariables = this.g34_1;
-    return this.e37(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
+      relevantVariables = this.d34_1;
+    return this.b37(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
   };
   ClassicExecutionContext.prototype.hashCode = function () {
-    var result = this.l33_1 == null ? 0 : this.l33_1.hashCode();
+    var result = this.i33_1 == null ? 0 : this.i33_1.hashCode();
+    result = imul(result, 31) + hashCode(this.j33_1) | 0;
+    result = imul(result, 31) + hashCode(this.k33_1) | 0;
+    result = imul(result, 31) + this.l33_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.m33_1) | 0;
     result = imul(result, 31) + hashCode(this.n33_1) | 0;
     result = imul(result, 31) + this.o33_1.hashCode() | 0;
@@ -1021,20 +1024,17 @@
     result = imul(result, 31) + hashCode(this.q33_1) | 0;
     result = imul(result, 31) + this.r33_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.s33_1) | 0;
-    result = imul(result, 31) + hashCode(this.t33_1) | 0;
-    result = imul(result, 31) + this.u33_1.hashCode() | 0;
+    result = imul(result, 31) + this.t33_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.u33_1) | 0;
     result = imul(result, 31) + hashCode(this.v33_1) | 0;
-    result = imul(result, 31) + this.w33_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.x33_1) | 0;
-    result = imul(result, 31) + hashCode(this.y33_1) | 0;
-    result = imul(result, 31) + hashCode(this.z33_1) | 0;
-    result = imul(result, 31) + this.a34_1.hashCode() | 0;
-    result = imul(result, 31) + this.b34_1.hashCode() | 0;
-    result = imul(result, 31) + (this.c34_1 == null ? 0 : hashCode(this.c34_1)) | 0;
-    result = imul(result, 31) + (this.d34_1 == null ? 0 : this.d34_1.hashCode()) | 0;
-    result = imul(result, 31) + this.e34_1 | 0;
-    result = imul(result, 31) + this.f34_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.g34_1) | 0;
+    result = imul(result, 31) + hashCode(this.w33_1) | 0;
+    result = imul(result, 31) + this.x33_1.hashCode() | 0;
+    result = imul(result, 31) + this.y33_1.hashCode() | 0;
+    result = imul(result, 31) + (this.z33_1 == null ? 0 : hashCode(this.z33_1)) | 0;
+    result = imul(result, 31) + (this.a34_1 == null ? 0 : this.a34_1.hashCode()) | 0;
+    result = imul(result, 31) + this.b34_1 | 0;
+    result = imul(result, 31) + this.c34_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.d34_1) | 0;
     return result;
   };
   ClassicExecutionContext.prototype.equals = function (other) {
@@ -1043,7 +1043,13 @@
     if (!(other instanceof ClassicExecutionContext))
       return false;
     var tmp0_other_with_cast = other instanceof ClassicExecutionContext ? other : THROW_CCE();
-    if (!equals(this.l33_1, tmp0_other_with_cast.l33_1))
+    if (!equals(this.i33_1, tmp0_other_with_cast.i33_1))
+      return false;
+    if (!equals(this.j33_1, tmp0_other_with_cast.j33_1))
+      return false;
+    if (!equals(this.k33_1, tmp0_other_with_cast.k33_1))
+      return false;
+    if (!this.l33_1.equals(tmp0_other_with_cast.l33_1))
       return false;
     if (!equals(this.m33_1, tmp0_other_with_cast.m33_1))
       return false;
@@ -1059,39 +1065,33 @@
       return false;
     if (!equals(this.s33_1, tmp0_other_with_cast.s33_1))
       return false;
-    if (!equals(this.t33_1, tmp0_other_with_cast.t33_1))
+    if (!this.t33_1.equals(tmp0_other_with_cast.t33_1))
       return false;
-    if (!this.u33_1.equals(tmp0_other_with_cast.u33_1))
+    if (!equals(this.u33_1, tmp0_other_with_cast.u33_1))
       return false;
     if (!equals(this.v33_1, tmp0_other_with_cast.v33_1))
       return false;
-    if (!this.w33_1.equals(tmp0_other_with_cast.w33_1))
+    if (!equals(this.w33_1, tmp0_other_with_cast.w33_1))
       return false;
-    if (!equals(this.x33_1, tmp0_other_with_cast.x33_1))
+    if (!this.x33_1.equals(tmp0_other_with_cast.x33_1))
       return false;
-    if (!equals(this.y33_1, tmp0_other_with_cast.y33_1))
+    if (!this.y33_1.equals(tmp0_other_with_cast.y33_1))
       return false;
     if (!equals(this.z33_1, tmp0_other_with_cast.z33_1))
       return false;
-    if (!this.a34_1.equals(tmp0_other_with_cast.a34_1))
+    if (!equals(this.a34_1, tmp0_other_with_cast.a34_1))
       return false;
-    if (!this.b34_1.equals(tmp0_other_with_cast.b34_1))
+    if (!(this.b34_1 === tmp0_other_with_cast.b34_1))
       return false;
-    if (!equals(this.c34_1, tmp0_other_with_cast.c34_1))
+    if (!this.c34_1.equals(tmp0_other_with_cast.c34_1))
       return false;
     if (!equals(this.d34_1, tmp0_other_with_cast.d34_1))
       return false;
-    if (!(this.e34_1 === tmp0_other_with_cast.e34_1))
-      return false;
-    if (!this.f34_1.equals(tmp0_other_with_cast.f34_1))
-      return false;
-    if (!equals(this.g34_1, tmp0_other_with_cast.g34_1))
-      return false;
     return true;
   };
   function currentGoal$factory() {
     return getPropertyCallableRef('currentGoal', 1, KProperty1, function (receiver) {
-      return receiver.z36();
+      return receiver.w36();
     }, null);
   }
   function interestingVariables$factory() {
@@ -1101,7 +1101,7 @@
   }
   function logicStackTrace$factory() {
     return getPropertyCallableRef('logicStackTrace', 1, KProperty1, function (receiver) {
-      return receiver.s1u();
+      return receiver.p1u();
     }, null);
   }
   function ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $this) {
@@ -1114,7 +1114,7 @@
   }
   function ClassicSolver_init_$Init$_0(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $mask0, $marker, $this) {
     if (!(($mask0 & 1) === 0))
-      unificator = Companion_getInstance_3().h1l();
+      unificator = Companion_getInstance_3().e1l();
     if (!(($mask0 & 2) === 0))
       libraries = Companion_getInstance_4().empty();
     if (!(($mask0 & 4) === 0))
@@ -1125,11 +1125,11 @@
       initialDynamicKb = Companion_getInstance_2().empty(unificator);
     if (!(($mask0 & 32) === 0)) {
       var tmp = Companion_getInstance();
-      inputChannels = tmp.v1z(null, 1, null);
+      inputChannels = tmp.s1z(null, 1, null);
     }
     if (!(($mask0 & 64) === 0)) {
       var tmp_0 = Companion_getInstance_0();
-      outputChannels = tmp_0.w1z(null, null, null, 7, null);
+      outputChannels = tmp_0.t1z(null, null, null, 7, null);
     }
     if (!(($mask0 & 128) === 0))
       trustKb = false;
@@ -1146,7 +1146,7 @@
   }
   function ClassicSolver_init_$Init$_2(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $mask0, $marker, $this) {
     if (!(($mask0 & 1) === 0))
-      unificator = Companion_getInstance_3().h1l();
+      unificator = Companion_getInstance_3().e1l();
     if (!(($mask0 & 2) === 0))
       libraries = Companion_getInstance_4().empty();
     if (!(($mask0 & 4) === 0))
@@ -1171,36 +1171,36 @@
   function ClassicSolver_init_$Create$_1(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $mask0, $marker) {
     return ClassicSolver_init_$Init$_2(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $mask0, $marker, Object.create(ClassicSolver.prototype));
   }
-  ClassicSolver.prototype.n34 = function (initialState, onStateTransition) {
-    return Companion_getInstance_22().g37(initialState, onStateTransition);
+  ClassicSolver.prototype.k34 = function (initialState, onStateTransition) {
+    return Companion_getInstance_22().d37(initialState, onStateTransition);
   };
-  ClassicSolver.prototype.p1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  ClassicSolver.prototype.m1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_1(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, false, 512, null);
   };
-  ClassicSolver.prototype.z1s = function () {
-    return this.x1x(null, null, null, null, null, null, null, null, null, 511, null);
+  ClassicSolver.prototype.w1s = function () {
+    return this.u1x(null, null, null, null, null, null, null, null, null, 511, null);
   };
   ClassicSolver.prototype.clone = function () {
-    return this.z1s();
+    return this.w1s();
   };
   function ClassicSolver() {
   }
   function ClassicSolverFactory() {
     ClassicSolverFactory_instance = this;
   }
-  ClassicSolverFactory.prototype.d1y = function () {
+  ClassicSolverFactory.prototype.a1y = function () {
     return DefaultBuiltins_getInstance();
   };
-  ClassicSolverFactory.prototype.t1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  ClassicSolverFactory.prototype.q1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, false, 128, null);
   };
-  ClassicSolverFactory.prototype.v1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  ClassicSolverFactory.prototype.s1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_1(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, false, 512, null);
   };
-  ClassicSolverFactory.prototype.z1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  ClassicSolverFactory.prototype.w1y = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_1(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, false, 512, null);
   };
-  ClassicSolverFactory.prototype.d1z = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  ClassicSolverFactory.prototype.a1z = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return MutableClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, false, 128, null);
   };
   var ClassicSolverFactory_instance;
@@ -1219,7 +1219,7 @@
   }
   function MutableClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $mask0, $marker, $this) {
     if (!(($mask0 & 1) === 0))
-      unificator = Companion_getInstance_3().h1l();
+      unificator = Companion_getInstance_3().e1l();
     if (!(($mask0 & 2) === 0))
       libraries = Companion_getInstance_4().empty();
     if (!(($mask0 & 4) === 0))
@@ -1230,11 +1230,11 @@
       dynamicKb = Companion_getInstance_2().empty(unificator);
     if (!(($mask0 & 32) === 0)) {
       var tmp = Companion_getInstance();
-      inputChannels = tmp.v1z(null, 1, null);
+      inputChannels = tmp.s1z(null, 1, null);
     }
     if (!(($mask0 & 64) === 0)) {
       var tmp_0 = Companion_getInstance_0();
-      outputChannels = tmp_0.w1z(null, null, null, 7, null);
+      outputChannels = tmp_0.t1z(null, null, null, 7, null);
     }
     if (!(($mask0 & 128) === 0))
       trustKb = false;
@@ -1251,7 +1251,7 @@
   }
   function MutableClassicSolver_init_$Init$_2(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $mask0, $marker, $this) {
     if (!(($mask0 & 1) === 0))
-      unificator = Companion_getInstance_3().h1l();
+      unificator = Companion_getInstance_3().e1l();
     if (!(($mask0 & 2) === 0))
       libraries = Companion_getInstance_4().empty();
     if (!(($mask0 & 4) === 0))
@@ -1278,351 +1278,351 @@
   }
   function MutableClassicSolver$loadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.n33_1.plusLibrary($library);
-      var tmp = $this$updateContext.r33_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, [])));
+      var newRuntime = $this$updateContext.k33_1.plusLibrary($library);
+      var tmp = $this$updateContext.o33_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, [])));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, newRuntime, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
+      return $this$updateContext.z34(null, null, newRuntime, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
     };
   }
   function MutableClassicSolver$unloadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.n33_1.plusLibrary($library);
-      var tmp = toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.p33_1, $this$updateContext.q33_1]));
+      var newRuntime = $this$updateContext.k33_1.plusLibrary($library);
+      var tmp = toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.m33_1, $this$updateContext.n33_1]));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, newRuntime, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
+      return $this$updateContext.z34(null, null, newRuntime, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
     };
   }
   function MutableClassicSolver$setRuntime$lambda($libraries) {
     return function ($this$updateContext) {
-      var tmp = toOperatorSet(getAllOperators($libraries, [$this$updateContext.p33_1, $this$updateContext.q33_1]));
+      var tmp = toOperatorSet(getAllOperators($libraries, [$this$updateContext.m33_1, $this$updateContext.n33_1]));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, $libraries, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
+      return $this$updateContext.z34(null, null, $libraries, null, null, null, tmp, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194235, null);
     };
   }
   function MutableClassicSolver$resetStaticKb$lambda($this$updateContext) {
-    var tmp = Companion_getInstance_1().empty($this$updateContext.m33_1);
-    var tmp_0 = toOperatorSet(getAllOperators($this$updateContext.n33_1, [$this$updateContext.q33_1]));
+    var tmp = Companion_getInstance_1().empty($this$updateContext.j33_1);
+    var tmp_0 = toOperatorSet(getAllOperators($this$updateContext.k33_1, [$this$updateContext.n33_1]));
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
     var tmp_3 = new Long(0, 0);
-    return $this$updateContext.c35(null, null, null, null, tmp, null, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194223, null);
+    return $this$updateContext.z34(null, null, null, null, tmp, null, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194223, null);
   }
   function MutableClassicSolver$resetDynamicKb$lambda($this$updateContext) {
-    var tmp = Companion_getInstance_2().empty($this$updateContext.m33_1);
-    var tmp_0 = toOperatorSet(getAllOperators($this$updateContext.n33_1, [$this$updateContext.p33_1]));
+    var tmp = Companion_getInstance_2().empty($this$updateContext.j33_1);
+    var tmp_0 = toOperatorSet(getAllOperators($this$updateContext.k33_1, [$this$updateContext.m33_1]));
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
     var tmp_3 = new Long(0, 0);
-    return $this$updateContext.c35(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
+    return $this$updateContext.z34(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
   }
   function MutableClassicSolver$assertA$lambda($clause) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.q33_1.p1s($clause);
-      var tmp_0 = $this$updateContext.r33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
+      var tmp = $this$updateContext.n33_1.m1s($clause);
+      var tmp_0 = $this$updateContext.o33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
       var tmp_3 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
     };
   }
   function MutableClassicSolver$assertA$lambda_0($fact) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.q33_1.c1t($fact);
+      var tmp = $this$updateContext.n33_1.z1s($fact);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
     };
   }
   function MutableClassicSolver$assertZ$lambda($clause) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.q33_1.t1s($clause);
-      var tmp_0 = $this$updateContext.r33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
+      var tmp = $this$updateContext.n33_1.q1s($clause);
+      var tmp_0 = $this$updateContext.o33_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
       var tmp_3 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
     };
   }
   function MutableClassicSolver$assertZ$lambda_0($fact) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.q33_1.d1t($fact);
+      var tmp = $this$updateContext.n33_1.a1t($fact);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
     };
   }
   function MutableClassicSolver$retract$lambda($result, $clause) {
     return function ($this$updateContext) {
-      var tmp = $result.h1s().toMutableTheory();
-      var tmp_0 = $this$updateContext.r33_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
+      var tmp = $result.e1s().toMutableTheory();
+      var tmp_0 = $this$updateContext.o33_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause))));
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
       var tmp_3 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
     };
   }
   function MutableClassicSolver$retract$lambda_0($result) {
     return function ($this$updateContext) {
-      var tmp = $result.h1s().toMutableTheory();
+      var tmp = $result.e1s().toMutableTheory();
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
     };
   }
   function MutableClassicSolver$retractAll$lambda($result) {
     return function ($this$updateContext) {
-      var tmp = $result.h1s().toMutableTheory();
-      var tmp_0 = $this$updateContext.r33_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.h1s())));
+      var tmp = $result.e1s().toMutableTheory();
+      var tmp_0 = $this$updateContext.o33_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.e1s())));
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
       var tmp_3 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, tmp_0, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 4194207, null);
     };
   }
   function MutableClassicSolver$retractAll$lambda_0($result) {
     return function ($this$updateContext) {
-      var tmp = $result.h1s().toMutableTheory();
+      var tmp = $result.e1s().toMutableTheory();
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
+      return $this$updateContext.z34(null, null, null, null, null, tmp, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194271, null);
     };
   }
   function MutableClassicSolver$setFlag$lambda($name, $value) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.o33_1.set($name, $value);
+      var tmp = $this$updateContext.l33_1.set($name, $value);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
+      return $this$updateContext.z34(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
     };
   }
   function MutableClassicSolver$setFlag$lambda_0($flag) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.o33_1.plusPair($flag);
+      var tmp = $this$updateContext.l33_1.plusPair($flag);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
+      return $this$updateContext.z34(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
     };
   }
   function MutableClassicSolver$setFlag$lambda_1($flag) {
     return function ($this$updateContext) {
-      var tmp = $this$updateContext.o33_1.plusNotable($flag);
+      var tmp = $this$updateContext.l33_1.plusNotable($flag);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
+      return $this$updateContext.z34(null, null, null, tmp, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194295, null);
     };
   }
   function MutableClassicSolver$setStandardInput$lambda($stdIn) {
     return function ($this$updateContext) {
       Companion_getInstance();
-      var tmp = $this$updateContext.s33_1.plus(to('stdin', $stdIn));
+      var tmp = $this$updateContext.p33_1.plus(to('stdin', $stdIn));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194175, null);
+      return $this$updateContext.z34(null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194175, null);
     };
   }
   function MutableClassicSolver$setStandardError$lambda($stdErr) {
     return function ($this$updateContext) {
       Companion_getInstance_0();
-      var tmp = $this$updateContext.t33_1.plus(to('stderr', $stdErr));
+      var tmp = $this$updateContext.q33_1.plus(to('stderr', $stdErr));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
+      return $this$updateContext.z34(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
     };
   }
   function MutableClassicSolver$setStandardOutput$lambda($stdOut) {
     return function ($this$updateContext) {
       Companion_getInstance_0();
-      var tmp = $this$updateContext.t33_1.plus(to('stdout', $stdOut));
+      var tmp = $this$updateContext.q33_1.plus(to('stdout', $stdOut));
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
+      return $this$updateContext.z34(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
     };
   }
   function MutableClassicSolver$setWarnings$lambda($warnings) {
     return function ($this$updateContext) {
-      var tmp = Companion_getInstance_0().x1z($this$updateContext.t33_1, $warnings);
+      var tmp = Companion_getInstance_0().u1z($this$updateContext.q33_1, $warnings);
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      return $this$updateContext.c35(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
+      return $this$updateContext.z34(null, null, null, null, null, null, null, null, tmp, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 4194047, null);
     };
   }
-  MutableClassicSolver.prototype.i37 = function (library) {
-    this.u2b(MutableClassicSolver$loadLibrary$lambda(library));
+  MutableClassicSolver.prototype.f37 = function (library) {
+    this.r2b(MutableClassicSolver$loadLibrary$lambda(library));
   };
   MutableClassicSolver.prototype.loadLibrary = function (library) {
-    return this.i37(library);
+    return this.f37(library);
   };
-  MutableClassicSolver.prototype.j37 = function (library) {
-    this.u2b(MutableClassicSolver$unloadLibrary$lambda(library));
+  MutableClassicSolver.prototype.g37 = function (library) {
+    this.r2b(MutableClassicSolver$unloadLibrary$lambda(library));
   };
   MutableClassicSolver.prototype.unloadLibrary = function (library) {
-    return this.j37(library);
+    return this.g37(library);
   };
-  MutableClassicSolver.prototype.k37 = function (libraries) {
-    this.u2b(MutableClassicSolver$setRuntime$lambda(libraries));
+  MutableClassicSolver.prototype.h37 = function (libraries) {
+    this.r2b(MutableClassicSolver$setRuntime$lambda(libraries));
   };
   MutableClassicSolver.prototype.setLibraries = function (libraries) {
-    return this.k37(libraries);
+    return this.h37(libraries);
   };
-  MutableClassicSolver.prototype.l37 = function (theory) {
-    this.y2b(theory, null, false, false, 10, null);
+  MutableClassicSolver.prototype.i37 = function (theory) {
+    this.v2b(theory, null, false, false, 10, null);
   };
   MutableClassicSolver.prototype.loadStaticKb = function (theory) {
-    return this.l37(theory);
+    return this.i37(theory);
   };
-  MutableClassicSolver.prototype.m37 = function (theory) {
-    this.y2b(theory, null, false, false, 14, null);
+  MutableClassicSolver.prototype.j37 = function (theory) {
+    this.v2b(theory, null, false, false, 14, null);
   };
   MutableClassicSolver.prototype.appendStaticKb = function (theory) {
-    return this.m37(theory);
+    return this.j37(theory);
   };
-  MutableClassicSolver.prototype.n37 = function () {
-    this.u2b(MutableClassicSolver$resetStaticKb$lambda);
+  MutableClassicSolver.prototype.k37 = function () {
+    this.r2b(MutableClassicSolver$resetStaticKb$lambda);
   };
   MutableClassicSolver.prototype.resetStaticKb = function () {
-    return this.n37();
+    return this.k37();
   };
-  MutableClassicSolver.prototype.o37 = function (theory) {
-    this.y2b(null, theory, false, false, 5, null);
+  MutableClassicSolver.prototype.l37 = function (theory) {
+    this.v2b(null, theory, false, false, 5, null);
   };
   MutableClassicSolver.prototype.loadDynamicKb = function (theory) {
-    return this.o37(theory);
+    return this.l37(theory);
   };
-  MutableClassicSolver.prototype.p37 = function (theory) {
-    this.y2b(null, theory, false, false, 13, null);
+  MutableClassicSolver.prototype.m37 = function (theory) {
+    this.v2b(null, theory, false, false, 13, null);
   };
   MutableClassicSolver.prototype.appendDynamicKb = function (theory) {
-    return this.p37(theory);
+    return this.m37(theory);
   };
-  MutableClassicSolver.prototype.q37 = function () {
-    this.u2b(MutableClassicSolver$resetDynamicKb$lambda);
+  MutableClassicSolver.prototype.n37 = function () {
+    this.r2b(MutableClassicSolver$resetDynamicKb$lambda);
   };
   MutableClassicSolver.prototype.resetDynamicKb = function () {
-    return this.q37();
+    return this.n37();
   };
-  MutableClassicSolver.prototype.w1m = function (clause) {
-    this.u2b(MutableClassicSolver$assertA$lambda(clause));
+  MutableClassicSolver.prototype.t1m = function (clause) {
+    this.r2b(MutableClassicSolver$assertA$lambda(clause));
   };
   MutableClassicSolver.prototype.assertA = function (clause) {
-    return this.w1m(clause);
+    return this.t1m(clause);
   };
-  MutableClassicSolver.prototype.r37 = function (fact) {
-    this.u2b(MutableClassicSolver$assertA$lambda_0(fact));
+  MutableClassicSolver.prototype.o37 = function (fact) {
+    this.r2b(MutableClassicSolver$assertA$lambda_0(fact));
   };
   MutableClassicSolver.prototype.assertAFact = function (fact) {
-    return this.r37(fact);
+    return this.o37(fact);
   };
-  MutableClassicSolver.prototype.w1l = function (clause) {
-    this.u2b(MutableClassicSolver$assertZ$lambda(clause));
+  MutableClassicSolver.prototype.t1l = function (clause) {
+    this.r2b(MutableClassicSolver$assertZ$lambda(clause));
   };
   MutableClassicSolver.prototype.assertZ = function (clause) {
-    return this.w1l(clause);
+    return this.t1l(clause);
   };
-  MutableClassicSolver.prototype.s37 = function (fact) {
-    this.u2b(MutableClassicSolver$assertZ$lambda_0(fact));
+  MutableClassicSolver.prototype.p37 = function (fact) {
+    this.r2b(MutableClassicSolver$assertZ$lambda_0(fact));
   };
   MutableClassicSolver.prototype.assertZFact = function (fact) {
-    return this.s37(fact);
+    return this.p37(fact);
   };
-  MutableClassicSolver.prototype.e1t = function (clause) {
-    var result = this.z1u().retract(clause);
-    this.u2b(MutableClassicSolver$retract$lambda(result, clause));
+  MutableClassicSolver.prototype.b1t = function (clause) {
+    var result = this.w1u().retract(clause);
+    this.r2b(MutableClassicSolver$retract$lambda(result, clause));
     return result;
   };
   MutableClassicSolver.prototype.retract = function (clause) {
-    return this.e1t(clause);
+    return this.b1t(clause);
   };
-  MutableClassicSolver.prototype.f1t = function (fact) {
-    var result = this.z1u().retractByHead(fact);
-    this.u2b(MutableClassicSolver$retract$lambda_0(result));
+  MutableClassicSolver.prototype.c1t = function (fact) {
+    var result = this.w1u().retractByHead(fact);
+    this.r2b(MutableClassicSolver$retract$lambda_0(result));
     return result;
   };
   MutableClassicSolver.prototype.retractByHead = function (fact) {
-    return this.f1t(fact);
+    return this.c1t(fact);
   };
-  MutableClassicSolver.prototype.c1m = function (clause) {
-    var result = this.z1u().retractAll(clause);
-    this.u2b(MutableClassicSolver$retractAll$lambda(result));
+  MutableClassicSolver.prototype.z1l = function (clause) {
+    var result = this.w1u().retractAll(clause);
+    this.r2b(MutableClassicSolver$retractAll$lambda(result));
     return result;
   };
   MutableClassicSolver.prototype.retractAll = function (clause) {
-    return this.c1m(clause);
+    return this.z1l(clause);
   };
-  MutableClassicSolver.prototype.t37 = function (fact) {
-    var result = this.z1u().retractAllByHead(fact);
-    this.u2b(MutableClassicSolver$retractAll$lambda_0(result));
+  MutableClassicSolver.prototype.q37 = function (fact) {
+    var result = this.w1u().retractAllByHead(fact);
+    this.r2b(MutableClassicSolver$retractAll$lambda_0(result));
     return result;
   };
   MutableClassicSolver.prototype.retractAllBeHead = function (fact) {
-    return this.t37(fact);
+    return this.q37(fact);
   };
-  MutableClassicSolver.prototype.u37 = function (name, value) {
-    this.u2b(MutableClassicSolver$setFlag$lambda(name, value));
+  MutableClassicSolver.prototype.r37 = function (name, value) {
+    this.r2b(MutableClassicSolver$setFlag$lambda(name, value));
   };
   MutableClassicSolver.prototype.setFlag = function (name, value) {
-    return this.u37(name, value);
+    return this.r37(name, value);
   };
-  MutableClassicSolver.prototype.v37 = function (flag) {
-    this.u2b(MutableClassicSolver$setFlag$lambda_0(flag));
+  MutableClassicSolver.prototype.s37 = function (flag) {
+    this.r2b(MutableClassicSolver$setFlag$lambda_0(flag));
   };
   MutableClassicSolver.prototype.setFlagPair = function (flag) {
-    return this.v37(flag);
+    return this.s37(flag);
   };
-  MutableClassicSolver.prototype.w37 = function (flag) {
-    this.u2b(MutableClassicSolver$setFlag$lambda_1(flag));
+  MutableClassicSolver.prototype.t37 = function (flag) {
+    this.r2b(MutableClassicSolver$setFlag$lambda_1(flag));
   };
   MutableClassicSolver.prototype.setFlagNotable = function (flag) {
-    return this.w37(flag);
+    return this.t37(flag);
   };
-  MutableClassicSolver.prototype.x37 = function (stdIn) {
-    this.u2b(MutableClassicSolver$setStandardInput$lambda(stdIn));
+  MutableClassicSolver.prototype.u37 = function (stdIn) {
+    this.r2b(MutableClassicSolver$setStandardInput$lambda(stdIn));
   };
   MutableClassicSolver.prototype.setStandardInput = function (stdIn) {
-    return this.x37(stdIn);
+    return this.u37(stdIn);
   };
-  MutableClassicSolver.prototype.y37 = function (stdErr) {
-    this.u2b(MutableClassicSolver$setStandardError$lambda(stdErr));
+  MutableClassicSolver.prototype.v37 = function (stdErr) {
+    this.r2b(MutableClassicSolver$setStandardError$lambda(stdErr));
   };
   MutableClassicSolver.prototype.setStandardError = function (stdErr) {
-    return this.y37(stdErr);
+    return this.v37(stdErr);
   };
-  MutableClassicSolver.prototype.z37 = function (stdOut) {
-    this.u2b(MutableClassicSolver$setStandardOutput$lambda(stdOut));
+  MutableClassicSolver.prototype.w37 = function (stdOut) {
+    this.r2b(MutableClassicSolver$setStandardOutput$lambda(stdOut));
   };
   MutableClassicSolver.prototype.setStandardOutput = function (stdOut) {
-    return this.z37(stdOut);
+    return this.w37(stdOut);
   };
-  MutableClassicSolver.prototype.a38 = function (warnings) {
-    this.u2b(MutableClassicSolver$setWarnings$lambda(warnings));
+  MutableClassicSolver.prototype.x37 = function (warnings) {
+    this.r2b(MutableClassicSolver$setWarnings$lambda(warnings));
   };
   MutableClassicSolver.prototype.setWarnings = function (warnings) {
-    return this.a38(warnings);
+    return this.x37(warnings);
   };
-  MutableClassicSolver.prototype.p1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  MutableClassicSolver.prototype.m1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_1(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, false, 512, null);
   };
-  MutableClassicSolver.prototype.z1s = function () {
-    return this.x1x(null, null, null, null, null, null, null, null, null, 511, null);
+  MutableClassicSolver.prototype.w1s = function () {
+    return this.u1x(null, null, null, null, null, null, null, null, null, 511, null);
   };
   MutableClassicSolver.prototype.clone = function () {
-    return this.z1s();
+    return this.w1s();
   };
   function MutableClassicSolver() {
   }
@@ -1639,9 +1639,9 @@
     } else {
       tmp = onStateTransition;
     }
-    return this.g37(initialState, tmp);
+    return this.d37(initialState, tmp);
   };
-  Companion.prototype.g37 = function (initialState, onStateTransition) {
+  Companion.prototype.d37 = function (initialState, onStateTransition) {
     return new SimpleSolutionIterator(initialState, onStateTransition);
   };
   var Companion_instance;
@@ -1652,85 +1652,85 @@
   }
   function AbstractEndState(solution, context) {
     AbstractState.call(this, context);
-    this.d38_1 = solution;
-    this.e38_1 = context;
+    this.a38_1 = solution;
+    this.b38_1 = context;
   }
-  AbstractEndState.prototype.k2j = function () {
-    return this.d38_1;
+  AbstractEndState.prototype.h2j = function () {
+    return this.a38_1;
   };
   AbstractEndState.prototype.j5 = function () {
-    return this.e38_1;
+    return this.b38_1;
   };
-  AbstractEndState.prototype.f38 = function () {
+  AbstractEndState.prototype.c38 = function () {
     throw NoSuchElementException_init_$Create$();
   };
   AbstractEndState.prototype.asEndState = function () {
-    return this.h38();
+    return this.e38();
   };
   function AbstractState$executionTime$delegate$lambda(this$0) {
     return function () {
-      return this$0.n38();
+      return this$0.k38();
     };
   }
   function AbstractState(context) {
-    this.i38_1 = context;
+    this.f38_1 = context;
     var tmp = this;
-    tmp.j38_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
+    tmp.g38_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
   }
   AbstractState.prototype.j5 = function () {
-    return this.i38_1;
+    return this.f38_1;
   };
-  AbstractState.prototype.l38 = function () {
+  AbstractState.prototype.i38 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
     var tmp0_getValue = executionTime$factory();
-    tmp$ret$0 = this.j38_1.b1();
+    tmp$ret$0 = this.g38_1.b1();
     return tmp$ret$0;
   };
-  AbstractState.prototype.m38 = function () {
-    return this.l38().ch(this.j5().a34_1).jd(this.j5().b34_1) > 0;
+  AbstractState.prototype.j38 = function () {
+    return this.i38().ah(this.j5().x33_1).jd(this.j5().y33_1) > 0;
   };
-  AbstractState.prototype.p = function () {
+  AbstractState.prototype.n = function () {
     var tmp;
-    if (this.m38()) {
-      var tmp0_exceededDuration = this.j5().b34_1;
+    if (this.j38()) {
+      var tmp0_exceededDuration = this.j5().y33_1;
       var tmp1_context = this.j5();
       var tmp_0 = TimeOutException_init_$Create$(null, null, tmp1_context, tmp0_exceededDuration, 3, null);
       var tmp_1 = this.j5();
       var tmp_2 = new Long(0, 0);
       var tmp_3 = new Long(0, 0);
-      var tmp_4 = this.o38();
-      tmp = new StateHalt(tmp_0, tmp_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, null, null, 0, tmp_4, null, 3145727, null));
+      var tmp_4 = this.l38();
+      tmp = new StateHalt(tmp_0, tmp_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, null, null, 0, tmp_4, null, 3145727, null));
     } else {
-      tmp = this.f38();
+      tmp = this.c38();
     }
     return tmp;
   };
   AbstractState.prototype.next = function () {
-    return this.p();
+    return this.n();
   };
-  AbstractState.prototype.n38 = function () {
+  AbstractState.prototype.k38 = function () {
     return currentTimeInstant();
   };
-  AbstractState.prototype.o38 = function () {
+  AbstractState.prototype.l38 = function () {
     var tmp$ret$0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = this.j5().f34_1;
-    tmp$ret$0 = tmp0_plus.bh(new Long(1, 0));
+    var tmp0_plus = this.j5().c34_1;
+    tmp$ret$0 = tmp0_plus.zg(new Long(1, 0));
     return tmp$ret$0;
   };
-  AbstractState.prototype.p38 = function (_this__u8e3s4) {
+  AbstractState.prototype.m38 = function (_this__u8e3s4) {
     var tmp$ret$2;
     $l$block: {
       // Inline function 'kotlin.sequences.first' call
-      var tmp0_first = _this__u8e3s4.h34_1;
+      var tmp0_first = _this__u8e3s4.e34_1;
       var tmp0_iterator = tmp0_first.j();
       while (tmp0_iterator.m()) {
-        var element = tmp0_iterator.p();
+        var element = tmp0_iterator.n();
         var tmp$ret$1;
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.AbstractState.skipThrow.<anonymous>' call
-        var tmp0_safe_receiver = element.l33_1;
-        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.fw();
+        var tmp0_safe_receiver = element.i33_1;
+        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.cw();
         var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
         var tmp0__get_functor__thl4dk = Throw_getInstance();
@@ -1747,7 +1747,7 @@
   };
   function executionTime$factory() {
     return getPropertyCallableRef('executionTime', 1, KProperty1, function (receiver) {
-      return receiver.l38();
+      return receiver.i38();
     }, null);
   }
   function EndState() {
@@ -1756,38 +1756,38 @@
   }
   function StateBacktracking(context) {
     AbstractState.call(this, context);
-    this.s38_1 = context;
+    this.p38_1 = context;
   }
   StateBacktracking.prototype.j5 = function () {
-    return this.s38_1;
+    return this.p38_1;
   };
-  StateBacktracking.prototype.f38 = function () {
-    var choicePoints = this.s38_1.c34_1;
+  StateBacktracking.prototype.c38 = function () {
+    var choicePoints = this.p38_1.z33_1;
     var tmp;
     var tmp$ret$1;
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-    tmp$ret$0 = choicePoints === null ? true : !choicePoints.j35();
+    tmp$ret$0 = choicePoints === null ? true : !choicePoints.g35();
     tmp$ret$1 = tmp$ret$0;
     if (tmp$ret$1) {
-      var tmp_0 = Companion_getInstance_14().no(this.s38_1.w33_1);
+      var tmp_0 = Companion_getInstance_14().no(this.p38_1.t33_1);
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      var tmp_3 = this.o38();
-      tmp = new StateEnd(tmp_0, this.s38_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 3145727, null));
+      var tmp_3 = this.l38();
+      tmp = new StateEnd(tmp_0, this.p38_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_1, tmp_2, null, null, 0, tmp_3, null, 3145727, null));
     } else {
       var tmp$ret$3;
       $l$block: {
         // Inline function 'kotlin.sequences.first' call
-        var tmp0_first = ensureNotNull(choicePoints).k35();
+        var tmp0_first = ensureNotNull(choicePoints).h35();
         var tmp0_iterator = tmp0_first.j();
         while (tmp0_iterator.m()) {
-          var element = tmp0_iterator.p();
+          var element = tmp0_iterator.n();
           var tmp$ret$2;
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-          tmp$ret$2 = element.w34().vq();
+          tmp$ret$2 = element.t34().sq();
           if (tmp$ret$2) {
             tmp$ret$3 = element;
             break $l$block;
@@ -1796,9 +1796,9 @@
         throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
       }
       var choicePointContext = tmp$ret$3;
-      var nextContext = choicePointContext.b35(this.s38_1);
+      var nextContext = choicePointContext.y34(this.p38_1);
       var tmp_4;
-      if (nextContext.z33_1.vq()) {
+      if (nextContext.w33_1.sq()) {
         tmp_4 = new StatePrimitiveExecution(nextContext);
       } else {
         tmp_4 = new StateRuleExecution(nextContext);
@@ -1807,17 +1807,17 @@
     }
     return tmp;
   };
-  StateBacktracking.prototype.k38 = function (context) {
-    return this.t38(context);
+  StateBacktracking.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StateBacktracking.prototype.t38 = function (context) {
+  StateBacktracking.prototype.q38 = function (context) {
     return new StateBacktracking(context);
   };
   StateBacktracking.prototype.toString = function () {
-    return 'StateBacktracking(context=' + this.s38_1 + ')';
+    return 'StateBacktracking(context=' + this.p38_1 + ')';
   };
   StateBacktracking.prototype.hashCode = function () {
-    return this.s38_1.hashCode();
+    return this.p38_1.hashCode();
   };
   StateBacktracking.prototype.equals = function (other) {
     if (this === other)
@@ -1825,49 +1825,49 @@
     if (!(other instanceof StateBacktracking))
       return false;
     var tmp0_other_with_cast = other instanceof StateBacktracking ? other : THROW_CCE();
-    if (!this.s38_1.equals(tmp0_other_with_cast.s38_1))
+    if (!this.p38_1.equals(tmp0_other_with_cast.p38_1))
       return false;
     return true;
   };
   function StateEnd(solution, context) {
     AbstractEndState.call(this, solution, context);
-    this.y38_1 = solution;
-    this.z38_1 = context;
+    this.v38_1 = solution;
+    this.w38_1 = context;
   }
-  StateEnd.prototype.k2j = function () {
-    return this.y38_1;
+  StateEnd.prototype.h2j = function () {
+    return this.v38_1;
   };
   StateEnd.prototype.j5 = function () {
-    return this.z38_1;
+    return this.w38_1;
   };
-  StateEnd.prototype.m38 = function () {
+  StateEnd.prototype.j38 = function () {
     return false;
   };
-  StateEnd.prototype.f38 = function () {
+  StateEnd.prototype.c38 = function () {
     var tmp;
-    if (this.z38_1.j35()) {
-      var tmp0_$this = this.z38_1;
-      var tmp1_step = this.o38();
-      var tmp2_startTime = this.n38();
+    if (this.w38_1.g35()) {
+      var tmp0_$this = this.w38_1;
+      var tmp1_step = this.l38();
+      var tmp2_startTime = this.k38();
       var tmp_0 = new Long(0, 0);
-      tmp = new StateBacktracking(tmp0_$this.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp2_startTime, tmp_0, null, null, 0, tmp1_step, null, 3112959, null));
+      tmp = new StateBacktracking(tmp0_$this.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp2_startTime, tmp_0, null, null, 0, tmp1_step, null, 3112959, null));
     } else {
-      tmp = AbstractEndState.prototype.f38.call(this);
+      tmp = AbstractEndState.prototype.c38.call(this);
     }
     return tmp;
   };
-  StateEnd.prototype.k38 = function (context) {
-    return this.a39(this.y38_1, context);
+  StateEnd.prototype.h38 = function (context) {
+    return this.x38(this.v38_1, context);
   };
-  StateEnd.prototype.a39 = function (solution, context) {
+  StateEnd.prototype.x38 = function (solution, context) {
     return new StateEnd(solution, context);
   };
   StateEnd.prototype.toString = function () {
-    return 'StateEnd(solution=' + this.y38_1 + ', context=' + this.z38_1 + ')';
+    return 'StateEnd(solution=' + this.v38_1 + ', context=' + this.w38_1 + ')';
   };
   StateEnd.prototype.hashCode = function () {
-    var result = hashCode(this.y38_1);
-    result = imul(result, 31) + this.z38_1.hashCode() | 0;
+    var result = hashCode(this.v38_1);
+    result = imul(result, 31) + this.w38_1.hashCode() | 0;
     return result;
   };
   StateEnd.prototype.equals = function (other) {
@@ -1876,19 +1876,19 @@
     if (!(other instanceof StateEnd))
       return false;
     var tmp0_other_with_cast = other instanceof StateEnd ? other : THROW_CCE();
-    if (!equals(this.y38_1, tmp0_other_with_cast.y38_1))
+    if (!equals(this.v38_1, tmp0_other_with_cast.v38_1))
       return false;
-    if (!this.z38_1.equals(tmp0_other_with_cast.z38_1))
+    if (!this.w38_1.equals(tmp0_other_with_cast.w38_1))
       return false;
     return true;
   };
   StateEnd.prototype.asEndState = function () {
-    return this.h38();
+    return this.e38();
   };
   function isCatch(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.zv() === 3) {
-      var tmp_0 = _this__u8e3s4.fw();
+    if (_this__u8e3s4.wv() === 3) {
+      var tmp_0 = _this__u8e3s4.cw();
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp0__get_functor__thl4dk = Catch_getInstance();
@@ -1903,9 +1903,9 @@
     var tmp0_subject = _this__u8e3s4;
     var tmp;
     if (tmp0_subject instanceof MessageError) {
-      tmp = _this__u8e3s4.m27();
+      tmp = _this__u8e3s4.j27();
     } else {
-      tmp = _this__u8e3s4.n25();
+      tmp = _this__u8e3s4.k25();
     }
     return tmp;
   }
@@ -1920,25 +1920,25 @@
     return tmp;
   }
   function _get_finalState__3aigq8($this) {
-    var tmp = toPublicException($this.d39_1, $this);
+    var tmp = toPublicException($this.a39_1, $this);
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
-    var tmp_2 = $this.o38();
-    return new StateHalt(tmp, $this.e39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3145727, null));
+    var tmp_2 = $this.l38();
+    return new StateHalt(tmp, $this.b39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3145727, null));
   }
   function _get_handleExceptionInParentContext__yj3v4e($this) {
-    var tmp = ensureNotNull($this.e39_1.d34_1);
+    var tmp = ensureNotNull($this.b39_1.a34_1);
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
-    var tmp_2 = $this.o38();
-    return new StateException($this.d39_1, tmp.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3145727, null));
+    var tmp_2 = $this.l38();
+    return new StateException($this.a39_1, tmp.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3145727, null));
   }
   function handleStruct($this, unificator, catchGoal, error) {
     var tmp;
     if (isCatch(catchGoal, $this)) {
       var catcher = unificator.mgu(catchGoal.get(1), getExceptionContent(error, $this));
       tmp = handleCatch($this, catchGoal, catcher);
-    } else if ($this.e39_1.y36()) {
+    } else if ($this.b39_1.v36()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1947,20 +1947,20 @@
   }
   function handleCatch($this, catchGoal, catcher) {
     var tmp;
-    if (catcher.q12()) {
-      var tmp_0 = $this.e39_1.v33_1.plus(catcher);
+    if (catcher.n12()) {
+      var tmp_0 = $this.b39_1.s33_1.plus(catcher);
       var newSubstitution = tmp_0.filterEntry(StateException$handleCatch$lambda($this));
       var subGoals = catchGoal.get(2).getSubstituted(newSubstitution, []);
-      var newGoals = plus_0(toGoals(subGoals), $this.e39_1.x33_1.tq());
-      var tmp0_$this = $this.e39_1;
+      var newGoals = plus_0(toGoals(subGoals), $this.b39_1.u33_1.qq());
+      var tmp0_$this = $this.b39_1;
       var tmp1_rules = Companion_getInstance_9().empty();
       var tmp2_primitives = Companion_getInstance_9().empty();
       var tmp3_substitution = newSubstitution.castToUnifier();
-      var tmp4_step = $this.o38();
+      var tmp4_step = $this.l38();
       var tmp_1 = new Long(0, 0);
       var tmp_2 = new Long(0, 0);
-      tmp = new StateGoalSelection(tmp0_$this.c35(null, null, null, null, null, null, null, null, null, null, tmp3_substitution, null, newGoals, tmp1_rules, tmp2_primitives, tmp_1, tmp_2, null, null, 0, tmp4_step, null, 3116031, null));
-    } else if ($this.e39_1.y36()) {
+      tmp = new StateGoalSelection(tmp0_$this.z34(null, null, null, null, null, null, null, null, null, null, tmp3_substitution, null, newGoals, tmp1_rules, tmp2_primitives, tmp_1, tmp_2, null, null, 0, tmp4_step, null, 3116031, null));
+    } else if ($this.b39_1.v36()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1973,40 +1973,40 @@
       // Inline function 'kotlin.collections.component1' call
       tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.a1();
       var it = tmp$ret$0;
-      return this$0.e39_1.a37(it);
+      return this$0.b39_1.x36(it);
     };
   }
   function StateException(exception, context) {
     AbstractState.call(this, context);
-    this.d39_1 = exception;
-    this.e39_1 = context;
+    this.a39_1 = exception;
+    this.b39_1 = context;
   }
   StateException.prototype.j5 = function () {
-    return this.e39_1;
+    return this.b39_1;
   };
-  StateException.prototype.f38 = function () {
-    var tmp0_subject = this.d39_1;
+  StateException.prototype.c38 = function () {
+    var tmp0_subject = this.a39_1;
     var tmp;
     if (tmp0_subject instanceof LogicError) {
-      var catchGoal = ensureNotNull(this.e39_1.z36());
-      tmp = catchGoal.lw() ? handleStruct(this, this.e39_1.m33_1, catchGoal.castToStruct(), this.d39_1) : this.e39_1.y36() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
+      var catchGoal = ensureNotNull(this.b39_1.w36());
+      tmp = catchGoal.iw() ? handleStruct(this, this.b39_1.j33_1, catchGoal.castToStruct(), this.a39_1) : this.b39_1.v36() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
     } else {
       tmp = _get_finalState__3aigq8(this);
     }
     return tmp;
   };
-  StateException.prototype.k38 = function (context) {
-    return this.f39(this.d39_1, context);
+  StateException.prototype.h38 = function (context) {
+    return this.c39(this.a39_1, context);
   };
-  StateException.prototype.f39 = function (exception, context) {
+  StateException.prototype.c39 = function (exception, context) {
     return new StateException(exception, context);
   };
   StateException.prototype.toString = function () {
-    return 'StateException(exception=' + this.d39_1 + ', context=' + this.e39_1 + ')';
+    return 'StateException(exception=' + this.a39_1 + ', context=' + this.b39_1 + ')';
   };
   StateException.prototype.hashCode = function () {
-    var result = hashCode(this.d39_1);
-    result = imul(result, 31) + this.e39_1.hashCode() | 0;
+    var result = hashCode(this.a39_1);
+    result = imul(result, 31) + this.b39_1.hashCode() | 0;
     return result;
   };
   StateException.prototype.equals = function (other) {
@@ -2015,9 +2015,9 @@
     if (!(other instanceof StateException))
       return false;
     var tmp0_other_with_cast = other instanceof StateException ? other : THROW_CCE();
-    if (!equals(this.d39_1, tmp0_other_with_cast.d39_1))
+    if (!equals(this.a39_1, tmp0_other_with_cast.a39_1))
       return false;
-    if (!this.e39_1.equals(tmp0_other_with_cast.e39_1))
+    if (!this.b39_1.equals(tmp0_other_with_cast.b39_1))
       return false;
     return true;
   };
@@ -2027,76 +2027,76 @@
       // Inline function 'kotlin.collections.component1' call
       tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.a1();
       var it = tmp$ret$0;
-      return this$0.i39_1.a37(it);
+      return this$0.f39_1.x36(it);
     };
   }
   function StateGoalSelection(context) {
     AbstractState.call(this, context);
-    this.i39_1 = context;
+    this.f39_1 = context;
   }
   StateGoalSelection.prototype.j5 = function () {
-    return this.i39_1;
+    return this.f39_1;
   };
-  StateGoalSelection.prototype.f38 = function () {
+  StateGoalSelection.prototype.c38 = function () {
     var tmp;
-    if (this.i39_1.x33_1.wq()) {
+    if (this.f39_1.u33_1.tq()) {
       var tmp_0;
-      if (this.i39_1.y36()) {
-        var tmp_1 = Companion_getInstance_14().m1w(this.i39_1.w33_1, this.i39_1.v33_1);
+      if (this.f39_1.v36()) {
+        var tmp_1 = Companion_getInstance_14().j1w(this.f39_1.t33_1, this.f39_1.s33_1);
         var tmp_2 = new Long(0, 0);
         var tmp_3 = new Long(0, 0);
-        var tmp_4 = this.o38();
-        tmp_0 = new StateEnd(tmp_1, this.i39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, null, null, 0, tmp_4, null, 3145727, null));
+        var tmp_4 = this.l38();
+        tmp_0 = new StateEnd(tmp_1, this.f39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, null, null, 0, tmp_4, null, 3145727, null));
       } else {
         var tmp$ret$1;
         // Inline function 'kotlin.let' call
-        var tmp0_let = ensureNotNull(this.i39_1.d34_1);
+        var tmp0_let = ensureNotNull(this.f39_1.a34_1);
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateGoalSelection.computeNext.<anonymous>' call
-        var tmp0_choicePoints = this.i39_1.c34_1;
-        var tmp1_flags = this.i39_1.o33_1;
-        var tmp2_dynamicKb = this.i39_1.q33_1;
-        var tmp3_staticKb = this.i39_1.p33_1;
-        var tmp4_substitution = this.i39_1.v33_1.k12(StateGoalSelection$computeNext$lambda(this));
-        var tmp5_goals = tmp0_let.x33_1.tq();
-        var tmp6_procedure = tmp0_let.l33_1;
-        var tmp7_step = this.o38();
-        var tmp8_startTime = this.i39_1.a34_1;
-        var tmp9_operators = this.i39_1.r33_1;
-        var tmp10_inputChannels = this.i39_1.s33_1;
-        var tmp11_outputChannels = this.i39_1.t33_1;
-        var tmp12_libraries = this.i39_1.n33_1;
-        var tmp13_customData = this.i39_1.u33_1;
+        var tmp0_choicePoints = this.f39_1.z33_1;
+        var tmp1_flags = this.f39_1.l33_1;
+        var tmp2_dynamicKb = this.f39_1.n33_1;
+        var tmp3_staticKb = this.f39_1.m33_1;
+        var tmp4_substitution = this.f39_1.s33_1.h12(StateGoalSelection$computeNext$lambda(this));
+        var tmp5_goals = tmp0_let.u33_1.qq();
+        var tmp6_procedure = tmp0_let.i33_1;
+        var tmp7_step = this.l38();
+        var tmp8_startTime = this.f39_1.x33_1;
+        var tmp9_operators = this.f39_1.o33_1;
+        var tmp10_inputChannels = this.f39_1.p33_1;
+        var tmp11_outputChannels = this.f39_1.q33_1;
+        var tmp12_libraries = this.f39_1.k33_1;
+        var tmp13_customData = this.f39_1.r33_1;
         var tmp_5 = new Long(0, 0);
-        tmp$ret$0 = tmp0_let.c35(tmp6_procedure, null, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, null, tmp5_goals, null, null, tmp8_startTime, tmp_5, tmp0_choicePoints, null, 0, tmp7_step, null, 2975746, null);
+        tmp$ret$0 = tmp0_let.z34(tmp6_procedure, null, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, null, tmp5_goals, null, null, tmp8_startTime, tmp_5, tmp0_choicePoints, null, 0, tmp7_step, null, 2975746, null);
         tmp$ret$1 = tmp$ret$0;
         tmp_0 = new StateGoalSelection(tmp$ret$1);
       }
       tmp = tmp_0;
-    } else if (equals(this.i39_1.o33_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().u29_1)) {
+    } else if (equals(this.f39_1.l33_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().r29_1)) {
       var tmp_6 = new Long(0, 0);
       var tmp_7 = new Long(0, 0);
-      tmp = new StatePrimitiveSelection(this.i39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_6, tmp_7, null, null, 0, this.o38(), plus_1(this.i39_1.g34_1, toSet(ensureNotNull(this.i39_1.x33_1.uq()).hw())), 1048575, null));
+      tmp = new StatePrimitiveSelection(this.f39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_6, tmp_7, null, null, 0, this.l38(), plus_1(this.f39_1.d34_1, toSet(ensureNotNull(this.f39_1.u33_1.rq()).ew())), 1048575, null));
     } else {
       var tmp_8 = new Long(0, 0);
       var tmp_9 = new Long(0, 0);
-      var tmp_10 = this.o38();
-      tmp = new StatePrimitiveSelection(this.i39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_8, tmp_9, null, null, 0, tmp_10, null, 3145727, null));
+      var tmp_10 = this.l38();
+      tmp = new StatePrimitiveSelection(this.f39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_8, tmp_9, null, null, 0, tmp_10, null, 3145727, null));
     }
     return tmp;
   };
-  StateGoalSelection.prototype.k38 = function (context) {
-    return this.t38(context);
+  StateGoalSelection.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StateGoalSelection.prototype.t38 = function (context) {
+  StateGoalSelection.prototype.q38 = function (context) {
     return new StateGoalSelection(context);
   };
   StateGoalSelection.prototype.toString = function () {
-    return 'StateGoalSelection(context=' + this.i39_1 + ')';
+    return 'StateGoalSelection(context=' + this.f39_1 + ')';
   };
   StateGoalSelection.prototype.hashCode = function () {
-    return this.i39_1.hashCode();
+    return this.f39_1.hashCode();
   };
   StateGoalSelection.prototype.equals = function (other) {
     if (this === other)
@@ -2104,30 +2104,30 @@
     if (!(other instanceof StateGoalSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateGoalSelection ? other : THROW_CCE();
-    if (!this.i39_1.equals(tmp0_other_with_cast.i39_1))
+    if (!this.f39_1.equals(tmp0_other_with_cast.f39_1))
       return false;
     return true;
   };
   function StateHalt(exception, context) {
-    AbstractEndState.call(this, Companion_getInstance_14().halt(context.w33_1, exception), context);
-    this.n39_1 = exception;
-    this.o39_1 = context;
+    AbstractEndState.call(this, Companion_getInstance_14().halt(context.t33_1, exception), context);
+    this.k39_1 = exception;
+    this.l39_1 = context;
   }
   StateHalt.prototype.j5 = function () {
-    return this.o39_1;
+    return this.l39_1;
   };
-  StateHalt.prototype.k38 = function (context) {
-    return this.f39(this.n39_1, context);
+  StateHalt.prototype.h38 = function (context) {
+    return this.c39(this.k39_1, context);
   };
-  StateHalt.prototype.f39 = function (exception, context) {
+  StateHalt.prototype.c39 = function (exception, context) {
     return new StateHalt(exception, context);
   };
   StateHalt.prototype.toString = function () {
-    return 'StateHalt(exception=' + this.n39_1 + ', context=' + this.o39_1 + ')';
+    return 'StateHalt(exception=' + this.k39_1 + ', context=' + this.l39_1 + ')';
   };
   StateHalt.prototype.hashCode = function () {
-    var result = hashCode(this.n39_1);
-    result = imul(result, 31) + this.o39_1.hashCode() | 0;
+    var result = hashCode(this.k39_1);
+    result = imul(result, 31) + this.l39_1.hashCode() | 0;
     return result;
   };
   StateHalt.prototype.equals = function (other) {
@@ -2136,44 +2136,44 @@
     if (!(other instanceof StateHalt))
       return false;
     var tmp0_other_with_cast = other instanceof StateHalt ? other : THROW_CCE();
-    if (!equals(this.n39_1, tmp0_other_with_cast.n39_1))
+    if (!equals(this.k39_1, tmp0_other_with_cast.k39_1))
       return false;
-    if (!this.o39_1.equals(tmp0_other_with_cast.o39_1))
+    if (!this.l39_1.equals(tmp0_other_with_cast.l39_1))
       return false;
     return true;
   };
   StateHalt.prototype.asEndState = function () {
-    return this.h38();
+    return this.e38();
   };
   function StateInit(context) {
     AbstractState.call(this, context);
-    this.r39_1 = context;
+    this.o39_1 = context;
   }
   StateInit.prototype.j5 = function () {
-    return this.r39_1;
+    return this.o39_1;
   };
-  StateInit.prototype.f38 = function () {
-    var tmp0_$this = this.r39_1;
-    var tmp1_goals = toGoals(this.r39_1.w33_1);
+  StateInit.prototype.c38 = function () {
+    var tmp0_$this = this.o39_1;
+    var tmp1_goals = toGoals(this.o39_1.t33_1);
     var tmp2_rules = Companion_getInstance_9().empty();
     var tmp3_primitives = Companion_getInstance_9().empty();
     var tmp4_substitution = Companion_getInstance_7().empty();
-    var tmp5_customData = this.r39_1.u33_1.preservePersistent();
+    var tmp5_customData = this.o39_1.r33_1.preservePersistent();
     var tmp6_relevantVariables = emptySet();
     var tmp = new Long(0, 0);
-    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.c35(null, null, null, null, null, null, null, null, null, tmp5_customData, tmp4_substitution, null, tmp1_goals, tmp2_rules, tmp3_primitives, tmp, new Long(0, 0), null, null, 0, new Long(1, 0), tmp6_relevantVariables, 100863, null), Companion_getInstance_9().empty()));
+    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.z34(null, null, null, null, null, null, null, null, null, tmp5_customData, tmp4_substitution, null, tmp1_goals, tmp2_rules, tmp3_primitives, tmp, new Long(0, 0), null, null, 0, new Long(1, 0), tmp6_relevantVariables, 100863, null), Companion_getInstance_9().empty()));
   };
-  StateInit.prototype.k38 = function (context) {
-    return this.t38(context);
+  StateInit.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StateInit.prototype.t38 = function (context) {
+  StateInit.prototype.q38 = function (context) {
     return new StateInit(context);
   };
   StateInit.prototype.toString = function () {
-    return 'StateInit(context=' + this.r39_1 + ')';
+    return 'StateInit(context=' + this.o39_1 + ')';
   };
   StateInit.prototype.hashCode = function () {
-    return this.r39_1.hashCode();
+    return this.o39_1.hashCode();
   };
   StateInit.prototype.equals = function (other) {
     if (this === other)
@@ -2181,12 +2181,12 @@
     if (!(other instanceof StateInit))
       return false;
     var tmp0_other_with_cast = other instanceof StateInit ? other : THROW_CCE();
-    if (!this.r39_1.equals(tmp0_other_with_cast.r39_1))
+    if (!this.o39_1.equals(tmp0_other_with_cast.o39_1))
       return false;
     return true;
   };
   function copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution) {
-    var tmp0_safe_receiver = _this__u8e3s4.z33_1.uq();
+    var tmp0_safe_receiver = _this__u8e3s4.w33_1.rq();
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -2196,24 +2196,24 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveExecution.copyFromCurrentPrimitive.<anonymous>' call
-      tmp$ret$0 = _this__u8e3s4.c37(tmp0_safe_receiver.sideEffects);
+      tmp$ret$0 = _this__u8e3s4.z36(tmp0_safe_receiver.sideEffects);
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
     var tmp1_elvis_lhs = tmp;
     var ctx = tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs;
     var tmp3_elvis_lhs = goals;
-    var tmp4_goals = tmp3_elvis_lhs == null ? _this__u8e3s4.x33_1 : tmp3_elvis_lhs;
-    var tmp_0 = drop(_this__u8e3s4.h34_1, procedureFromAncestor);
+    var tmp4_goals = tmp3_elvis_lhs == null ? _this__u8e3s4.u33_1 : tmp3_elvis_lhs;
+    var tmp_0 = drop(_this__u8e3s4.e34_1, procedureFromAncestor);
     var tmp5_procedure = first(map(tmp_0, StatePrimitiveExecution$copyFromCurrentPrimitive$lambda));
     var tmp6_primitives = Companion_getInstance_9().empty();
     var tmp2_elvis_lhs = substitution;
-    var tmp_1 = tmp2_elvis_lhs == null ? _this__u8e3s4.v33_1 : tmp2_elvis_lhs;
+    var tmp_1 = tmp2_elvis_lhs == null ? _this__u8e3s4.s33_1 : tmp2_elvis_lhs;
     var tmp7_substitution = isInterface(tmp_1, Unifier) ? tmp_1 : THROW_CCE();
-    var tmp8_step = $this.o38();
+    var tmp8_step = $this.l38();
     var tmp_2 = new Long(0, 0);
     var tmp_3 = new Long(0, 0);
-    return ctx.c35(tmp5_procedure, null, null, null, null, null, null, null, null, null, tmp7_substitution, null, tmp4_goals, null, tmp6_primitives, tmp_2, tmp_3, null, null, 0, tmp8_step, null, 3124222, null);
+    return ctx.z34(tmp5_procedure, null, null, null, null, null, null, null, null, null, tmp7_substitution, null, tmp4_goals, null, tmp6_primitives, tmp_2, tmp_3, null, null, 0, tmp8_step, null, 3124222, null);
   }
   function copyFromCurrentPrimitive$default(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution, $mask0, $handler) {
     if (!(($mask0 & 2) === 0))
@@ -2225,23 +2225,23 @@
     return copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution);
   }
   function StatePrimitiveExecution$copyFromCurrentPrimitive$lambda(it) {
-    return it.l33_1;
+    return it.i33_1;
   }
   function StatePrimitiveExecution$computeNext$lambda(this$0) {
     return function (it) {
-      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.u39_1, this$0, this$0.u39_1.x33_1.tq(), 1, this$0.u39_1.m33_1.mergeWithOccurCheck(this$0.u39_1.v33_1, it.r1u(), false)));
+      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.r39_1, this$0, this$0.r39_1.u33_1.qq(), 1, this$0.r39_1.j33_1.mergeWithOccurCheck(this$0.r39_1.s33_1, it.o1u(), false)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_0(this$0) {
     return function (it) {
-      var tmp = ensureNotNull(this$0.u39_1.d34_1);
+      var tmp = ensureNotNull(this$0.r39_1.a34_1);
       return new StateBacktracking(copyFromCurrentPrimitive$default(tmp, this$0, null, 0, null, 14, null));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_1(this$0) {
     return function (it) {
-      var tmp = it.c1w().updateLastContext(this$0.p38(this$0.u39_1));
-      return new StateException(tmp, copyFromCurrentPrimitive$default(this$0.u39_1, this$0, null, 0, null, 14, null));
+      var tmp = it.z1v().updateLastContext(this$0.m38(this$0.r39_1));
+      return new StateException(tmp, copyFromCurrentPrimitive$default(this$0.r39_1, this$0, null, 0, null, 14, null));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_2(it) {
@@ -2249,15 +2249,15 @@
   }
   function StatePrimitiveExecution(context) {
     AbstractState.call(this, context);
-    this.u39_1 = context;
+    this.r39_1 = context;
   }
   StatePrimitiveExecution.prototype.j5 = function () {
-    return this.u39_1;
+    return this.r39_1;
   };
-  StatePrimitiveExecution.prototype.f38 = function () {
+  StatePrimitiveExecution.prototype.c38 = function () {
     var tmp;
     try {
-      var tmp0_safe_receiver = this.u39_1.z33_1.uq();
+      var tmp0_safe_receiver = this.r39_1.w33_1.rq();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.solution;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2266,12 +2266,12 @@
         var tmp_1 = StatePrimitiveExecution$computeNext$lambda(this);
         var tmp_2 = StatePrimitiveExecution$computeNext$lambda_0(this);
         var tmp_3 = StatePrimitiveExecution$computeNext$lambda_1(this);
-        tmp_0 = tmp1_safe_receiver.g1w(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
+        tmp_0 = tmp1_safe_receiver.d1w(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
       }
       var tmp2_elvis_lhs = tmp_0;
       var tmp_4;
       if (tmp2_elvis_lhs == null) {
-        tmp_4 = new StateBacktracking(copyFromCurrentPrimitive$default(this.u39_1, this, null, 0, null, 14, null));
+        tmp_4 = new StateBacktracking(copyFromCurrentPrimitive$default(this.r39_1, this, null, 0, null, 14, null));
       } else {
         tmp_4 = tmp2_elvis_lhs;
       }
@@ -2279,11 +2279,11 @@
     } catch ($p) {
       var tmp_5;
       if ($p instanceof ResolutionException) {
-        var tmp_6 = $p.updateLastContext(this.p38(this.u39_1));
+        var tmp_6 = $p.updateLastContext(this.m38(this.r39_1));
         var tmp_7 = new Long(0, 0);
         var tmp_8 = new Long(0, 0);
-        var tmp_9 = this.o38();
-        tmp_5 = new StateException(tmp_6, this.u39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_7, tmp_8, null, null, 0, tmp_9, null, 3145727, null));
+        var tmp_9 = this.l38();
+        tmp_5 = new StateException(tmp_6, this.r39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_7, tmp_8, null, null, 0, tmp_9, null, 3145727, null));
       } else {
         throw $p;
       }
@@ -2291,17 +2291,17 @@
     }
     return tmp;
   };
-  StatePrimitiveExecution.prototype.k38 = function (context) {
-    return this.t38(context);
+  StatePrimitiveExecution.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StatePrimitiveExecution.prototype.t38 = function (context) {
+  StatePrimitiveExecution.prototype.q38 = function (context) {
     return new StatePrimitiveExecution(context);
   };
   StatePrimitiveExecution.prototype.toString = function () {
-    return 'StatePrimitiveExecution(context=' + this.u39_1 + ')';
+    return 'StatePrimitiveExecution(context=' + this.r39_1 + ')';
   };
   StatePrimitiveExecution.prototype.hashCode = function () {
-    return this.u39_1.hashCode();
+    return this.r39_1.hashCode();
   };
   StatePrimitiveExecution.prototype.equals = function (other) {
     if (this === other)
@@ -2309,44 +2309,44 @@
     if (!(other instanceof StatePrimitiveExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveExecution ? other : THROW_CCE();
-    if (!this.u39_1.equals(tmp0_other_with_cast.u39_1))
+    if (!this.r39_1.equals(tmp0_other_with_cast.r39_1))
       return false;
     return true;
   };
   function exceptionalState($this, exception) {
     var tmp = new Long(0, 0);
     var tmp_0 = new Long(0, 0);
-    var tmp_1 = $this.o38();
-    return new StateException(exception, $this.x39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
+    var tmp_1 = $this.l38();
+    return new StateException(exception, $this.u39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
   }
   function StatePrimitiveSelection(context) {
     AbstractState.call(this, context);
-    this.x39_1 = context;
+    this.u39_1 = context;
   }
   StatePrimitiveSelection.prototype.j5 = function () {
-    return this.x39_1;
+    return this.u39_1;
   };
-  StatePrimitiveSelection.prototype.f38 = function () {
+  StatePrimitiveSelection.prototype.c38 = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.x39_1;
+    var tmp0_with = this.u39_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveSelection.computeNext.<anonymous>' call
-    var goal = ensureNotNull(tmp0_with.z36());
+    var goal = ensureNotNull(tmp0_with.w36());
     var tmp;
-    if (goal.bx()) {
-      tmp = exceptionalState(this, Companion_getInstance_17().forGoal(this.x39_1, extractSignature(ensureNotNull(this.x39_1.l33_1)), goal.castToVar()));
-    } else if (goal.lw()) {
+    if (goal.yw()) {
+      tmp = exceptionalState(this, Companion_getInstance_17().forGoal(this.u39_1, extractSignature(ensureNotNull(this.u39_1.i33_1)), goal.castToVar()));
+    } else if (goal.iw()) {
       var goalStruct = goal.castToStruct();
       var signature = extractSignature(goalStruct);
       var tmp_0;
-      if (tmp0_with.n33_1.hasPrimitive(signature)) {
+      if (tmp0_with.k33_1.hasPrimitive(signature)) {
         var childContext = createChild$default(tmp0_with, false, 1, null);
         var tmp_1;
         try {
-          var request = toRequest(childContext, goalStruct, signature, this.l38());
-          var tmp0_elvis_lhs = tmp0_with.n33_1.n2e().a3(signature);
+          var request = toRequest(childContext, goalStruct, signature, this.i38());
+          var tmp0_elvis_lhs = tmp0_with.k33_1.k2e().a3(signature);
           var tmp_2;
           if (tmp0_elvis_lhs == null) {
             throw IllegalStateException_init_$Create$('Inconsistent behaviour of Library.contains and Library.get');
@@ -2359,7 +2359,7 @@
         } catch ($p) {
           var tmp_3;
           if ($p instanceof ResolutionException) {
-            tmp_3 = exceptionalState(this, $p.updateLastContext(this.p38(childContext)));
+            tmp_3 = exceptionalState(this, $p.updateLastContext(this.m38(childContext)));
           } else {
             throw $p;
           }
@@ -2369,13 +2369,13 @@
       } else {
         var tmp_4 = new Long(0, 0);
         var tmp_5 = new Long(0, 0);
-        var tmp_6 = this.o38();
-        tmp_0 = new StateRuleSelection(this.x39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_4, tmp_5, null, null, 0, tmp_6, null, 3145727, null));
+        var tmp_6 = this.l38();
+        tmp_0 = new StateRuleSelection(this.u39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_4, tmp_5, null, null, 0, tmp_6, null, 3145727, null));
       }
       tmp = tmp_0;
     } else {
       var tmp_7 = Companion_getInstance_16();
-      var tmp1_safe_receiver = this.x39_1.l33_1;
+      var tmp1_safe_receiver = this.u39_1.i33_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : extractSignature(tmp1_safe_receiver);
       var tmp_8;
       if (tmp2_elvis_lhs == null) {
@@ -2383,23 +2383,23 @@
       } else {
         tmp_8 = tmp2_elvis_lhs;
       }
-      tmp = exceptionalState(this, tmp_7.forGoal(this.x39_1, tmp_8, Expected_CALLABLE_getInstance(), goal));
+      tmp = exceptionalState(this, tmp_7.forGoal(this.u39_1, tmp_8, Expected_CALLABLE_getInstance(), goal));
     }
     tmp$ret$0 = tmp;
     tmp$ret$1 = tmp$ret$0;
     return tmp$ret$1;
   };
-  StatePrimitiveSelection.prototype.k38 = function (context) {
-    return this.t38(context);
+  StatePrimitiveSelection.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StatePrimitiveSelection.prototype.t38 = function (context) {
+  StatePrimitiveSelection.prototype.q38 = function (context) {
     return new StatePrimitiveSelection(context);
   };
   StatePrimitiveSelection.prototype.toString = function () {
-    return 'StatePrimitiveSelection(context=' + this.x39_1 + ')';
+    return 'StatePrimitiveSelection(context=' + this.u39_1 + ')';
   };
   StatePrimitiveSelection.prototype.hashCode = function () {
-    return this.x39_1.hashCode();
+    return this.u39_1.hashCode();
   };
   StatePrimitiveSelection.prototype.equals = function (other) {
     if (this === other)
@@ -2407,7 +2407,7 @@
     if (!(other instanceof StatePrimitiveSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveSelection ? other : THROW_CCE();
-    if (!this.x39_1.equals(tmp0_other_with_cast.x39_1))
+    if (!this.u39_1.equals(tmp0_other_with_cast.u39_1))
       return false;
     return true;
   };
@@ -2415,53 +2415,53 @@
     var tmp = Companion_getInstance_9().empty();
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
-    var tmp_2 = $this.o38();
-    return new StateBacktracking($this.a3a_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3137535, null));
+    var tmp_2 = $this.l38();
+    return new StateBacktracking($this.x39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3137535, null));
   }
   function StateRuleExecution(context) {
     AbstractState.call(this, context);
-    this.a3a_1 = context;
+    this.x39_1 = context;
   }
   StateRuleExecution.prototype.j5 = function () {
-    return this.a3a_1;
+    return this.x39_1;
   };
-  StateRuleExecution.prototype.f38 = function () {
+  StateRuleExecution.prototype.c38 = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.a3a_1;
+    var tmp0_with = this.x39_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleExecution.computeNext.<anonymous>' call
-    tmp$ret$0 = tmp0_with.m33_1.mgu(ensureNotNull(tmp0_with.z36()), ensureNotNull(tmp0_with.y33_1.uq()).ly());
+    tmp$ret$0 = tmp0_with.j33_1.mgu(ensureNotNull(tmp0_with.w36()), ensureNotNull(tmp0_with.v33_1.rq()).iy());
     tmp$ret$1 = tmp$ret$0;
     var substitution = tmp$ret$1;
     var tmp;
-    if (substitution.q12()) {
-      var newSubstitution = this.a3a_1.v33_1.plus(substitution).castToUnifier();
-      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.a3a_1.y33_1.uq()), newSubstitution).my().getSubstituted(newSubstitution, []);
-      var tmp0_$this = this.a3a_1;
+    if (substitution.n12()) {
+      var newSubstitution = this.x39_1.s33_1.plus(substitution).castToUnifier();
+      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.x39_1.v33_1.rq()), newSubstitution).jy().getSubstituted(newSubstitution, []);
+      var tmp0_$this = this.x39_1;
       var tmp1_goals = toGoals(subGoals);
       var tmp2_rules = Companion_getInstance_9().empty();
-      var tmp3_step = this.o38();
+      var tmp3_step = this.l38();
       var tmp_0 = new Long(0, 0);
       var tmp_1 = new Long(0, 0);
-      tmp = new StateGoalSelection(tmp0_$this.c35(null, null, null, null, null, null, null, null, null, null, newSubstitution, null, tmp1_goals, tmp2_rules, null, tmp_0, tmp_1, null, null, 0, tmp3_step, null, 3132415, null));
+      tmp = new StateGoalSelection(tmp0_$this.z34(null, null, null, null, null, null, null, null, null, null, newSubstitution, null, tmp1_goals, tmp2_rules, null, tmp_0, tmp_1, null, null, 0, tmp3_step, null, 3132415, null));
     } else {
       tmp = _get_failureState__yid9tw(this);
     }
     return tmp;
   };
-  StateRuleExecution.prototype.k38 = function (context) {
-    return this.t38(context);
+  StateRuleExecution.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StateRuleExecution.prototype.t38 = function (context) {
+  StateRuleExecution.prototype.q38 = function (context) {
     return new StateRuleExecution(context);
   };
   StateRuleExecution.prototype.toString = function () {
-    return 'StateRuleExecution(context=' + this.a3a_1 + ')';
+    return 'StateRuleExecution(context=' + this.x39_1 + ')';
   };
   StateRuleExecution.prototype.hashCode = function () {
-    return this.a3a_1.hashCode();
+    return this.x39_1.hashCode();
   };
   StateRuleExecution.prototype.equals = function (other) {
     if (this === other)
@@ -2469,23 +2469,23 @@
     if (!(other instanceof StateRuleExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleExecution ? other : THROW_CCE();
-    if (!this.a3a_1.equals(tmp0_other_with_cast.a3a_1))
+    if (!this.x39_1.equals(tmp0_other_with_cast.x39_1))
       return false;
     return true;
   };
   function None() {
     None_instance = this;
     CutLimit.call(this);
-    this.b3a_1 = -1;
-    this.c3a_1 = null;
+    this.y39_1 = -1;
+    this.z39_1 = null;
   }
-  None.prototype.d3a = function () {
-    return this.b3a_1;
+  None.prototype.a3a = function () {
+    return this.y39_1;
   };
-  None.prototype.q1u = function () {
-    return this.c3a_1;
+  None.prototype.n1u = function () {
+    return this.z39_1;
   };
-  None.prototype.e3a = function () {
+  None.prototype.b3a = function () {
     return true;
   };
   var None_instance;
@@ -2496,27 +2496,27 @@
   }
   function Actual(depthToCut, procedure) {
     CutLimit.call(this);
-    this.f3a_1 = depthToCut;
-    this.g3a_1 = procedure;
+    this.c3a_1 = depthToCut;
+    this.d3a_1 = procedure;
   }
-  Actual.prototype.d3a = function () {
-    return this.f3a_1;
+  Actual.prototype.a3a = function () {
+    return this.c3a_1;
   };
-  Actual.prototype.q1u = function () {
-    return this.g3a_1;
+  Actual.prototype.n1u = function () {
+    return this.d3a_1;
   };
   function CutLimit() {
   }
-  CutLimit.prototype.e3a = function () {
+  CutLimit.prototype.b3a = function () {
     return false;
   };
   function Companion_0() {
     Companion_instance_0 = this;
-    this.h3a_1 = Catch_getInstance().signature;
+    this.e3a_1 = Catch_getInstance().signature;
     var tmp = this;
     var tmp_0 = Signature_init_$Create$(',', 2, false, 4, null);
     var tmp_1 = Signature_init_$Create$(';', 2, false, 4, null);
-    tmp.i3a_1 = setOf([tmp_0, tmp_1, Signature_init_$Create$('->', 2, false, 4, null)]);
+    tmp.f3a_1 = setOf([tmp_0, tmp_1, Signature_init_$Create$('->', 2, false, 4, null)]);
   }
   var Companion_instance_0;
   function Companion_getInstance_23() {
@@ -2527,19 +2527,19 @@
   function _get_failureState__yid9tw_0($this) {
     var tmp = new Long(0, 0);
     var tmp_0 = new Long(0, 0);
-    var tmp_1 = $this.o38();
-    return new StateBacktracking($this.l3a_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
+    var tmp_1 = $this.l38();
+    return new StateBacktracking($this.i3a_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
   }
   function exceptionalState_0($this, exception) {
     var tmp = new Long(0, 0);
     var tmp_0 = new Long(0, 0);
-    var tmp_1 = $this.o38();
-    return new StateException(exception, $this.l3a_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
+    var tmp_1 = $this.l38();
+    return new StateException(exception, $this.i3a_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp, tmp_0, null, null, 0, tmp_1, null, 3145727, null));
   }
   function missingProcedure($this, ruleSources, missing) {
-    var unknown = $this.l3a_1.o33_1.get(Unknown_getInstance());
+    var unknown = $this.i3a_1.l33_1.get(Unknown_getInstance());
     var tmp;
-    if (equals(unknown, Unknown_getInstance().a2a_1)) {
+    if (equals(unknown, Unknown_getInstance().x29_1)) {
       tmp = _get_failureState__yid9tw_0($this);
     } else {
       var tmp_0;
@@ -2548,7 +2548,7 @@
         // Inline function 'kotlin.sequences.none' call
         var tmp0_iterator = ruleSources.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.classic.fsm.StateRuleSelection.missingProcedure.<anonymous>' call
           tmp$ret$0 = element.containsIndicator(missing.toIndicator());
@@ -2562,15 +2562,15 @@
       if (tmp$ret$1) {
         var tmp0_subject = unknown;
         var tmp_1;
-        if (equals(tmp0_subject, Unknown_getInstance().y29_1)) {
-          tmp_1 = exceptionalState_0($this, Companion_getInstance_18().forProcedure($this.l3a_1, missing));
-        } else if (equals(tmp0_subject, Unknown_getInstance().z29_1)) {
+        if (equals(tmp0_subject, Unknown_getInstance().v29_1)) {
+          tmp_1 = exceptionalState_0($this, Companion_getInstance_18().forProcedure($this.i3a_1, missing));
+        } else if (equals(tmp0_subject, Unknown_getInstance().w29_1)) {
           var tmp$ret$2;
           // Inline function 'kotlin.also' call
           var tmp0_also = _get_failureState__yid9tw_0($this);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.missingProcedure.<anonymous>' call
-          $this.l3a_1.o1v().write(MissingPredicate_init_$Create$($this.l3a_1, missing));
+          $this.i3a_1.l1v().write(MissingPredicate_init_$Create$($this.i3a_1, missing));
           tmp$ret$2 = tmp0_also;
           tmp_1 = tmp$ret$2;
         } else {
@@ -2585,31 +2585,31 @@
     return tmp;
   }
   function _get_ignoreState__t4wl8y($this) {
-    var tmp = $this.l3a_1.x33_1.tq();
+    var tmp = $this.i3a_1.u33_1.qq();
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
-    var tmp_2 = $this.o38();
-    return new StateGoalSelection($this.l3a_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, tmp, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3141631, null));
+    var tmp_2 = $this.l38();
+    return new StateGoalSelection($this.i3a_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, tmp, null, null, tmp_0, tmp_1, null, null, 0, tmp_2, null, 3141631, null));
   }
   function isCut(_this__u8e3s4, $this) {
-    return _this__u8e3s4.aw() ? _this__u8e3s4.castToAtom().b1() === '!' : false;
+    return _this__u8e3s4.xv() ? _this__u8e3s4.castToAtom().b1() === '!' : false;
   }
   function computeCutLimit(_this__u8e3s4, $this, magicCut) {
     var tmp;
     if (magicCut) {
-      tmp = firstOrNull(_this__u8e3s4.h34_1);
+      tmp = firstOrNull(_this__u8e3s4.e34_1);
     } else {
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.firstOrNull' call
-        var tmp0_firstOrNull = _this__u8e3s4.h34_1;
+        var tmp0_firstOrNull = _this__u8e3s4.e34_1;
         var tmp0_iterator = tmp0_firstOrNull.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.classic.fsm.StateRuleSelection.computeCutLimit.<anonymous>' call
-          var tmp_0 = Companion_getInstance_23().i3a_1;
-          var tmp0_safe_receiver = element.l33_1;
+          var tmp_0 = Companion_getInstance_23().f3a_1;
+          var tmp0_safe_receiver = element.i33_1;
           tmp$ret$0 = !contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver));
           if (tmp$ret$0) {
             tmp$ret$1 = element;
@@ -2625,21 +2625,21 @@
     if (cutLimit == null) {
       tmp_1 = None_getInstance();
     } else {
-      tmp_1 = new Actual(cutLimit.e34_1, cutLimit.l33_1);
+      tmp_1 = new Actual(cutLimit.b34_1, cutLimit.i33_1);
     }
     return tmp_1;
   }
   function cutCanBeSkipped($this, cutLimit, executionContext) {
-    return (cutLimit.e3a() ? true : cutLimit.d3a() > executionContext.e34_1) ? true : cutLimit.d3a() === executionContext.e34_1 ? !equals(cutLimit.q1u(), executionContext.l33_1) : false;
+    return (cutLimit.b3a() ? true : cutLimit.a3a() > executionContext.b34_1) ? true : cutLimit.a3a() === executionContext.b34_1 ? !equals(cutLimit.n1u(), executionContext.i33_1) : false;
   }
   function performCut(_this__u8e3s4, $this, cutLimit) {
     var tmp;
     if (_this__u8e3s4 === null) {
       tmp = null;
-    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.x34()))) {
+    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.u34()))) {
       tmp = _this__u8e3s4;
     } else {
-      var tmp_0 = _this__u8e3s4.k35();
+      var tmp_0 = _this__u8e3s4.h35();
       var cutCandidates = filter(tmp_0, StateRuleSelection$performCut$lambda(cutLimit));
       var tmp_1;
       if (any(cutCandidates)) {
@@ -2648,10 +2648,10 @@
           // Inline function 'kotlin.sequences.firstOrNull' call
           var tmp0_iterator = cutCandidates.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.classic.fsm.StateRuleSelection.performCut.<anonymous>' call
-            tmp$ret$0 = ensureNotNull(element.x34()).e34_1 <= cutLimit.d3a();
+            tmp$ret$0 = ensureNotNull(element.u34()).b34_1 <= cutLimit.a3a();
             if (tmp$ret$0) {
               tmp$ret$1 = element;
               break $l$block;
@@ -2660,7 +2660,7 @@
           tmp$ret$1 = null;
         }
         var tmp0_safe_receiver = tmp$ret$1;
-        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y34();
+        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v34();
       } else {
         tmp_1 = _this__u8e3s4;
       }
@@ -2670,10 +2670,10 @@
   }
   function _get_isTailRecursive__h5eso7(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.x33_1.tq().wq() ? equals(_this__u8e3s4.o33_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().n29_1) : false) {
+    if (_this__u8e3s4.u33_1.qq().tq() ? equals(_this__u8e3s4.l33_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().k29_1) : false) {
       var tmp$ret$3;
       // Inline function 'kotlin.let' call
-      var tmp0_let = ensureNotNull(_this__u8e3s4.z36());
+      var tmp0_let = ensureNotNull(_this__u8e3s4.w36());
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>' call
@@ -2689,9 +2689,9 @@
         var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>.<anonymous>' call
         var tmp_1;
-        var tmp0_safe_receiver_0 = _this__u8e3s4.l33_1;
+        var tmp0_safe_receiver_0 = _this__u8e3s4.i33_1;
         if (equals(tmp1_safe_receiver, tmp0_safe_receiver_0 == null ? null : extractSignature(tmp0_safe_receiver_0))) {
-          tmp_1 = !equals(tmp1_safe_receiver, Companion_getInstance_23().h3a_1);
+          tmp_1 = !equals(tmp1_safe_receiver, Companion_getInstance_23().e3a_1);
         } else {
           tmp_1 = false;
         }
@@ -2717,7 +2717,7 @@
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.selectClauses.<anonymous>' call
     var tmp_0;
-    if (_this__u8e3s4.a1t()) {
+    if (_this__u8e3s4.x1s()) {
       tmp_0 = buffered(tmp0_let);
     } else {
       tmp_0 = tmp0_let;
@@ -2728,7 +2728,7 @@
   }
   function StateRuleSelection$performCut$lambda($cutLimit) {
     return function (it) {
-      return equals(ensureNotNull(it.x34()).l33_1, $cutLimit.q1u());
+      return equals(ensureNotNull(it.u34()).i33_1, $cutLimit.n1u());
     };
   }
   function StateRuleSelection$computeNext$lambda(this$0, $currentGoalStruct) {
@@ -2737,34 +2737,34 @@
     };
   }
   function StateRuleSelection$selectClauses$lambda(it) {
-    return it.iw();
+    return it.fw();
   }
   function StateRuleSelection(context) {
     Companion_getInstance_23();
     AbstractState.call(this, context);
-    this.l3a_1 = context;
+    this.i3a_1 = context;
   }
   StateRuleSelection.prototype.j5 = function () {
-    return this.l3a_1;
+    return this.i3a_1;
   };
-  StateRuleSelection.prototype.f38 = function () {
-    var currentGoal = ensureNotNull(this.l3a_1.z36());
+  StateRuleSelection.prototype.c38 = function () {
+    var currentGoal = ensureNotNull(this.i3a_1.w36());
     var tmp;
-    if (currentGoal.bx()) {
-      tmp = exceptionalState_0(this, Companion_getInstance_17().forGoal(this.l3a_1, extractSignature(ensureNotNull(this.l3a_1.l33_1)), currentGoal.castToVar()));
-    } else if (currentGoal.lw()) {
+    if (currentGoal.yw()) {
+      tmp = exceptionalState_0(this, Companion_getInstance_17().forGoal(this.i3a_1, extractSignature(ensureNotNull(this.i3a_1.i33_1)), currentGoal.castToVar()));
+    } else if (currentGoal.iw()) {
       var tmp$ret$5;
       // Inline function 'kotlin.with' call
-      var tmp0_with = this.l3a_1;
+      var tmp0_with = this.i3a_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$4;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>' call
       var currentGoalStruct = currentGoal.castToStruct();
-      var ruleSources = sequenceOf([tmp0_with.n33_1.asTheory(tmp0_with.m33_1), tmp0_with.p33_1, tmp0_with.q33_1]);
+      var ruleSources = sequenceOf([tmp0_with.k33_1.asTheory(tmp0_with.j33_1), tmp0_with.m33_1, tmp0_with.n33_1]);
       var tmp_0;
-      if (currentGoalStruct.cx()) {
+      if (currentGoalStruct.zw()) {
         var tmp_1;
-        if (currentGoalStruct.dw()) {
+        if (currentGoalStruct.aw()) {
           tmp_1 = _get_ignoreState__t4wl8y(this);
         } else {
           tmp_1 = _get_failureState__yid9tw_0(this);
@@ -2781,9 +2781,9 @@
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>.<anonymous>' call
           var tmp_2 = new Long(0, 0);
           var tmp_3 = new Long(0, 0);
-          var tmp_4 = performCut(tmp0_let.i39_1.c34_1, this, cutLimit);
+          var tmp_4 = performCut(tmp0_let.f39_1.z33_1, this, cutLimit);
           var tmp_5 = new Long(0, 0);
-          tmp$ret$0 = tmp0_let.t38(tmp0_let.i39_1.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, tmp_4, null, 0, tmp_5, null, 4063231, null));
+          tmp$ret$0 = tmp0_let.q38(tmp0_let.f39_1.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, tmp_2, tmp_3, tmp_4, null, 0, tmp_5, null, 4063231, null));
           tmp$ret$1 = tmp$ret$0;
           tmp_0 = tmp$ret$1;
         } else {
@@ -2792,7 +2792,7 @@
             // Inline function 'kotlin.sequences.any' call
             var tmp0_iterator = ruleSources.j();
             while (tmp0_iterator.m()) {
-              var element = tmp0_iterator.p();
+              var element = tmp0_iterator.n();
               var tmp$ret$2;
               // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>.<anonymous>' call
               tmp$ret$2 = element.containsHead(currentGoalStruct);
@@ -2806,10 +2806,10 @@
           if (tmp$ret$3) {
             var rules = cursor(flatMap(ruleSources, StateRuleSelection$computeNext$lambda(this, currentGoalStruct)));
             var tmp_6;
-            if (_get_isTailRecursive__h5eso7(this.l3a_1, this)) {
-              tmp_6 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints$default(this.l3a_1, rules, false, 2, null));
+            if (_get_isTailRecursive__h5eso7(this.i3a_1, this)) {
+              tmp_6 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints$default(this.i3a_1, rules, false, 2, null));
             } else {
-              tmp_6 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints$default(this.l3a_1, rules, false, 2, null));
+              tmp_6 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints$default(this.i3a_1, rules, false, 2, null));
             }
             tmp_0 = tmp_6;
           } else {
@@ -2821,21 +2821,21 @@
       tmp$ret$5 = tmp$ret$4;
       tmp = tmp$ret$5;
     } else {
-      tmp = exceptionalState_0(this, Companion_getInstance_16().forGoal(this.l3a_1, extractSignature(ensureNotNull(this.l3a_1.l33_1)), Expected_CALLABLE_getInstance(), currentGoal));
+      tmp = exceptionalState_0(this, Companion_getInstance_16().forGoal(this.i3a_1, extractSignature(ensureNotNull(this.i3a_1.i33_1)), Expected_CALLABLE_getInstance(), currentGoal));
     }
     return tmp;
   };
-  StateRuleSelection.prototype.k38 = function (context) {
-    return this.t38(context);
+  StateRuleSelection.prototype.h38 = function (context) {
+    return this.q38(context);
   };
-  StateRuleSelection.prototype.t38 = function (context) {
+  StateRuleSelection.prototype.q38 = function (context) {
     return new StateRuleSelection(context);
   };
   StateRuleSelection.prototype.toString = function () {
-    return 'StateRuleSelection(context=' + this.l3a_1 + ')';
+    return 'StateRuleSelection(context=' + this.i3a_1 + ')';
   };
   StateRuleSelection.prototype.hashCode = function () {
-    return this.l3a_1.hashCode();
+    return this.i3a_1.hashCode();
   };
   StateRuleSelection.prototype.equals = function (other) {
     if (this === other)
@@ -2843,22 +2843,22 @@
     if (!(other instanceof StateRuleSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleSelection ? other : THROW_CCE();
-    if (!this.l3a_1.equals(tmp0_other_with_cast.l3a_1))
+    if (!this.i3a_1.equals(tmp0_other_with_cast.i3a_1))
       return false;
     return true;
   };
   function appendRulesAndChoicePoints(_this__u8e3s4, rules) {
     var tmp;
-    if (rules.vq()) {
-      tmp = appendRules(_this__u8e3s4.c34_1, rules.tq(), _this__u8e3s4);
+    if (rules.sq()) {
+      tmp = appendRules(_this__u8e3s4.z33_1, rules.qq(), _this__u8e3s4);
     } else {
-      tmp = appendRules(_this__u8e3s4.c34_1, Companion_getInstance_9().empty(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.z33_1, Companion_getInstance_9().empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
-    return _this__u8e3s4.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, rules, null, tmp_0, tmp_1, newChoicePointContext, null, 0, tmp_2, null, 4055039, null);
+    return _this__u8e3s4.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, rules, null, tmp_0, tmp_1, newChoicePointContext, null, 0, tmp_2, null, 4055039, null);
   }
   function toGoals(_this__u8e3s4) {
     var tmp = unfoldGoals(_this__u8e3s4);
@@ -2866,8 +2866,8 @@
   }
   function unfoldGoals(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.qw()) {
-      var tmp_0 = _this__u8e3s4.castToTuple().ju();
+    if (_this__u8e3s4.nw()) {
+      var tmp_0 = _this__u8e3s4.castToTuple().gu();
       tmp = flatMap(tmp_0, unfoldGoals$lambda);
     } else {
       tmp = sequenceOf([_this__u8e3s4]);
@@ -2875,19 +2875,19 @@
     return tmp;
   }
   function createChild(_this__u8e3s4, inferProcedureFromGoals) {
-    var currentGoal = ensureNotNull(_this__u8e3s4.z36()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.w36()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.l33_1;
-    var tmp2_depth = _this__u8e3s4.e34_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.i33_1;
+    var tmp2_depth = _this__u8e3s4.b34_1 + 1 | 0;
     var tmp$ret$0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = _this__u8e3s4.f34_1;
-    tmp$ret$0 = tmp0_plus.bh(new Long(1, 0));
+    var tmp0_plus = _this__u8e3s4.c34_1;
+    tmp$ret$0 = tmp0_plus.zg(new Long(1, 0));
     var tmp3_step = tmp$ret$0;
     var tmp4_relevantVariables = emptySet();
     var tmp = new Long(0, 0);
     var tmp_0 = new Long(0, 0);
-    return _this__u8e3s4.c35(tmp1_procedure, null, null, null, null, null, null, null, null, null, null, null, tmp0_goals, null, null, tmp, tmp_0, null, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables, 258046, null);
+    return _this__u8e3s4.z34(tmp1_procedure, null, null, null, null, null, null, null, null, null, null, null, tmp0_goals, null, null, tmp, tmp_0, null, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables, 258046, null);
   }
   function createChild$default(_this__u8e3s4, inferProcedureFromGoals, $mask0, $handler) {
     if (!(($mask0 & 1) === 0))
@@ -2895,21 +2895,21 @@
     return createChild(_this__u8e3s4, inferProcedureFromGoals);
   }
   function toRequest(_this__u8e3s4, goal, signature, startTime) {
-    var tmp = goal.gw();
+    var tmp = goal.dw();
     return Request_init_$Create$(signature, tmp, _this__u8e3s4, startTime, new Long(0, 0), 16, null);
   }
   function appendPrimitivesAndChoicePoints(_this__u8e3s4, primitiveExecutions) {
     var tmp;
-    if (primitiveExecutions.vq()) {
-      tmp = appendPrimitives(_this__u8e3s4.c34_1, primitiveExecutions.tq(), _this__u8e3s4);
+    if (primitiveExecutions.sq()) {
+      tmp = appendPrimitives(_this__u8e3s4.z33_1, primitiveExecutions.qq(), _this__u8e3s4);
     } else {
-      tmp = appendPrimitives(_this__u8e3s4.c34_1, Companion_getInstance_9().empty(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.z33_1, Companion_getInstance_9().empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
     var tmp_0 = new Long(0, 0);
     var tmp_1 = new Long(0, 0);
     var tmp_2 = new Long(0, 0);
-    return _this__u8e3s4.c35(null, null, null, null, null, null, null, null, null, null, null, null, null, null, primitiveExecutions, tmp_0, tmp_1, newChoicePointContext, null, 0, tmp_2, null, 4046847, null);
+    return _this__u8e3s4.z34(null, null, null, null, null, null, null, null, null, null, null, null, null, null, primitiveExecutions, tmp_0, tmp_1, newChoicePointContext, null, 0, tmp_2, null, 4046847, null);
   }
   function replaceWithChildAppendingRulesAndChoicePoints(_this__u8e3s4, rules, inferProcedureFromGoals) {
     var tempExecutionContext = replaceWithChild(_this__u8e3s4, inferProcedureFromGoals);
@@ -2933,28 +2933,28 @@
     return map(_this__u8e3s4, ensureRules$lambda);
   }
   function replaceWithChild(_this__u8e3s4, inferProcedureFromGoals) {
-    var currentGoal = ensureNotNull(_this__u8e3s4.z36()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.w36()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.l33_1;
-    var tmp2_depth = _this__u8e3s4.e34_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.i33_1;
+    var tmp2_depth = _this__u8e3s4.b34_1 + 1 | 0;
     var tmp$ret$0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = _this__u8e3s4.f34_1;
-    tmp$ret$0 = tmp0_plus.bh(new Long(1, 0));
+    var tmp0_plus = _this__u8e3s4.c34_1;
+    tmp$ret$0 = tmp0_plus.zg(new Long(1, 0));
     var tmp3_step = tmp$ret$0;
     var tmp = new Long(0, 0);
     var tmp_0 = new Long(0, 0);
-    return _this__u8e3s4.c35(tmp1_procedure, null, null, null, null, null, null, null, null, null, null, null, tmp0_goals, null, null, tmp, tmp_0, null, null, tmp2_depth, tmp3_step, null, 2617342, null);
+    return _this__u8e3s4.z34(tmp1_procedure, null, null, null, null, null, null, null, null, null, null, null, tmp0_goals, null, null, tmp, tmp_0, null, null, tmp2_depth, tmp3_step, null, 2617342, null);
   }
   function toGoals$lambda(it) {
-    return it.bx() ? Companion_getInstance_11().of('call', [it]) : it;
+    return it.yw() ? Companion_getInstance_11().of('call', [it]) : it;
   }
   function unfoldGoals$lambda(it) {
     return unfoldGoals(it);
   }
   function ensureRules$lambda(it) {
     // Inline function 'kotlin.require' call
-    var tmp0_require = it.nw();
+    var tmp0_require = it.kw();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -2968,54 +2968,54 @@
     return it.castToRule();
   }
   function AbstractSolutionIterator(state) {
-    this.m3a_1 = state;
-    this.n3a_1 = new Long(0, 0);
+    this.j3a_1 = state;
+    this.k3a_1 = new Long(0, 0);
   }
   AbstractSolutionIterator.prototype.m = function () {
     var tmp$ret$1;
     // Inline function 'kotlin.let' call
-    var tmp0_let = this.m3a_1;
+    var tmp0_let = this.j3a_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.impl.AbstractSolutionIterator.hasNext.<anonymous>' call
-    tmp$ret$0 = !tmp0_let.g38() ? true : tmp0_let.castToEndState().j35();
+    tmp$ret$0 = !tmp0_let.d38() ? true : tmp0_let.castToEndState().g35();
     tmp$ret$1 = tmp$ret$0;
     return tmp$ret$1;
   };
-  AbstractSolutionIterator.prototype.p = function () {
+  AbstractSolutionIterator.prototype.n = function () {
     do {
-      var previousState = this.m3a_1;
+      var previousState = this.j3a_1;
       var tmp = this;
-      var tmp_0 = this.m3a_1;
+      var tmp_0 = this.j3a_1;
       var tmp0_this = this;
-      tmp0_this.n3a_1 = tmp0_this.n3a_1.gh();
-      tmp.m3a_1 = this.o3a(tmp_0, tmp0_this.n3a_1);
-      this.onStateTransition(previousState, this.m3a_1, this.n3a_1);
+      tmp0_this.k3a_1 = tmp0_this.k3a_1.eh();
+      tmp.j3a_1 = this.l3a(tmp_0, tmp0_this.k3a_1);
+      this.onStateTransition(previousState, this.j3a_1, this.k3a_1);
     }
-     while (!this.m3a_1.g38());
-    return this.m3a_1.castToEndState().k2j().cleanUp();
+     while (!this.j3a_1.d38());
+    return this.j3a_1.castToEndState().h2j().cleanUp();
   };
   function SimpleSolutionIterator(state, onStateTransitionCallback) {
     AbstractSolutionIterator.call(this, state);
-    this.r3a_1 = onStateTransitionCallback;
+    this.o3a_1 = onStateTransitionCallback;
   }
-  SimpleSolutionIterator.prototype.o3a = function (state, step) {
+  SimpleSolutionIterator.prototype.l3a = function (state, step) {
     return state.next();
   };
-  SimpleSolutionIterator.prototype.s3a = function (source, destination, index) {
-    return this.r3a_1(source, destination, index);
+  SimpleSolutionIterator.prototype.p3a = function (source, destination, index) {
+    return this.o3a_1(source, destination, index);
   };
   SimpleSolutionIterator.prototype.onStateTransition = function (source, destination, index) {
-    return this.s3a(source, destination, index);
+    return this.p3a(source, destination, index);
   };
   function DefaultBuiltins() {
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, CommonBuiltins_getInstance());
   }
-  DefaultBuiltins.prototype.b2f = function () {
+  DefaultBuiltins.prototype.y2e = function () {
     return listOf(Throw_getInstance());
   };
-  DefaultBuiltins.prototype.a2f = function () {
+  DefaultBuiltins.prototype.x2e = function () {
     return listOf_0([Catch_getInstance(), Call_getInstance(), Comma_getInstance(), Cut_getInstance(), Fail_getInstance(), Success_getInstance()]);
   };
   var DefaultBuiltins_instance;
@@ -3029,12 +3029,12 @@
     var tmp_0;
     var tmp_1;
     if (isInterface(error, Struct)) {
-      tmp_1 = error.fw() === 'error';
+      tmp_1 = error.cw() === 'error';
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      var containsArg = error.zv();
+      var containsArg = error.wv();
       tmp_0 = 1 <= containsArg ? containsArg <= 2 : false;
     } else {
       tmp_0 = false;
@@ -3042,10 +3042,10 @@
     if (tmp_0) {
       var tmp_2 = Companion_getInstance_20();
       var tmp_3 = error.get(0);
-      tmp = tmp_2.u25(null, null, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.zv() > 1 ? error.get(1) : null, 3, null);
+      tmp = tmp_2.r25(null, null, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.wv() > 1 ? error.get(1) : null, 3, null);
     } else {
       var tmp_4 = Companion_getInstance_19();
-      tmp = tmp_4.h27(error, context, null, 4, null);
+      tmp = tmp_4.e27(error, context, null, 4, null);
     }
     return tmp;
   }
@@ -3053,13 +3053,13 @@
     Throw_instance = this;
     UnaryPredicate.call(this, 'throw');
   }
-  Throw.prototype.t2r = function (_this__u8e3s4, first) {
-    var tmp = Companion_getInstance_21().b2g(_this__u8e3s4);
-    var tmp_0 = handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.n(0));
-    return sequenceOf([tmp.f2j(tmp_0, null, [], 6, null)]);
+  Throw.prototype.q2r = function (_this__u8e3s4, first) {
+    var tmp = Companion_getInstance_21().y2f(_this__u8e3s4);
+    var tmp_0 = handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.o(0));
+    return sequenceOf([tmp.c2j(tmp_0, null, [], 6, null)]);
   };
-  Throw.prototype.f2k = function (_this__u8e3s4, first) {
-    return this.t2r(_this__u8e3s4, first);
+  Throw.prototype.c2k = function (_this__u8e3s4, first) {
+    return this.q2r(_this__u8e3s4, first);
   };
   var Throw_instance;
   function Throw_getInstance() {
@@ -3071,10 +3071,10 @@
     Call_instance = this;
     RuleWrapper_init_$Init$('call', 1, false, 4, null, this);
   }
-  Call.prototype.j2k = function (_this__u8e3s4) {
+  Call.prototype.g2k = function (_this__u8e3s4) {
     return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G')]);
   };
-  Call.prototype.k2k = function (_this__u8e3s4) {
+  Call.prototype.h2k = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = EnsureExecutable_getInstance();
@@ -3091,10 +3091,10 @@
     Catch_instance = this;
     RuleWrapper_init_$Init$('catch', 3, false, 4, null, this);
   }
-  Catch.prototype.j2k = function (_this__u8e3s4) {
+  Catch.prototype.g2k = function (_this__u8e3s4) {
     return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
   };
-  Catch.prototype.k2k = function (_this__u8e3s4) {
+  Catch.prototype.h2k = function (_this__u8e3s4) {
     return _this__u8e3s4.varOf('G');
   };
   var Catch_instance;
@@ -3107,10 +3107,10 @@
     Comma_instance = this;
     RuleWrapper_init_$Init$(',', 2, false, 4, null, this);
   }
-  Comma.prototype.j2k = function (_this__u8e3s4) {
+  Comma.prototype.g2k = function (_this__u8e3s4) {
     return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
-  Comma.prototype.k2k = function (_this__u8e3s4) {
+  Comma.prototype.h2k = function (_this__u8e3s4) {
     return _this__u8e3s4.tupleOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
   var Comma_instance;
@@ -3133,7 +3133,7 @@
     Fail_instance = this;
     NegationAsFailure.call(this);
   }
-  Fail.prototype.k2k = function (_this__u8e3s4) {
+  Fail.prototype.h2k = function (_this__u8e3s4) {
     var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp0__get_functor__thl4dk = EnsureExecutable_getInstance();
@@ -3155,7 +3155,7 @@
     Success_instance = this;
     NegationAsFailure.call(this);
   }
-  Success.prototype.k2k = function (_this__u8e3s4) {
+  Success.prototype.h2k = function (_this__u8e3s4) {
     return _this__u8e3s4.truthOf(true);
   };
   var Success_instance;
@@ -3166,8 +3166,8 @@
   }
   function Companion_1() {
     Companion_instance_1 = this;
-    this.s3b_1 = '\\+';
-    this.t3b_1 = 1;
+    this.p3b_1 = '\\+';
+    this.q3b_1 = 1;
   }
   var Companion_instance_1;
   function Companion_getInstance_24() {
@@ -3181,11 +3181,11 @@
     Companion_getInstance_24();
     RuleWrapper_init_$Init$('\\+', 1, false, 4, null, this);
   }
-  NegationAsFailure.prototype.j2k = function (_this__u8e3s4) {
+  NegationAsFailure.prototype.g2k = function (_this__u8e3s4) {
     return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('X')]);
   };
   //region block: post-declaration
-  AbstractClassicSolver.prototype.x1x = copy$default;
+  AbstractClassicSolver.prototype.u1x = copy$default;
   AbstractClassicSolver.prototype.solveWithTimeout = solveWithTimeout;
   AbstractClassicSolver.prototype.solve = solve;
   AbstractClassicSolver.prototype.solveListWithTimeout = solveListWithTimeout;
@@ -3194,21 +3194,21 @@
   AbstractClassicSolver.prototype.solveOnceWithTimeout = solveOnceWithTimeout;
   AbstractClassicSolver.prototype.solveOnce = solveOnce;
   AbstractClassicSolver.prototype.solveOnceWithOptions = solveOnceWithOptions;
-  AbstractClassicSolver.prototype.i1v = get_standardInput;
-  AbstractClassicSolver.prototype.k1v = get_standardOutput;
-  AbstractClassicSolver.prototype.m1v = get_standardError;
-  AbstractClassicSolver.prototype.o1v = get_warnings;
-  ClassicExecutionContext.prototype.v1u = createSolver$default;
-  ClassicExecutionContext.prototype.d1v = createMutableSolver$default;
-  ClassicExecutionContext.prototype.g1v = update$default;
-  ClassicExecutionContext.prototype.i1v = get_standardInput;
-  ClassicExecutionContext.prototype.k1v = get_standardOutput;
-  ClassicExecutionContext.prototype.m1v = get_standardError;
-  ClassicExecutionContext.prototype.o1v = get_warnings;
-  ClassicExecutionContext.prototype.m1u = get_endTime;
-  ClassicExecutionContext.prototype.o1u = get_remainingTime;
-  ClassicExecutionContext.prototype.p1u = get_elapsedTime;
-  ClassicSolver.prototype.x1x = copy$default;
+  AbstractClassicSolver.prototype.f1v = get_standardInput;
+  AbstractClassicSolver.prototype.h1v = get_standardOutput;
+  AbstractClassicSolver.prototype.j1v = get_standardError;
+  AbstractClassicSolver.prototype.l1v = get_warnings;
+  ClassicExecutionContext.prototype.s1u = createSolver$default;
+  ClassicExecutionContext.prototype.a1v = createMutableSolver$default;
+  ClassicExecutionContext.prototype.d1v = update$default;
+  ClassicExecutionContext.prototype.f1v = get_standardInput;
+  ClassicExecutionContext.prototype.h1v = get_standardOutput;
+  ClassicExecutionContext.prototype.j1v = get_standardError;
+  ClassicExecutionContext.prototype.l1v = get_warnings;
+  ClassicExecutionContext.prototype.j1u = get_endTime;
+  ClassicExecutionContext.prototype.l1u = get_remainingTime;
+  ClassicExecutionContext.prototype.m1u = get_elapsedTime;
+  ClassicSolver.prototype.u1x = copy$default;
   ClassicSolver.prototype.solveWithTimeout = solveWithTimeout;
   ClassicSolver.prototype.solve = solve;
   ClassicSolver.prototype.solveListWithTimeout = solveListWithTimeout;
@@ -3217,29 +3217,29 @@
   ClassicSolver.prototype.solveOnceWithTimeout = solveOnceWithTimeout;
   ClassicSolver.prototype.solveOnce = solveOnce;
   ClassicSolver.prototype.solveOnceWithOptions = solveOnceWithOptions;
-  ClassicSolver.prototype.i1v = get_standardInput;
-  ClassicSolver.prototype.k1v = get_standardOutput;
-  ClassicSolver.prototype.m1v = get_standardError;
-  ClassicSolver.prototype.o1v = get_warnings;
-  ClassicSolverFactory.prototype.u1y = solverOf$default;
-  ClassicSolverFactory.prototype.w1y = solverOf$default_0;
-  ClassicSolverFactory.prototype.a1z = mutableSolverOf$default;
-  ClassicSolverFactory.prototype.e1z = mutableSolverOf$default_0;
+  ClassicSolver.prototype.f1v = get_standardInput;
+  ClassicSolver.prototype.h1v = get_standardOutput;
+  ClassicSolver.prototype.j1v = get_standardError;
+  ClassicSolver.prototype.l1v = get_warnings;
+  ClassicSolverFactory.prototype.r1y = solverOf$default;
+  ClassicSolverFactory.prototype.t1y = solverOf$default_0;
+  ClassicSolverFactory.prototype.x1y = mutableSolverOf$default;
+  ClassicSolverFactory.prototype.b1z = mutableSolverOf$default_0;
   ClassicSolverFactory.prototype.newBuilder = newBuilder;
-  ClassicSolverFactory.prototype.c1y = get_defaultRuntime;
-  ClassicSolverFactory.prototype.e1y = get_defaultUnificator;
-  ClassicSolverFactory.prototype.f1y = get_defaultFlags;
-  ClassicSolverFactory.prototype.i1y = get_defaultStaticKb;
-  ClassicSolverFactory.prototype.j1y = get_defaultDynamicKb;
-  ClassicSolverFactory.prototype.k1y = get_defaultInputChannel;
-  ClassicSolverFactory.prototype.l1y = get_defaultOutputChannel;
-  ClassicSolverFactory.prototype.m1y = get_defaultErrorChannel;
-  ClassicSolverFactory.prototype.n1y = get_defaultWarningsChannel;
-  ClassicSolverFactory.prototype.x1y = solverWithDefaultBuiltins;
-  ClassicSolverFactory.prototype.y1y = solverWithDefaultBuiltins$default;
-  ClassicSolverFactory.prototype.b1z = mutableSolverWithDefaultBuiltins;
-  ClassicSolverFactory.prototype.c1z = mutableSolverWithDefaultBuiltins$default;
-  MutableClassicSolver.prototype.x1x = copy$default;
+  ClassicSolverFactory.prototype.z1x = get_defaultRuntime;
+  ClassicSolverFactory.prototype.b1y = get_defaultUnificator;
+  ClassicSolverFactory.prototype.c1y = get_defaultFlags;
+  ClassicSolverFactory.prototype.f1y = get_defaultStaticKb;
+  ClassicSolverFactory.prototype.g1y = get_defaultDynamicKb;
+  ClassicSolverFactory.prototype.h1y = get_defaultInputChannel;
+  ClassicSolverFactory.prototype.i1y = get_defaultOutputChannel;
+  ClassicSolverFactory.prototype.j1y = get_defaultErrorChannel;
+  ClassicSolverFactory.prototype.k1y = get_defaultWarningsChannel;
+  ClassicSolverFactory.prototype.u1y = solverWithDefaultBuiltins;
+  ClassicSolverFactory.prototype.v1y = solverWithDefaultBuiltins$default;
+  ClassicSolverFactory.prototype.y1y = mutableSolverWithDefaultBuiltins;
+  ClassicSolverFactory.prototype.z1y = mutableSolverWithDefaultBuiltins$default;
+  MutableClassicSolver.prototype.u1x = copy$default;
   MutableClassicSolver.prototype.solveWithTimeout = solveWithTimeout;
   MutableClassicSolver.prototype.solve = solve;
   MutableClassicSolver.prototype.solveListWithTimeout = solveListWithTimeout;
@@ -3248,60 +3248,60 @@
   MutableClassicSolver.prototype.solveOnceWithTimeout = solveOnceWithTimeout;
   MutableClassicSolver.prototype.solveOnce = solveOnce;
   MutableClassicSolver.prototype.solveOnceWithOptions = solveOnceWithOptions;
-  MutableClassicSolver.prototype.i1v = get_standardInput;
-  MutableClassicSolver.prototype.k1v = get_standardOutput;
-  MutableClassicSolver.prototype.m1v = get_standardError;
-  MutableClassicSolver.prototype.o1v = get_warnings;
+  MutableClassicSolver.prototype.f1v = get_standardInput;
+  MutableClassicSolver.prototype.h1v = get_standardOutput;
+  MutableClassicSolver.prototype.j1v = get_standardError;
+  MutableClassicSolver.prototype.l1v = get_warnings;
   MutableClassicSolver.prototype.loadStaticClauses = loadStaticClauses;
   MutableClassicSolver.prototype.loadStaticClausesIterable = loadStaticClausesIterable;
   MutableClassicSolver.prototype.loadStaticClausesSequence = loadStaticClausesSequence;
   MutableClassicSolver.prototype.loadDynamicClauses = loadDynamicClauses;
   MutableClassicSolver.prototype.loadDynamicClausesIterable = loadDynamicClausesIterable;
   MutableClassicSolver.prototype.loadDynamicClausesSequence = loadDynamicClausesSequence;
-  AbstractState.prototype.g38 = get_isEndState;
+  AbstractState.prototype.d38 = get_isEndState;
   AbstractState.prototype.asEndState = asEndState;
   AbstractState.prototype.castToEndState = castToEndState;
-  AbstractEndState.prototype.j35 = get_hasOpenAlternatives;
-  AbstractEndState.prototype.g38 = get_isEndState_0;
-  AbstractEndState.prototype.h38 = asEndState_0;
+  AbstractEndState.prototype.g35 = get_hasOpenAlternatives;
+  AbstractEndState.prototype.d38 = get_isEndState_0;
+  AbstractEndState.prototype.e38 = asEndState_0;
   AbstractEndState.prototype.castToEndState = castToEndState;
-  StateBacktracking.prototype.g38 = get_isEndState;
+  StateBacktracking.prototype.d38 = get_isEndState;
   StateBacktracking.prototype.asEndState = asEndState;
   StateBacktracking.prototype.castToEndState = castToEndState;
-  StateEnd.prototype.j35 = get_hasOpenAlternatives;
-  StateEnd.prototype.g38 = get_isEndState_0;
-  StateEnd.prototype.h38 = asEndState_0;
+  StateEnd.prototype.g35 = get_hasOpenAlternatives;
+  StateEnd.prototype.d38 = get_isEndState_0;
+  StateEnd.prototype.e38 = asEndState_0;
   StateEnd.prototype.castToEndState = castToEndState;
-  StateException.prototype.g38 = get_isEndState;
+  StateException.prototype.d38 = get_isEndState;
   StateException.prototype.asEndState = asEndState;
   StateException.prototype.castToEndState = castToEndState;
-  StateGoalSelection.prototype.g38 = get_isEndState;
+  StateGoalSelection.prototype.d38 = get_isEndState;
   StateGoalSelection.prototype.asEndState = asEndState;
   StateGoalSelection.prototype.castToEndState = castToEndState;
-  StateHalt.prototype.g38 = get_isEndState_0;
-  StateHalt.prototype.h38 = asEndState_0;
+  StateHalt.prototype.d38 = get_isEndState_0;
+  StateHalt.prototype.e38 = asEndState_0;
   StateHalt.prototype.castToEndState = castToEndState;
-  StateHalt.prototype.j35 = get_hasOpenAlternatives;
-  StateInit.prototype.g38 = get_isEndState;
+  StateHalt.prototype.g35 = get_hasOpenAlternatives;
+  StateInit.prototype.d38 = get_isEndState;
   StateInit.prototype.asEndState = asEndState;
   StateInit.prototype.castToEndState = castToEndState;
-  StatePrimitiveExecution.prototype.g38 = get_isEndState;
+  StatePrimitiveExecution.prototype.d38 = get_isEndState;
   StatePrimitiveExecution.prototype.asEndState = asEndState;
   StatePrimitiveExecution.prototype.castToEndState = castToEndState;
-  StatePrimitiveSelection.prototype.g38 = get_isEndState;
+  StatePrimitiveSelection.prototype.d38 = get_isEndState;
   StatePrimitiveSelection.prototype.asEndState = asEndState;
   StatePrimitiveSelection.prototype.castToEndState = castToEndState;
-  StateRuleExecution.prototype.g38 = get_isEndState;
+  StateRuleExecution.prototype.d38 = get_isEndState;
   StateRuleExecution.prototype.asEndState = asEndState;
   StateRuleExecution.prototype.castToEndState = castToEndState;
-  StateRuleSelection.prototype.g38 = get_isEndState;
+  StateRuleSelection.prototype.d38 = get_isEndState;
   StateRuleSelection.prototype.asEndState = asEndState;
   StateRuleSelection.prototype.castToEndState = castToEndState;
   DefaultBuiltins.prototype.containsSignature = containsSignature;
   DefaultBuiltins.prototype.containsOperator = containsOperator;
   DefaultBuiltins.prototype.hasPrimitive = hasPrimitive;
   DefaultBuiltins.prototype.hasFunction = hasFunction;
-  DefaultBuiltins.prototype.p2e = get_ruleSignatures;
+  DefaultBuiltins.prototype.m2e = get_ruleSignatures;
   DefaultBuiltins.prototype.hasProtected = hasProtected;
   //endregion
   //region block: exports