@tuprolog/2p-full 1.4.1 → 1.5.0

package/2p-solve-classic.js

@@ -44,14 +44,14 @@
   var constructCallableReference = kotlin_kotlin.$_$.r5;
   var AbstractSolver = kotlin_it_unibo_tuprolog_solve.$_$.u1;
   var protoOf = kotlin_kotlin.$_$.p6;
-  var THROW_CCE = kotlin_kotlin.$_$.na;
+  var THROW_CCE = kotlin_kotlin.$_$.oa;
   var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.q4;
   var getAllOperators = kotlin_it_unibo_tuprolog_solve.$_$.c4;
   var toOperatorSet = kotlin_it_unibo_tuprolog_solve.$_$.e4;
   var currentTimeInstant = kotlin_it_unibo_tuprolog_solve.$_$.a4;
   var asSequence = kotlin_kotlin.$_$.m7;
   var initMetadataForClass = kotlin_kotlin.$_$.a6;
-  var ensureNotNull = kotlin_kotlin.$_$.ra;
+  var ensureNotNull = kotlin_kotlin.$_$.sa;
   var fromInt = kotlin_kotlin.$_$.y4;
   var add = kotlin_kotlin.$_$.t4;
   var hashCode = kotlin_kotlin.$_$.z5;
@@ -61,7 +61,7 @@
   var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.o4;
   var initMetadataForLambda = kotlin_kotlin.$_$.e6;
   var sequence = kotlin_kotlin.$_$.p8;
-  var toString_0 = kotlin_kotlin.$_$.xa;
+  var toString_0 = kotlin_kotlin.$_$.ya;
   var asSequence_0 = kotlin_kotlin.$_$.a2;
   var emptySequence = kotlin_kotlin.$_$.r7;
   var plus = kotlin_kotlin.$_$.l8;
@@ -79,7 +79,7 @@
   var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.r;
   var Companion_instance_7 = kotlin_it_unibo_tuprolog_utils.$_$.c;
   var emptySet = kotlin_kotlin.$_$.n2;
-  var lazy = kotlin_kotlin.$_$.ta;
+  var lazy = kotlin_kotlin.$_$.ua;
   var contains = kotlin_kotlin.$_$.n7;
   var createSolver = kotlin_it_unibo_tuprolog_solve.$_$.z;
   var createMutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.y;
@@ -120,7 +120,7 @@
   var defineProp = kotlin_kotlin.$_$.s5;
   var listOf = kotlin_kotlin.$_$.b3;
   var getAllOperators_0 = kotlin_it_unibo_tuprolog_solve.$_$.d4;
-  var to = kotlin_kotlin.$_$.ya;
+  var to = kotlin_kotlin.$_$.za;
   var loadStaticClauses = kotlin_it_unibo_tuprolog_solve.$_$.v2;
   var loadStaticClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.w2;
   var loadStaticClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.x2;
@@ -206,20 +206,20 @@
     var tmp0_elvis_lhs = this.asEndState();
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(EndState).b9());
+      throw ClassCastException_init_$Create$('Cannot cast ' + toString(this) + ' to ' + getKClass(EndState).c9());
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   }
   function clone(context, $super) {
-    context = context === VOID ? this.h8() : context;
-    return $super === VOID ? this.i32(context) : $super.i32.call(this, context);
+    context = context === VOID ? this.i8() : context;
+    return $super === VOID ? this.l32(context) : $super.l32.call(this, context);
   }
   initMetadataForInterface(State, 'State');
   initMetadataForClass(AbstractState, 'AbstractState', VOID, VOID, [State]);
   function get_hasOpenAlternatives() {
-    return this.j2h().r1v() && this.h8().d2z();
+    return this.m2h().u1v() && this.i8().g2z();
   }
   function get_isEndState_0() {
     return true;
@@ -228,7 +228,7 @@
     return this;
   }
   function asEndState_1() {
-    return this.h32();
+    return this.k32();
   }
   initMetadataForInterface(EndState, 'EndState', VOID, VOID, [State]);
   initMetadataForClass(AbstractEndState, 'AbstractEndState', VOID, AbstractState, [EndState]);
@@ -260,7 +260,7 @@
   initMetadataForCompanion(Companion_1);
   //endregion
   function AbstractClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -270,17 +270,17 @@
     stdErr = stdErr === VOID ? Companion_instance_3.stdErr() : stdErr;
     warnings = warnings === VOID ? Companion_instance_3.warning() : warnings;
     trustKb = trustKb === VOID ? false : trustKb;
-    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.n1x(stdIn), Companion_instance_5.q1x(stdOut, stdErr, warnings), trustKb);
+    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.q1x(stdIn), Companion_instance_5.t1x(stdOut, stdErr, warnings), trustKb);
     return $this;
   }
   function updateCurrentContextAfterStateTransition($this, source, destination, index) {
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(destination.h8().z2x_1 === index)) {
+    if (!(destination.i8().c2y_1 === index)) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    $this.g2y(destination.h8());
+    $this.j2y(destination.i8());
   }
   function AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(p0) {
     return constructCallableReference(function (p0_0, p1, p2) {
@@ -290,7 +290,7 @@
     }, 3, 0, 83, 'updateCurrentContextAfterStateTransition', [p0]);
   }
   function AbstractClassicSolver(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     initialStaticKb = initialStaticKb === VOID ? Companion_instance_0.empty(unificator) : initialStaticKb;
@@ -300,101 +300,101 @@
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractSolver.call(this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
   }
-  protoOf(AbstractClassicSolver).g2y = function (_set____db54di) {
-    this.f2y_1 = _set____db54di;
+  protoOf(AbstractClassicSolver).j2y = function (_set____db54di) {
+    this.i2y_1 = _set____db54di;
   };
-  protoOf(AbstractClassicSolver).g2a = function (_set____db54di) {
-    return this.g2y(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
+  protoOf(AbstractClassicSolver).j2a = function (_set____db54di) {
+    return this.j2y(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
   };
-  protoOf(AbstractClassicSolver).e2a = function () {
-    var tmp = this.f2y_1;
+  protoOf(AbstractClassicSolver).h2a = function () {
+    var tmp = this.i2y_1;
     if (!(tmp == null))
       return tmp;
     else {
       throwUninitializedPropertyAccessException('currentContext');
     }
   };
-  protoOf(AbstractClassicSolver).f2a = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
+  protoOf(AbstractClassicSolver).i2a = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
     return new ClassicExecutionContext(VOID, unificator, libraries, flags, trustKb ? staticKb.toImmutableTheory() : Companion_instance_0.empty(unificator), trustKb ? dynamicKb.toMutableTheory() : Companion_instance_1.empty(unificator), toOperatorSet(getAllOperators(libraries, [])), inputChannels, outputChannels, VOID, VOID, VOID, VOID, VOID, VOID, 0n);
   };
-  protoOf(AbstractClassicSolver).m2a = function (goal, options) {
-    var tmp0_unificator = this.r1k();
-    var tmp1_libraries = this.o1u();
-    var tmp2_flags = this.p1u();
-    var tmp3_staticKb = this.q1u().toImmutableTheory();
-    var tmp4_dynamicKb = this.r1u().toMutableTheory();
-    var tmp5_operators = this.x1u();
-    var tmp6_inputChannels = this.s1u();
-    var tmp7_outputChannels = this.t1u();
-    var tmp8_customData = this.e2a().o2x_1;
+  protoOf(AbstractClassicSolver).p2a = function (goal, options) {
+    var tmp0_unificator = this.u1k();
+    var tmp1_libraries = this.r1u();
+    var tmp2_flags = this.s1u();
+    var tmp3_staticKb = this.t1u().toImmutableTheory();
+    var tmp4_dynamicKb = this.u1u().toMutableTheory();
+    var tmp5_operators = this.a1v();
+    var tmp6_inputChannels = this.v1u();
+    var tmp7_outputChannels = this.w1u();
+    var tmp8_customData = this.h2a().r2x_1;
     var tmp9_startTime = currentTimeInstant();
-    var tmp10_maxDuration = options.v1w();
-    this.g2y(new ClassicExecutionContext(VOID, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, VOID, goal, VOID, VOID, VOID, tmp9_startTime, tmp10_maxDuration));
-    var tmp = new StateInit(this.e2a());
-    return asSequence(this.h2y(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
+    var tmp10_maxDuration = options.y1w();
+    this.j2y(new ClassicExecutionContext(VOID, tmp0_unificator, tmp1_libraries, tmp2_flags, tmp3_staticKb, tmp4_dynamicKb, tmp5_operators, tmp6_inputChannels, tmp7_outputChannels, tmp8_customData, VOID, goal, VOID, VOID, VOID, tmp9_startTime, tmp10_maxDuration));
+    var tmp = new StateInit(this.h2a());
+    return asSequence(this.k2y(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
   };
   protoOf(AbstractClassicSolver).copy = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.copy(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof AbstractClassicSolver) ? $super : THROW_CCE());
   };
   function Primitives(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.m2y_1 = alternatives;
-    this.n2y_1 = executionContext;
-    this.o2y_1 = parent;
-    this.p2y_1 = depth;
+    this.p2y_1 = alternatives;
+    this.q2y_1 = executionContext;
+    this.r2y_1 = parent;
+    this.s2y_1 = depth;
   }
-  protoOf(Primitives).q2y = function () {
-    return this.m2y_1;
+  protoOf(Primitives).t2y = function () {
+    return this.p2y_1;
   };
-  protoOf(Primitives).r2y = function () {
-    return this.n2y_1;
+  protoOf(Primitives).u2y = function () {
+    return this.q2y_1;
   };
-  protoOf(Primitives).s2y = function () {
-    return this.o2y_1;
+  protoOf(Primitives).v2y = function () {
+    return this.r2y_1;
   };
-  protoOf(Primitives).t2y = function () {
-    return this.p2y_1;
+  protoOf(Primitives).w2y = function () {
+    return this.s2y_1;
   };
   protoOf(Primitives).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Primitives).u2y = function () {
+  protoOf(Primitives).x2y = function () {
     return 'Primitives';
   };
-  protoOf(Primitives).v2y = function (context) {
-    var tmp0_$this = ensureNotNull(this.n2y_1);
-    var tmp1_primitives = this.m2y_1;
+  protoOf(Primitives).y2y = function (context) {
+    var tmp0_$this = ensureNotNull(this.q2y_1);
+    var tmp1_primitives = this.p2y_1;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = context.z2x_1;
+    var this_0 = context.c2y_1;
     var tmp2_step = add(this_0, fromInt(1));
-    var tmp3_startTime = context.u2x_1;
-    var tmp4_flags = context.i2x_1;
-    var tmp5_dynamicKb = context.k2x_1;
-    var tmp6_staticKb = context.j2x_1;
-    var tmp7_operators = context.l2x_1;
-    var tmp8_inputChannels = context.m2x_1;
-    var tmp9_outputChannels = context.n2x_1;
-    var tmp10_libraries = context.h2x_1;
-    var tmp11_customData = context.o2x_1.discardEphemeral();
-    var tempContext = tmp0_$this.w2y(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, VOID, tmp1_primitives, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
-    var nextChoicePointContext = this.x2y(this.m2y_1.hp(), tempContext);
-    return tempContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Primitives).y2y = function (alternatives, executionContext, parent, depth) {
+    var tmp3_startTime = context.x2x_1;
+    var tmp4_flags = context.l2x_1;
+    var tmp5_dynamicKb = context.n2x_1;
+    var tmp6_staticKb = context.m2x_1;
+    var tmp7_operators = context.o2x_1;
+    var tmp8_inputChannels = context.p2x_1;
+    var tmp9_outputChannels = context.q2x_1;
+    var tmp10_libraries = context.k2x_1;
+    var tmp11_customData = context.r2x_1.discardEphemeral();
+    var tempContext = tmp0_$this.z2y(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, VOID, tmp1_primitives, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
+    var nextChoicePointContext = this.a2z(this.p2y_1.kp(), tempContext);
+    return tempContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Primitives).b2z = function (alternatives, executionContext, parent, depth) {
     return new Primitives(alternatives, executionContext, parent, depth);
   };
-  protoOf(Primitives).x2y = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.m2y_1 : alternatives;
-    executionContext = executionContext === VOID ? this.n2y_1 : executionContext;
-    parent = parent === VOID ? this.o2y_1 : parent;
-    depth = depth === VOID ? this.p2y_1 : depth;
-    return $super === VOID ? this.y2y(alternatives, executionContext, parent, depth) : $super.y2y.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Primitives).a2z = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.p2y_1 : alternatives;
+    executionContext = executionContext === VOID ? this.q2y_1 : executionContext;
+    parent = parent === VOID ? this.r2y_1 : parent;
+    depth = depth === VOID ? this.s2y_1 : depth;
+    return $super === VOID ? this.b2z(alternatives, executionContext, parent, depth) : $super.b2z.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Primitives).hashCode = function () {
-    var result = hashCode(this.m2y_1);
-    result = imul(result, 31) + (this.n2y_1 == null ? 0 : this.n2y_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.o2y_1 == null ? 0 : hashCode(this.o2y_1)) | 0;
-    result = imul(result, 31) + this.p2y_1 | 0;
+    var result = hashCode(this.p2y_1);
+    result = imul(result, 31) + (this.q2y_1 == null ? 0 : this.q2y_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.r2y_1 == null ? 0 : hashCode(this.r2y_1)) | 0;
+    result = imul(result, 31) + this.s2y_1 | 0;
     return result;
   };
   protoOf(Primitives).equals = function (other) {
@@ -402,75 +402,75 @@
       return true;
     if (!(other instanceof Primitives))
       return false;
-    if (!equals(this.m2y_1, other.m2y_1))
+    if (!equals(this.p2y_1, other.p2y_1))
       return false;
-    if (!equals(this.n2y_1, other.n2y_1))
+    if (!equals(this.q2y_1, other.q2y_1))
       return false;
-    if (!equals(this.o2y_1, other.o2y_1))
+    if (!equals(this.r2y_1, other.r2y_1))
       return false;
-    if (!(this.p2y_1 === other.p2y_1))
+    if (!(this.s2y_1 === other.s2y_1))
       return false;
     return true;
   };
   function Rules(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.l2z_1 = alternatives;
-    this.m2z_1 = executionContext;
-    this.n2z_1 = parent;
-    this.o2z_1 = depth;
+    this.o2z_1 = alternatives;
+    this.p2z_1 = executionContext;
+    this.q2z_1 = parent;
+    this.r2z_1 = depth;
   }
-  protoOf(Rules).q2y = function () {
-    return this.l2z_1;
+  protoOf(Rules).t2y = function () {
+    return this.o2z_1;
   };
-  protoOf(Rules).r2y = function () {
-    return this.m2z_1;
+  protoOf(Rules).u2y = function () {
+    return this.p2z_1;
   };
-  protoOf(Rules).s2y = function () {
-    return this.n2z_1;
+  protoOf(Rules).v2y = function () {
+    return this.q2z_1;
   };
-  protoOf(Rules).t2y = function () {
-    return this.o2z_1;
+  protoOf(Rules).w2y = function () {
+    return this.r2z_1;
   };
   protoOf(Rules).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Rules).u2y = function () {
+  protoOf(Rules).x2y = function () {
     return 'Rules';
   };
-  protoOf(Rules).v2y = function (context) {
-    var tmp0_$this = ensureNotNull(this.m2z_1);
-    var tmp1_rules = this.l2z_1;
+  protoOf(Rules).y2y = function (context) {
+    var tmp0_$this = ensureNotNull(this.p2z_1);
+    var tmp1_rules = this.o2z_1;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = context.z2x_1;
+    var this_0 = context.c2y_1;
     var tmp2_step = add(this_0, fromInt(1));
-    var tmp3_startTime = context.u2x_1;
-    var tmp4_flags = context.i2x_1;
-    var tmp5_dynamicKb = context.k2x_1;
-    var tmp6_staticKb = context.j2x_1;
-    var tmp7_operators = context.l2x_1;
-    var tmp8_inputChannels = context.m2x_1;
-    var tmp9_outputChannels = context.n2x_1;
-    var tmp10_libraries = context.h2x_1;
-    var tmp11_customData = context.o2x_1.discardEphemeral();
-    var tempContext = tmp0_$this.w2y(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, tmp1_rules, VOID, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
-    var nextChoicePointContext = this.p2z(this.l2z_1.hp(), tempContext);
-    return tempContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Rules).q2z = function (alternatives, executionContext, parent, depth) {
+    var tmp3_startTime = context.x2x_1;
+    var tmp4_flags = context.l2x_1;
+    var tmp5_dynamicKb = context.n2x_1;
+    var tmp6_staticKb = context.m2x_1;
+    var tmp7_operators = context.o2x_1;
+    var tmp8_inputChannels = context.p2x_1;
+    var tmp9_outputChannels = context.q2x_1;
+    var tmp10_libraries = context.k2x_1;
+    var tmp11_customData = context.r2x_1.discardEphemeral();
+    var tempContext = tmp0_$this.z2y(VOID, VOID, tmp10_libraries, tmp4_flags, tmp6_staticKb, tmp5_dynamicKb, tmp7_operators, tmp8_inputChannels, tmp9_outputChannels, tmp11_customData, VOID, VOID, VOID, tmp1_rules, VOID, tmp3_startTime, VOID, VOID, VOID, VOID, tmp2_step);
+    var nextChoicePointContext = this.s2z(this.o2z_1.kp(), tempContext);
+    return tempContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Rules).t2z = function (alternatives, executionContext, parent, depth) {
     return new Rules(alternatives, executionContext, parent, depth);
   };
-  protoOf(Rules).p2z = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.l2z_1 : alternatives;
-    executionContext = executionContext === VOID ? this.m2z_1 : executionContext;
-    parent = parent === VOID ? this.n2z_1 : parent;
-    depth = depth === VOID ? this.o2z_1 : depth;
-    return $super === VOID ? this.q2z(alternatives, executionContext, parent, depth) : $super.q2z.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Rules).s2z = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.o2z_1 : alternatives;
+    executionContext = executionContext === VOID ? this.p2z_1 : executionContext;
+    parent = parent === VOID ? this.q2z_1 : parent;
+    depth = depth === VOID ? this.r2z_1 : depth;
+    return $super === VOID ? this.t2z(alternatives, executionContext, parent, depth) : $super.t2z.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Rules).hashCode = function () {
-    var result = hashCode(this.l2z_1);
-    result = imul(result, 31) + (this.m2z_1 == null ? 0 : this.m2z_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.n2z_1 == null ? 0 : hashCode(this.n2z_1)) | 0;
-    result = imul(result, 31) + this.o2z_1 | 0;
+    var result = hashCode(this.o2z_1);
+    result = imul(result, 31) + (this.p2z_1 == null ? 0 : this.p2z_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.q2z_1 == null ? 0 : hashCode(this.q2z_1)) | 0;
+    result = imul(result, 31) + this.r2z_1 | 0;
     return result;
   };
   protoOf(Rules).equals = function (other) {
@@ -478,112 +478,112 @@
       return true;
     if (!(other instanceof Rules))
       return false;
-    if (!equals(this.l2z_1, other.l2z_1))
+    if (!equals(this.o2z_1, other.o2z_1))
       return false;
-    if (!equals(this.m2z_1, other.m2z_1))
+    if (!equals(this.p2z_1, other.p2z_1))
       return false;
-    if (!equals(this.n2z_1, other.n2z_1))
+    if (!equals(this.q2z_1, other.q2z_1))
       return false;
-    if (!(this.o2z_1 === other.o2z_1))
+    if (!(this.r2z_1 === other.r2z_1))
       return false;
     return true;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation) {
-    this.z2z_1 = this$0;
+    this.c30_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).c30 = function ($this$sequence, $completion) {
-    var tmp = this.d30($this$sequence, $completion);
-    tmp.d8_1 = Unit_instance;
-    tmp.e8_1 = null;
-    return tmp.j8();
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).f30 = function ($this$sequence, $completion) {
+    var tmp = this.g30($this$sequence, $completion);
+    tmp.e8_1 = Unit_instance;
+    tmp.f8_1 = null;
+    return tmp.k8();
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).a9 = function (p1, $completion) {
-    return this.c30(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).b9 = function (p1, $completion) {
+    return this.f30(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).j8 = function () {
-    var suspendResult = this.d8_1;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).k8 = function () {
+    var suspendResult = this.e8_1;
     $sm: do
       try {
-        var tmp = this.b8_1;
+        var tmp = this.c8_1;
         switch (tmp) {
           case 0:
-            this.c8_1 = 4;
-            this.b30_1 = this.z2z_1;
-            this.b8_1 = 1;
+            this.d8_1 = 4;
+            this.e30_1 = this.c30_1;
+            this.c8_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.b30_1 == null)) {
-              this.b8_1 = 3;
+            if (!!(this.e30_1 == null)) {
+              this.c8_1 = 3;
               continue $sm;
             }
 
-            this.b8_1 = 2;
-            suspendResult = this.a30_1.bd(ensureNotNull(this.b30_1), this);
+            this.c8_1 = 2;
+            suspendResult = this.d30_1.cd(ensureNotNull(this.e30_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.b30_1 = this.b30_1.s2y();
-            this.b8_1 = 1;
+            this.e30_1 = this.e30_1.v2y();
+            this.c8_1 = 1;
             continue $sm;
           case 3:
             return Unit_instance;
           case 4:
-            throw this.e8_1;
+            throw this.f8_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.c8_1 === 4) {
+        if (this.d8_1 === 4) {
           throw e;
         } else {
-          this.b8_1 = this.c8_1;
-          this.e8_1 = e;
+          this.c8_1 = this.d8_1;
+          this.f8_1 = e;
         }
       }
      while (true);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).d30 = function ($this$sequence, completion) {
-    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.z2z_1, completion);
-    i.a30_1 = $this$sequence;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).g30 = function ($this$sequence, completion) {
+    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.c30_1, completion);
+    i.d30_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);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.c30($this$sequence, $completion);
+      return i.f30($this$sequence, $completion);
     }, 1);
   }
   function ChoicePointContext(alternatives, executionContext, parent, depth) {
     depth = depth === VOID ? 0 : depth;
-    this.z2y_1 = alternatives;
-    this.a2z_1 = executionContext;
-    this.b2z_1 = parent;
-    this.c2z_1 = depth;
+    this.c2z_1 = alternatives;
+    this.d2z_1 = executionContext;
+    this.e2z_1 = parent;
+    this.f2z_1 = depth;
   }
-  protoOf(ChoicePointContext).q2y = function () {
-    return this.z2y_1;
+  protoOf(ChoicePointContext).t2y = function () {
+    return this.c2z_1;
   };
-  protoOf(ChoicePointContext).r2y = function () {
-    return this.a2z_1;
+  protoOf(ChoicePointContext).u2y = function () {
+    return this.d2z_1;
   };
-  protoOf(ChoicePointContext).s2y = function () {
-    return this.b2z_1;
+  protoOf(ChoicePointContext).v2y = function () {
+    return this.e2z_1;
   };
-  protoOf(ChoicePointContext).t2y = function () {
-    return this.c2z_1;
+  protoOf(ChoicePointContext).w2y = function () {
+    return this.f2z_1;
   };
-  protoOf(ChoicePointContext).d2z = function () {
-    var tmp0 = this.e2z();
+  protoOf(ChoicePointContext).g2z = function () {
+    var tmp0 = this.h2z();
     var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.sequences.any' call
       var _iterator__ex2g4s = tmp0.n();
       while (_iterator__ex2g4s.q()) {
         var element = _iterator__ex2g4s.r();
-        if (element.q2y().jp()) {
+        if (element.t2y().mp()) {
           tmp$ret$0 = true;
           break $l$block;
         }
@@ -592,135 +592,135 @@
     }
     return tmp$ret$0;
   };
-  protoOf(ChoicePointContext).e2z = function () {
+  protoOf(ChoicePointContext).h2z = function () {
     return sequence(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this, null));
   };
-  protoOf(ChoicePointContext).f2z = function () {
-    var tmp0_safe_receiver = this.r2y();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2x_1;
+  protoOf(ChoicePointContext).i2z = function () {
+    var tmp0_safe_receiver = this.u2y();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2y_1;
   };
-  protoOf(ChoicePointContext).g2z = function () {
-    var tmp0_safe_receiver = this.r2y();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f2x_1;
+  protoOf(ChoicePointContext).j2z = function () {
+    var tmp0_safe_receiver = this.u2y();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i2x_1;
   };
   protoOf(ChoicePointContext).toString = function () {
-    var tmp = this.u2y() + '(' + ('alternatives=' + toString(this.q2y()) + ', ');
+    var tmp = this.x2y() + '(' + ('alternatives=' + toString(this.t2y()) + ', ');
     var tmp_0;
-    if (this.r2y() === null) {
-      tmp_0 = 'executionContext=' + toString_0(this.r2y()) + ', ';
+    if (this.u2y() === null) {
+      tmp_0 = 'executionContext=' + toString_0(this.u2y()) + ', ';
     } else {
-      'executionContextDepth=' + this.f2z() + ', ';
-      tmp_0 = 'executionContextProcedure=' + toString_0(this.g2z()) + ', ';
+      'executionContextDepth=' + this.i2z() + ', ';
+      tmp_0 = 'executionContextProcedure=' + toString_0(this.j2z()) + ', ';
     }
-    return tmp + tmp_0 + ('depth=' + this.t2y()) + ')';
+    return tmp + tmp_0 + ('depth=' + this.w2y()) + ')';
   };
   function appendRules(_this__u8e3s4, alternatives, executionContext) {
     executionContext = executionContext === VOID ? null : executionContext;
     return new Rules(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
   }
   function nextDepth(_this__u8e3s4) {
-    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.t2y() + 1 | 0;
+    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.w2y() + 1 | 0;
   }
   function appendPrimitives(_this__u8e3s4, alternatives, executionContext) {
     executionContext = executionContext === VOID ? null : executionContext;
     return new Primitives(alternatives, executionContext, _this__u8e3s4, nextDepth(_this__u8e3s4));
   }
   function _get_locallyInterestingVariables__39cqti($this) {
-    var tmp = asSequence_0($this.a2y_1);
-    var tmp0_safe_receiver = $this.r2x_1.ip();
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zt();
+    var tmp = asSequence_0($this.d2y_1);
+    var tmp0_safe_receiver = $this.u2x_1.lp();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.cu();
     return plus(tmp, tmp1_elvis_lhs == null ? emptySequence() : tmp1_elvis_lhs);
   }
   function _get_interestingVariables__k6uw5o($this) {
-    var tmp0 = $this.d2y_1;
+    var tmp0 = $this.g2y_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('interestingVariables', 1, tmp, ClassicExecutionContext$_get_interestingVariables_$ref_xwa4zu(), null);
-    return tmp0.e2();
+    return tmp0.f2();
   }
   function ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation) {
-    this.m30_1 = this$0;
+    this.p30_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).p30 = function ($this$sequence, $completion) {
-    var tmp = this.q30($this$sequence, $completion);
-    tmp.d8_1 = Unit_instance;
-    tmp.e8_1 = null;
-    return tmp.j8();
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).s30 = function ($this$sequence, $completion) {
+    var tmp = this.t30($this$sequence, $completion);
+    tmp.e8_1 = Unit_instance;
+    tmp.f8_1 = null;
+    return tmp.k8();
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).a9 = function (p1, $completion) {
-    return this.p30(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).b9 = function (p1, $completion) {
+    return this.s30(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).j8 = function () {
-    var suspendResult = this.d8_1;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).k8 = function () {
+    var suspendResult = this.e8_1;
     $sm: do
       try {
-        var tmp = this.b8_1;
+        var tmp = this.c8_1;
         switch (tmp) {
           case 0:
-            this.c8_1 = 4;
-            this.o30_1 = this.m30_1;
-            this.b8_1 = 1;
+            this.d8_1 = 4;
+            this.r30_1 = this.p30_1;
+            this.c8_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.o30_1 == null)) {
-              this.b8_1 = 3;
+            if (!!(this.r30_1 == null)) {
+              this.c8_1 = 3;
               continue $sm;
             }
 
-            this.b8_1 = 2;
-            suspendResult = this.n30_1.bd(this.o30_1, this);
+            this.c8_1 = 2;
+            suspendResult = this.q30_1.cd(this.r30_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.o30_1 = this.o30_1.x2x_1;
-            this.b8_1 = 1;
+            this.r30_1 = this.r30_1.a2y_1;
+            this.c8_1 = 1;
             continue $sm;
           case 3:
             return Unit_instance;
           case 4:
-            throw this.e8_1;
+            throw this.f8_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.c8_1 === 4) {
+        if (this.d8_1 === 4) {
           throw e;
         } else {
-          this.b8_1 = this.c8_1;
-          this.e8_1 = e;
+          this.c8_1 = this.d8_1;
+          this.f8_1 = e;
         }
       }
      while (true);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).q30 = function ($this$sequence, completion) {
-    var i = new ClassicExecutionContext$pathToRoot$slambda(this.m30_1, completion);
-    i.n30_1 = $this$sequence;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).t30 = function ($this$sequence, completion) {
+    var i = new ClassicExecutionContext$pathToRoot$slambda(this.p30_1, completion);
+    i.q30_1 = $this$sequence;
     return i;
   };
   function ClassicExecutionContext$pathToRoot$slambda_0(this$0, resultContinuation) {
     var i = new ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.p30($this$sequence, $completion);
+      return i.s30($this$sequence, $completion);
     }, 1);
   }
   function ClassicExecutionContext$currentGoal$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.r2x_1.kp()) {
+      if (this$0.u2x_1.np()) {
         tmp = null;
       } else {
-        var tmp0_safe_receiver = this$0.r2x_1.ip();
-        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.p2x_1);
+        var tmp0_safe_receiver = this$0.u2x_1.lp();
+        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.s2x_1);
       }
       return tmp;
     };
   }
   function ClassicExecutionContext$_get_currentGoal_$ref_ulveh3() {
     return constructCallableReference(function (p0) {
-      return p0.r30();
+      return p0.u30();
     }, 1, 0, 84);
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda$lambda(it) {
@@ -728,8 +728,8 @@
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda(this$0) {
     return function () {
-      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.q2x_1.zt());
-      return cached(distinct(plus(tmp, flatMap(this$0.b2y_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
+      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.t2x_1.cu());
+      return cached(distinct(plus(tmp, flatMap(this$0.e2y_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
     };
   }
   function ClassicExecutionContext$_get_interestingVariables_$ref_xwa4zu() {
@@ -738,28 +738,28 @@
     }, 1, 0, 85);
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda(it) {
-    return it.s30();
+    return it.v30();
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0) {
     return function (it) {
-      var tmp0_elvis_lhs = it.f2x_1;
-      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.q2x_1]) : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = it.i2x_1;
+      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.t2x_1]) : tmp0_elvis_lhs;
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda(this$0) {
     return function () {
-      var tmp = filter(this$0.b2y_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
+      var tmp = filter(this$0.e2y_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
       return toList(map(tmp, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0)));
     };
   }
   function ClassicExecutionContext$_get_logicStackTrace_$ref_p35zx2() {
     return constructCallableReference(function (p0) {
-      return p0.l1u();
+      return p0.o1u();
     }, 1, 0, 86);
   }
   function ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
     procedure = procedure === VOID ? null : procedure;
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -769,7 +769,7 @@
     outputChannels = outputChannels === VOID ? Companion_instance_5.fromStandard() : outputChannels;
     customData = customData === VOID ? Companion_instance_6.empty() : customData;
     substitution = substitution === VOID ? Companion_getInstance_2().empty() : substitution;
-    query = query === VOID ? Companion_getInstance_3().ot_1 : query;
+    query = query === VOID ? Companion_getInstance_3().rt_1 : query;
     goals = goals === VOID ? Companion_instance_7.empty() : goals;
     rules = rules === VOID ? Companion_instance_7.empty() : rules;
     primitives = primitives === VOID ? Companion_instance_7.empty() : primitives;
@@ -779,197 +779,194 @@
     depth = depth === VOID ? 0 : depth;
     step = step === VOID ? 0n : step;
     relevantVariables = relevantVariables === VOID ? emptySet() : relevantVariables;
-    this.f2x_1 = procedure;
-    this.g2x_1 = unificator;
-    this.h2x_1 = libraries;
-    this.i2x_1 = flags;
-    this.j2x_1 = staticKb;
-    this.k2x_1 = dynamicKb;
-    this.l2x_1 = operators;
-    this.m2x_1 = inputChannels;
-    this.n2x_1 = outputChannels;
-    this.o2x_1 = customData;
-    this.p2x_1 = substitution;
-    this.q2x_1 = query;
-    this.r2x_1 = goals;
-    this.s2x_1 = rules;
-    this.t2x_1 = primitives;
-    this.u2x_1 = startTime;
-    this.v2x_1 = maxDuration;
-    this.w2x_1 = choicePoints;
-    this.x2x_1 = parent;
-    this.y2x_1 = depth;
-    this.z2x_1 = step;
-    this.a2y_1 = relevantVariables;
+    this.i2x_1 = procedure;
+    this.j2x_1 = unificator;
+    this.k2x_1 = libraries;
+    this.l2x_1 = flags;
+    this.m2x_1 = staticKb;
+    this.n2x_1 = dynamicKb;
+    this.o2x_1 = operators;
+    this.p2x_1 = inputChannels;
+    this.q2x_1 = outputChannels;
+    this.r2x_1 = customData;
+    this.s2x_1 = substitution;
+    this.t2x_1 = query;
+    this.u2x_1 = goals;
+    this.v2x_1 = rules;
+    this.w2x_1 = primitives;
+    this.x2x_1 = startTime;
+    this.y2x_1 = maxDuration;
+    this.z2x_1 = choicePoints;
+    this.a2y_1 = parent;
+    this.b2y_1 = depth;
+    this.c2y_1 = step;
+    this.d2y_1 = relevantVariables;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(this.y2x_1 === 0 && this.x2x_1 == null || (this.y2x_1 > 0 && !(this.x2x_1 == null)))) {
+    if (!(this.b2y_1 === 0 && this.a2y_1 == null || (this.b2y_1 > 0 && !(this.a2y_1 == null)))) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(this.u2x_1 >= 0n)) {
+    if (!(this.x2x_1 >= 0n)) {
       var message_0 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(this.v2x_1 >= 0n)) {
+    if (!(this.y2x_1 >= 0n)) {
       var message_1 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     var tmp = this;
-    tmp.b2y_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
+    tmp.e2y_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
     var tmp_0 = this;
-    tmp_0.c2y_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
+    tmp_0.f2y_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.d2y_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
+    tmp_1.g2y_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
     var tmp_2 = this;
-    tmp_2.e2y_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
+    tmp_2.h2y_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
   }
-  protoOf(ClassicExecutionContext).j1u = function () {
-    return this.f2x_1;
-  };
-  protoOf(ClassicExecutionContext).r1k = function () {
-    return this.g2x_1;
-  };
-  protoOf(ClassicExecutionContext).o1u = function () {
-    return this.h2x_1;
-  };
-  protoOf(ClassicExecutionContext).p1u = function () {
+  protoOf(ClassicExecutionContext).m1u = function () {
     return this.i2x_1;
   };
-  protoOf(ClassicExecutionContext).q1u = function () {
+  protoOf(ClassicExecutionContext).u1k = function () {
     return this.j2x_1;
   };
   protoOf(ClassicExecutionContext).r1u = function () {
     return this.k2x_1;
   };
-  protoOf(ClassicExecutionContext).x1u = function () {
+  protoOf(ClassicExecutionContext).s1u = function () {
     return this.l2x_1;
   };
-  protoOf(ClassicExecutionContext).s1u = function () {
+  protoOf(ClassicExecutionContext).t1u = function () {
     return this.m2x_1;
   };
-  protoOf(ClassicExecutionContext).t1u = function () {
+  protoOf(ClassicExecutionContext).u1u = function () {
     return this.n2x_1;
   };
-  protoOf(ClassicExecutionContext).m1u = function () {
+  protoOf(ClassicExecutionContext).a1v = function () {
     return this.o2x_1;
   };
-  protoOf(ClassicExecutionContext).k1u = function () {
+  protoOf(ClassicExecutionContext).v1u = function () {
     return this.p2x_1;
   };
-  protoOf(ClassicExecutionContext).e1u = function () {
-    return this.u2x_1;
+  protoOf(ClassicExecutionContext).w1u = function () {
+    return this.q2x_1;
+  };
+  protoOf(ClassicExecutionContext).p1u = function () {
+    return this.r2x_1;
+  };
+  protoOf(ClassicExecutionContext).n1u = function () {
+    return this.s2x_1;
+  };
+  protoOf(ClassicExecutionContext).h1u = function () {
+    return this.x2x_1;
   };
-  protoOf(ClassicExecutionContext).g1u = function () {
-    return this.v2x_1;
+  protoOf(ClassicExecutionContext).j1u = function () {
+    return this.y2x_1;
   };
-  protoOf(ClassicExecutionContext).t30 = function () {
-    return this.y2x_1 === 0;
+  protoOf(ClassicExecutionContext).w30 = function () {
+    return this.b2y_1 === 0;
   };
-  protoOf(ClassicExecutionContext).d2z = function () {
-    var tmp0_safe_receiver = this.w2x_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.d2z();
+  protoOf(ClassicExecutionContext).g2z = function () {
+    var tmp0_safe_receiver = this.z2x_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g2z();
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(ClassicExecutionContext).s30 = function () {
-    return this.x2x_1 == null || (this.y2x_1 - this.x2x_1.y2x_1 | 0) >= 1;
+  protoOf(ClassicExecutionContext).v30 = function () {
+    return this.a2y_1 == null || (this.b2y_1 - this.a2y_1.b2y_1 | 0) >= 1;
   };
-  protoOf(ClassicExecutionContext).r30 = function () {
-    var tmp0 = this.c2y_1;
+  protoOf(ClassicExecutionContext).u30 = function () {
+    var tmp0 = this.f2y_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('currentGoal', 1, tmp, ClassicExecutionContext$_get_currentGoal_$ref_ulveh3(), null);
-    return tmp0.e2();
+    return tmp0.f2();
   };
-  protoOf(ClassicExecutionContext).u30 = function (variable) {
+  protoOf(ClassicExecutionContext).x30 = function (variable) {
     return contains(_get_interestingVariables__k6uw5o(this), variable);
   };
-  protoOf(ClassicExecutionContext).l1u = function () {
-    var tmp0 = this.e2y_1;
+  protoOf(ClassicExecutionContext).o1u = function () {
+    var tmp0 = this.h2y_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('logicStackTrace', 1, tmp, ClassicExecutionContext$_get_logicStackTrace_$ref_p35zx2(), null);
-    return tmp0.e2();
+    return tmp0.f2();
   };
-  protoOf(ClassicExecutionContext).n1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).q1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
   protoOf(ClassicExecutionContext).createSolver = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, $super) {
     return this.createSolver(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, ($super == null ? true : $super instanceof ClassicExecutionContext) ? $super : THROW_CCE());
   };
-  protoOf(ClassicExecutionContext).u1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).x1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
   protoOf(ClassicExecutionContext).createMutableSolver = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, $super) {
     return this.createMutableSolver(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, ($super == null ? true : $super instanceof ClassicExecutionContext) ? $super : THROW_CCE());
   };
-  protoOf(ClassicExecutionContext).w1u = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
-    return this.w2y(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
+  protoOf(ClassicExecutionContext).z1u = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
+    return this.z2y(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
   };
   protoOf(ClassicExecutionContext).update = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, $super) {
     return this.update(unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, ($super == null ? true : $super instanceof ClassicExecutionContext) ? $super : THROW_CCE());
   };
-  protoOf(ClassicExecutionContext).v30 = function (sideEffect) {
+  protoOf(ClassicExecutionContext).y30 = function (sideEffect) {
     var tmp = apply.call(this, sideEffect);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).apply = function (sideEffect) {
-    return this.v30(sideEffect);
+    return this.y30(sideEffect);
   };
-  protoOf(ClassicExecutionContext).w30 = function (sideEffects) {
+  protoOf(ClassicExecutionContext).z30 = function (sideEffects) {
     var tmp = applyIterable.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applyIterable = function (sideEffects) {
-    return this.w30(sideEffects);
+    return this.z30(sideEffects);
   };
-  protoOf(ClassicExecutionContext).x30 = function (sideEffects) {
+  protoOf(ClassicExecutionContext).a31 = function (sideEffects) {
     var tmp = applySequence.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applySequence = function (sideEffects) {
-    return this.x30(sideEffects);
+    return this.a31(sideEffects);
   };
   protoOf(ClassicExecutionContext).toString = function () {
-    return 'ClassicExecutionContext(' + ('step=' + this.z2x_1.toString() + ', ') + ('depth=' + this.y2x_1 + ', ') + ('substitution=' + toString(this.p2x_1) + ', ') + ('logicStackTrace=' + toString(this.l1u()) + ', ') + ('goals=' + toString(this.r2x_1) + ', ') + ('rules=' + toString(this.s2x_1) + ', ') + ('primitives=' + toString(this.t2x_1) + ', ') + ('startTime=' + this.u2x_1.toString() + ', ') + ('endTime=' + this.f1u().toString() + ', ') + ('maxDuration=' + this.v2x_1.toString() + ', ') + ('unificator=' + toString(this.g2x_1) + ', ') + ('choicePoints=' + toString_0(this.w2x_1)) + ')';
+    return 'ClassicExecutionContext(' + ('step=' + this.c2y_1.toString() + ', ') + ('depth=' + this.b2y_1 + ', ') + ('substitution=' + toString(this.s2x_1) + ', ') + ('logicStackTrace=' + toString(this.o1u()) + ', ') + ('goals=' + toString(this.u2x_1) + ', ') + ('rules=' + toString(this.v2x_1) + ', ') + ('primitives=' + toString(this.w2x_1) + ', ') + ('startTime=' + this.x2x_1.toString() + ', ') + ('endTime=' + this.i1u().toString() + ', ') + ('maxDuration=' + this.y2x_1.toString() + ', ') + ('unificator=' + toString(this.j2x_1) + ', ') + ('choicePoints=' + toString_0(this.z2x_1)) + ')';
   };
-  protoOf(ClassicExecutionContext).y30 = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
+  protoOf(ClassicExecutionContext).b31 = 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);
   };
-  protoOf(ClassicExecutionContext).w2y = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $super) {
-    procedure = procedure === VOID ? this.f2x_1 : procedure;
-    unificator = unificator === VOID ? this.g2x_1 : unificator;
-    libraries = libraries === VOID ? this.h2x_1 : libraries;
-    flags = flags === VOID ? this.i2x_1 : flags;
-    staticKb = staticKb === VOID ? this.j2x_1 : staticKb;
-    dynamicKb = dynamicKb === VOID ? this.k2x_1 : dynamicKb;
-    operators = operators === VOID ? this.l2x_1 : operators;
-    inputChannels = inputChannels === VOID ? this.m2x_1 : inputChannels;
-    outputChannels = outputChannels === VOID ? this.n2x_1 : outputChannels;
-    customData = customData === VOID ? this.o2x_1 : customData;
-    substitution = substitution === VOID ? this.p2x_1 : substitution;
-    query = query === VOID ? this.q2x_1 : query;
-    goals = goals === VOID ? this.r2x_1 : goals;
-    rules = rules === VOID ? this.s2x_1 : rules;
-    primitives = primitives === VOID ? this.t2x_1 : primitives;
-    startTime = startTime === VOID ? this.u2x_1 : startTime;
-    maxDuration = maxDuration === VOID ? this.v2x_1 : maxDuration;
-    choicePoints = choicePoints === VOID ? this.w2x_1 : choicePoints;
-    parent = parent === VOID ? this.x2x_1 : parent;
-    depth = depth === VOID ? this.y2x_1 : depth;
-    step = step === VOID ? this.z2x_1 : step;
-    relevantVariables = relevantVariables === VOID ? this.a2y_1 : relevantVariables;
-    return $super === VOID ? this.y30(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.y30.call(this, procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
+  protoOf(ClassicExecutionContext).z2y = function (procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables, $super) {
+    procedure = procedure === VOID ? this.i2x_1 : procedure;
+    unificator = unificator === VOID ? this.j2x_1 : unificator;
+    libraries = libraries === VOID ? this.k2x_1 : libraries;
+    flags = flags === VOID ? this.l2x_1 : flags;
+    staticKb = staticKb === VOID ? this.m2x_1 : staticKb;
+    dynamicKb = dynamicKb === VOID ? this.n2x_1 : dynamicKb;
+    operators = operators === VOID ? this.o2x_1 : operators;
+    inputChannels = inputChannels === VOID ? this.p2x_1 : inputChannels;
+    outputChannels = outputChannels === VOID ? this.q2x_1 : outputChannels;
+    customData = customData === VOID ? this.r2x_1 : customData;
+    substitution = substitution === VOID ? this.s2x_1 : substitution;
+    query = query === VOID ? this.t2x_1 : query;
+    goals = goals === VOID ? this.u2x_1 : goals;
+    rules = rules === VOID ? this.v2x_1 : rules;
+    primitives = primitives === VOID ? this.w2x_1 : primitives;
+    startTime = startTime === VOID ? this.x2x_1 : startTime;
+    maxDuration = maxDuration === VOID ? this.y2x_1 : maxDuration;
+    choicePoints = choicePoints === VOID ? this.z2x_1 : choicePoints;
+    parent = parent === VOID ? this.a2y_1 : parent;
+    depth = depth === VOID ? this.b2y_1 : depth;
+    step = step === VOID ? this.c2y_1 : step;
+    relevantVariables = relevantVariables === VOID ? this.d2y_1 : relevantVariables;
+    return $super === VOID ? this.b31(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.b31.call(this, procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables);
   };
   protoOf(ClassicExecutionContext).hashCode = function () {
-    var result = this.f2x_1 == null ? 0 : this.f2x_1.hashCode();
-    result = imul(result, 31) + hashCode(this.g2x_1) | 0;
-    result = imul(result, 31) + hashCode(this.h2x_1) | 0;
-    result = imul(result, 31) + this.i2x_1.hashCode() | 0;
+    var result = this.i2x_1 == null ? 0 : this.i2x_1.hashCode();
     result = imul(result, 31) + hashCode(this.j2x_1) | 0;
     result = imul(result, 31) + hashCode(this.k2x_1) | 0;
     result = imul(result, 31) + this.l2x_1.hashCode() | 0;
@@ -977,17 +974,20 @@
     result = imul(result, 31) + hashCode(this.n2x_1) | 0;
     result = imul(result, 31) + this.o2x_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.p2x_1) | 0;
-    result = imul(result, 31) + this.q2x_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.r2x_1) | 0;
+    result = imul(result, 31) + hashCode(this.q2x_1) | 0;
+    result = imul(result, 31) + this.r2x_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.s2x_1) | 0;
-    result = imul(result, 31) + hashCode(this.t2x_1) | 0;
-    result = imul(result, 31) + getBigIntHashCode(this.u2x_1) | 0;
-    result = imul(result, 31) + getBigIntHashCode(this.v2x_1) | 0;
-    result = imul(result, 31) + (this.w2x_1 == null ? 0 : hashCode(this.w2x_1)) | 0;
-    result = imul(result, 31) + (this.x2x_1 == null ? 0 : this.x2x_1.hashCode()) | 0;
-    result = imul(result, 31) + this.y2x_1 | 0;
-    result = imul(result, 31) + getBigIntHashCode(this.z2x_1) | 0;
-    result = imul(result, 31) + hashCode(this.a2y_1) | 0;
+    result = imul(result, 31) + this.t2x_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.u2x_1) | 0;
+    result = imul(result, 31) + hashCode(this.v2x_1) | 0;
+    result = imul(result, 31) + hashCode(this.w2x_1) | 0;
+    result = imul(result, 31) + getBigIntHashCode(this.x2x_1) | 0;
+    result = imul(result, 31) + getBigIntHashCode(this.y2x_1) | 0;
+    result = imul(result, 31) + (this.z2x_1 == null ? 0 : hashCode(this.z2x_1)) | 0;
+    result = imul(result, 31) + (this.a2y_1 == null ? 0 : this.a2y_1.hashCode()) | 0;
+    result = imul(result, 31) + this.b2y_1 | 0;
+    result = imul(result, 31) + getBigIntHashCode(this.c2y_1) | 0;
+    result = imul(result, 31) + hashCode(this.d2y_1) | 0;
     return result;
   };
   protoOf(ClassicExecutionContext).equals = function (other) {
@@ -995,13 +995,7 @@
       return true;
     if (!(other instanceof ClassicExecutionContext))
       return false;
-    if (!equals(this.f2x_1, other.f2x_1))
-      return false;
-    if (!equals(this.g2x_1, other.g2x_1))
-      return false;
-    if (!equals(this.h2x_1, other.h2x_1))
-      return false;
-    if (!this.i2x_1.equals(other.i2x_1))
+    if (!equals(this.i2x_1, other.i2x_1))
       return false;
     if (!equals(this.j2x_1, other.j2x_1))
       return false;
@@ -1017,32 +1011,38 @@
       return false;
     if (!equals(this.p2x_1, other.p2x_1))
       return false;
-    if (!this.q2x_1.equals(other.q2x_1))
+    if (!equals(this.q2x_1, other.q2x_1))
       return false;
-    if (!equals(this.r2x_1, other.r2x_1))
+    if (!this.r2x_1.equals(other.r2x_1))
       return false;
     if (!equals(this.s2x_1, other.s2x_1))
       return false;
-    if (!equals(this.t2x_1, other.t2x_1))
+    if (!this.t2x_1.equals(other.t2x_1))
       return false;
-    if (!(this.u2x_1 === other.u2x_1))
+    if (!equals(this.u2x_1, other.u2x_1))
       return false;
-    if (!(this.v2x_1 === other.v2x_1))
+    if (!equals(this.v2x_1, other.v2x_1))
       return false;
     if (!equals(this.w2x_1, other.w2x_1))
       return false;
-    if (!equals(this.x2x_1, other.x2x_1))
+    if (!(this.x2x_1 === other.x2x_1))
       return false;
     if (!(this.y2x_1 === other.y2x_1))
       return false;
-    if (!(this.z2x_1 === other.z2x_1))
+    if (!equals(this.z2x_1, other.z2x_1))
       return false;
     if (!equals(this.a2y_1, other.a2y_1))
       return false;
+    if (!(this.b2y_1 === other.b2y_1))
+      return false;
+    if (!(this.c2y_1 === other.c2y_1))
+      return false;
+    if (!equals(this.d2y_1, other.d2y_1))
+      return false;
     return true;
   };
   function ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     initialStaticKb = initialStaticKb === VOID ? Companion_instance_0.empty(unificator) : initialStaticKb;
@@ -1058,7 +1058,7 @@
     return ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, objectCreate(protoOf(ClassicSolver)));
   }
   function ClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1075,47 +1075,47 @@
   function ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb) {
     return ClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, objectCreate(protoOf(ClassicSolver)));
   }
-  protoOf(ClassicSolver).h2y = function (initialState, onStateTransition) {
-    return Companion_instance_15.a31(initialState, onStateTransition);
+  protoOf(ClassicSolver).k2y = function (initialState, onStateTransition) {
+    return Companion_instance_15.d31(initialState, onStateTransition);
   };
-  protoOf(ClassicSolver).f1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolver).i1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
   protoOf(ClassicSolver).copy = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.copy(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ClassicSolver) ? $super : THROW_CCE());
   };
-  protoOf(ClassicSolver).g1s = function () {
+  protoOf(ClassicSolver).j1s = function () {
     return this.copy();
   };
   protoOf(ClassicSolver).clone = function () {
-    return this.g1s();
+    return this.j1s();
   };
   function ClassicSolver() {
   }
   function ClassicSolverFactory() {
   }
-  protoOf(ClassicSolverFactory).a1x = function () {
+  protoOf(ClassicSolverFactory).d1x = function () {
     return DefaultBuiltins_getInstance();
   };
-  protoOf(ClassicSolverFactory).l1x = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).o1x = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
   protoOf(ClassicSolverFactory).rawSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, $super) {
     return this.rawSolverOf(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, ($super == null ? true : $super instanceof ClassicSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ClassicSolverFactory).r1x = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).u1x = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return ClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
   protoOf(ClassicSolverFactory).solverOf = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.solverOf(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ClassicSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ClassicSolverFactory).t1x = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).w1x = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
   protoOf(ClassicSolverFactory).mutableSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.mutableSolverOf(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ClassicSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ClassicSolverFactory).v1x = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).y1x = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
   protoOf(ClassicSolverFactory).rawMutableSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, $super) {
@@ -1126,7 +1126,7 @@
     return ClassicSolverFactory_instance;
   }
   function MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1142,7 +1142,7 @@
     return MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, objectCreate(protoOf(MutableClassicSolver)));
   }
   function MutableClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().k1k() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().n1k() : unificator;
     libraries = libraries === VOID ? Companion_instance.empty() : libraries;
     flags = flags === VOID ? Companion_getInstance_0().empty() : flags;
     staticKb = staticKb === VOID ? Companion_instance_0.empty(unificator) : staticKb;
@@ -1161,265 +1161,265 @@
   }
   function MutableClassicSolver$loadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.h2x_1.plusLibrary($library);
-      return $this$updateContext.w2y(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.l2x_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
+      var newRuntime = $this$updateContext.k2x_1.plusLibrary($library);
+      return $this$updateContext.z2y(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.o2x_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
     };
   }
   function MutableClassicSolver$unloadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.h2x_1.plusLibrary($library);
-      return $this$updateContext.w2y(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.j2x_1, $this$updateContext.k2x_1])));
+      var newRuntime = $this$updateContext.k2x_1.plusLibrary($library);
+      return $this$updateContext.z2y(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.m2x_1, $this$updateContext.n2x_1])));
     };
   }
   function MutableClassicSolver$setRuntime$lambda($libraries) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.j2x_1, $this$updateContext.k2x_1])));
+      return $this$updateContext.z2y(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.m2x_1, $this$updateContext.n2x_1])));
     };
   }
   function MutableClassicSolver$resetStaticKb$lambda($this$updateContext) {
-    return $this$updateContext.w2y(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.g2x_1), VOID, toOperatorSet(getAllOperators($this$updateContext.h2x_1, [$this$updateContext.k2x_1])));
+    return $this$updateContext.z2y(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.j2x_1), VOID, toOperatorSet(getAllOperators($this$updateContext.k2x_1, [$this$updateContext.n2x_1])));
   }
   function MutableClassicSolver$resetDynamicKb$lambda($this$updateContext) {
-    return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.g2x_1), toOperatorSet(getAllOperators($this$updateContext.h2x_1, [$this$updateContext.j2x_1])));
+    return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.j2x_1), toOperatorSet(getAllOperators($this$updateContext.k2x_1, [$this$updateContext.m2x_1])));
   }
   function MutableClassicSolver$assertA$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2x_1.w1r($clause), $this$updateContext.l2x_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.z1r($clause), $this$updateContext.o2x_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertA$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2x_1.v1s($fact));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.y1s($fact));
     };
   }
   function MutableClassicSolver$assertZ$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2x_1.a1s($clause), $this$updateContext.l2x_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.d1s($clause), $this$updateContext.o2x_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertZ$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2x_1.w1s($fact));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.z1s($fact));
     };
   }
   function MutableClassicSolver$retract$lambda($result, $clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $result.o1r().toMutableTheory(), $this$updateContext.l2x_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $result.r1r().toMutableTheory(), $this$updateContext.o2x_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$retract$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $result.o1r().toMutableTheory());
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $result.r1r().toMutableTheory());
     };
   }
   function MutableClassicSolver$retractAll$lambda($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $result.o1r().toMutableTheory(), $this$updateContext.l2x_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.o1r()))));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $result.r1r().toMutableTheory(), $this$updateContext.o2x_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.r1r()))));
     };
   }
   function MutableClassicSolver$retractAll$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, $result.o1r().toMutableTheory());
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, $result.r1r().toMutableTheory());
     };
   }
   function MutableClassicSolver$setFlag$lambda($name, $value) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, $this$updateContext.i2x_1.set($name, $value));
+      return $this$updateContext.z2y(VOID, VOID, VOID, $this$updateContext.l2x_1.set($name, $value));
     };
   }
   function MutableClassicSolver$setFlag$lambda_0($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, $this$updateContext.i2x_1.plusPair($flag));
+      return $this$updateContext.z2y(VOID, VOID, VOID, $this$updateContext.l2x_1.plusPair($flag));
     };
   }
   function MutableClassicSolver$setFlag$lambda_1($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, $this$updateContext.i2x_1.plusNotable($flag));
+      return $this$updateContext.z2y(VOID, VOID, VOID, $this$updateContext.l2x_1.plusNotable($flag));
     };
   }
   function MutableClassicSolver$setStandardInput$lambda($stdIn) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.m2x_1.plus(to('stdin', $stdIn)));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.p2x_1.plus(to('stdin', $stdIn)));
     };
   }
   function MutableClassicSolver$setStandardError$lambda($stdErr) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.plus(to('stderr', $stdErr)));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.q2x_1.plus(to('stderr', $stdErr)));
     };
   }
   function MutableClassicSolver$setStandardOutput$lambda($stdOut) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.n2x_1.plus(to('stdout', $stdOut)));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.q2x_1.plus(to('stdout', $stdOut)));
     };
   }
   function MutableClassicSolver$setWarnings$lambda($warnings) {
     return function ($this$updateContext) {
-      return $this$updateContext.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.j1y($this$updateContext.n2x_1, $warnings));
+      return $this$updateContext.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.m1y($this$updateContext.q2x_1, $warnings));
     };
   }
-  protoOf(MutableClassicSolver).c31 = function (library) {
-    this.d2a(MutableClassicSolver$loadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).f31 = function (library) {
+    this.g2a(MutableClassicSolver$loadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).loadLibrary = function (library) {
-    return this.c31(library);
+    return this.f31(library);
   };
-  protoOf(MutableClassicSolver).d31 = function (library) {
-    this.d2a(MutableClassicSolver$unloadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).g31 = function (library) {
+    this.g2a(MutableClassicSolver$unloadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).unloadLibrary = function (library) {
-    return this.d31(library);
+    return this.g31(library);
   };
-  protoOf(MutableClassicSolver).e31 = function (libraries) {
-    this.d2a(MutableClassicSolver$setRuntime$lambda(libraries));
+  protoOf(MutableClassicSolver).h31 = function (libraries) {
+    this.g2a(MutableClassicSolver$setRuntime$lambda(libraries));
   };
   protoOf(MutableClassicSolver).setLibraries = function (libraries) {
-    return this.e31(libraries);
+    return this.h31(libraries);
   };
-  protoOf(MutableClassicSolver).f31 = function (theory) {
-    this.h2a(theory, VOID, false);
+  protoOf(MutableClassicSolver).i31 = function (theory) {
+    this.k2a(theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadStaticKb = function (theory) {
-    return this.f31(theory);
+    return this.i31(theory);
   };
-  protoOf(MutableClassicSolver).g31 = function (theory) {
-    this.h2a(theory);
+  protoOf(MutableClassicSolver).j31 = function (theory) {
+    this.k2a(theory);
   };
   protoOf(MutableClassicSolver).appendStaticKb = function (theory) {
-    return this.g31(theory);
+    return this.j31(theory);
   };
-  protoOf(MutableClassicSolver).h31 = function () {
-    this.d2a(MutableClassicSolver$resetStaticKb$lambda);
+  protoOf(MutableClassicSolver).k31 = function () {
+    this.g2a(MutableClassicSolver$resetStaticKb$lambda);
   };
   protoOf(MutableClassicSolver).resetStaticKb = function () {
-    return this.h31();
+    return this.k31();
   };
-  protoOf(MutableClassicSolver).i31 = function (theory) {
-    this.h2a(VOID, theory, VOID, false);
+  protoOf(MutableClassicSolver).l31 = function (theory) {
+    this.k2a(VOID, theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadDynamicKb = function (theory) {
-    return this.i31(theory);
+    return this.l31(theory);
   };
-  protoOf(MutableClassicSolver).j31 = function (theory) {
-    this.h2a(VOID, theory);
+  protoOf(MutableClassicSolver).m31 = function (theory) {
+    this.k2a(VOID, theory);
   };
   protoOf(MutableClassicSolver).appendDynamicKb = function (theory) {
-    return this.j31(theory);
+    return this.m31(theory);
   };
-  protoOf(MutableClassicSolver).k31 = function () {
-    this.d2a(MutableClassicSolver$resetDynamicKb$lambda);
+  protoOf(MutableClassicSolver).n31 = function () {
+    this.g2a(MutableClassicSolver$resetDynamicKb$lambda);
   };
   protoOf(MutableClassicSolver).resetDynamicKb = function () {
-    return this.k31();
+    return this.n31();
   };
-  protoOf(MutableClassicSolver).d1m = function (clause) {
-    this.d2a(MutableClassicSolver$assertA$lambda(clause));
+  protoOf(MutableClassicSolver).g1m = function (clause) {
+    this.g2a(MutableClassicSolver$assertA$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertA = function (clause) {
-    return this.d1m(clause);
+    return this.g1m(clause);
   };
-  protoOf(MutableClassicSolver).l31 = function (fact) {
-    this.d2a(MutableClassicSolver$assertA$lambda_0(fact));
+  protoOf(MutableClassicSolver).o31 = function (fact) {
+    this.g2a(MutableClassicSolver$assertA$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertAFact = function (fact) {
-    return this.l31(fact);
+    return this.o31(fact);
   };
-  protoOf(MutableClassicSolver).e1l = function (clause) {
-    this.d2a(MutableClassicSolver$assertZ$lambda(clause));
+  protoOf(MutableClassicSolver).h1l = function (clause) {
+    this.g2a(MutableClassicSolver$assertZ$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertZ = function (clause) {
-    return this.e1l(clause);
+    return this.h1l(clause);
   };
-  protoOf(MutableClassicSolver).m31 = function (fact) {
-    this.d2a(MutableClassicSolver$assertZ$lambda_0(fact));
+  protoOf(MutableClassicSolver).p31 = function (fact) {
+    this.g2a(MutableClassicSolver$assertZ$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertZFact = function (fact) {
-    return this.m31(fact);
+    return this.p31(fact);
   };
-  protoOf(MutableClassicSolver).x1s = function (clause) {
-    var result = this.r1u().retract(clause);
-    this.d2a(MutableClassicSolver$retract$lambda(result, clause));
+  protoOf(MutableClassicSolver).a1t = function (clause) {
+    var result = this.u1u().retract(clause);
+    this.g2a(MutableClassicSolver$retract$lambda(result, clause));
     return result;
   };
   protoOf(MutableClassicSolver).retract = function (clause) {
-    return this.x1s(clause);
+    return this.a1t(clause);
   };
-  protoOf(MutableClassicSolver).y1s = function (fact) {
-    var result = this.r1u().retractByHead(fact);
-    this.d2a(MutableClassicSolver$retract$lambda_0(result));
+  protoOf(MutableClassicSolver).b1t = function (fact) {
+    var result = this.u1u().retractByHead(fact);
+    this.g2a(MutableClassicSolver$retract$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractByHead = function (fact) {
-    return this.y1s(fact);
+    return this.b1t(fact);
   };
-  protoOf(MutableClassicSolver).j1l = function (clause) {
-    var result = this.r1u().retractAll(clause);
-    this.d2a(MutableClassicSolver$retractAll$lambda(result));
+  protoOf(MutableClassicSolver).m1l = function (clause) {
+    var result = this.u1u().retractAll(clause);
+    this.g2a(MutableClassicSolver$retractAll$lambda(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAll = function (clause) {
-    return this.j1l(clause);
+    return this.m1l(clause);
   };
-  protoOf(MutableClassicSolver).n31 = function (fact) {
-    var result = this.r1u().retractAllByHead(fact);
-    this.d2a(MutableClassicSolver$retractAll$lambda_0(result));
+  protoOf(MutableClassicSolver).q31 = function (fact) {
+    var result = this.u1u().retractAllByHead(fact);
+    this.g2a(MutableClassicSolver$retractAll$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAllBeHead = function (fact) {
-    return this.n31(fact);
+    return this.q31(fact);
   };
-  protoOf(MutableClassicSolver).o31 = function (name, value) {
-    this.d2a(MutableClassicSolver$setFlag$lambda(name, value));
+  protoOf(MutableClassicSolver).r31 = function (name, value) {
+    this.g2a(MutableClassicSolver$setFlag$lambda(name, value));
   };
   protoOf(MutableClassicSolver).setFlag = function (name, value) {
-    return this.o31(name, value);
+    return this.r31(name, value);
   };
-  protoOf(MutableClassicSolver).p31 = function (flag) {
-    this.d2a(MutableClassicSolver$setFlag$lambda_0(flag));
+  protoOf(MutableClassicSolver).s31 = function (flag) {
+    this.g2a(MutableClassicSolver$setFlag$lambda_0(flag));
   };
   protoOf(MutableClassicSolver).setFlagPair = function (flag) {
-    return this.p31(flag);
+    return this.s31(flag);
   };
-  protoOf(MutableClassicSolver).q31 = function (flag) {
-    this.d2a(MutableClassicSolver$setFlag$lambda_1(flag));
+  protoOf(MutableClassicSolver).t31 = function (flag) {
+    this.g2a(MutableClassicSolver$setFlag$lambda_1(flag));
   };
   protoOf(MutableClassicSolver).setFlagNotable = function (flag) {
-    return this.q31(flag);
+    return this.t31(flag);
   };
-  protoOf(MutableClassicSolver).r31 = function (stdIn) {
-    this.d2a(MutableClassicSolver$setStandardInput$lambda(stdIn));
+  protoOf(MutableClassicSolver).u31 = function (stdIn) {
+    this.g2a(MutableClassicSolver$setStandardInput$lambda(stdIn));
   };
   protoOf(MutableClassicSolver).setStandardInput = function (stdIn) {
-    return this.r31(stdIn);
+    return this.u31(stdIn);
   };
-  protoOf(MutableClassicSolver).s31 = function (stdErr) {
-    this.d2a(MutableClassicSolver$setStandardError$lambda(stdErr));
+  protoOf(MutableClassicSolver).v31 = function (stdErr) {
+    this.g2a(MutableClassicSolver$setStandardError$lambda(stdErr));
   };
   protoOf(MutableClassicSolver).setStandardError = function (stdErr) {
-    return this.s31(stdErr);
+    return this.v31(stdErr);
   };
-  protoOf(MutableClassicSolver).t31 = function (stdOut) {
-    this.d2a(MutableClassicSolver$setStandardOutput$lambda(stdOut));
+  protoOf(MutableClassicSolver).w31 = function (stdOut) {
+    this.g2a(MutableClassicSolver$setStandardOutput$lambda(stdOut));
   };
   protoOf(MutableClassicSolver).setStandardOutput = function (stdOut) {
-    return this.t31(stdOut);
+    return this.w31(stdOut);
   };
-  protoOf(MutableClassicSolver).u31 = function (warnings) {
-    this.d2a(MutableClassicSolver$setWarnings$lambda(warnings));
+  protoOf(MutableClassicSolver).x31 = function (warnings) {
+    this.g2a(MutableClassicSolver$setWarnings$lambda(warnings));
   };
   protoOf(MutableClassicSolver).setWarnings = function (warnings) {
-    return this.u31(warnings);
+    return this.x31(warnings);
   };
-  protoOf(MutableClassicSolver).f1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(MutableClassicSolver).i1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
     return MutableClassicSolver_init_$Create$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings);
   };
   protoOf(MutableClassicSolver).copy = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.copy(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof MutableClassicSolver) ? $super : THROW_CCE());
   };
-  protoOf(MutableClassicSolver).g1s = function () {
+  protoOf(MutableClassicSolver).j1s = function () {
     return this.copy();
   };
   protoOf(MutableClassicSolver).clone = function () {
-    return this.g1s();
+    return this.j1s();
   };
   function MutableClassicSolver() {
   }
@@ -1428,7 +1428,7 @@
   }
   function Companion() {
   }
-  protoOf(Companion).a31 = function (initialState, onStateTransition) {
+  protoOf(Companion).d31 = function (initialState, onStateTransition) {
     return new SimpleSolutionIterator(initialState, onStateTransition);
   };
   protoOf(Companion).of = function (initialState, onStateTransition, $super) {
@@ -1439,7 +1439,7 @@
       tmp = onStateTransition;
     }
     onStateTransition = tmp;
-    return $super === VOID ? this.a31(initialState, onStateTransition) : $super.a31.call(this, initialState, onStateTransition);
+    return $super === VOID ? this.d31(initialState, onStateTransition) : $super.d31.call(this, initialState, onStateTransition);
   };
   var Companion_instance_15;
   function Companion_getInstance_5() {
@@ -1447,81 +1447,81 @@
   }
   function AbstractEndState(solution, context) {
     AbstractState.call(this, context);
-    this.x31_1 = solution;
-    this.y31_1 = context;
+    this.a32_1 = solution;
+    this.b32_1 = context;
   }
-  protoOf(AbstractEndState).j2h = function () {
-    return this.x31_1;
+  protoOf(AbstractEndState).m2h = function () {
+    return this.a32_1;
   };
-  protoOf(AbstractEndState).h8 = function () {
-    return this.y31_1;
+  protoOf(AbstractEndState).i8 = function () {
+    return this.b32_1;
   };
-  protoOf(AbstractEndState).z31 = function () {
+  protoOf(AbstractEndState).c32 = function () {
     throw NoSuchElementException_init_$Create$();
   };
   protoOf(AbstractEndState).asEndState = function () {
-    return this.h32();
+    return this.k32();
   };
   function AbstractState$executionTime$delegate$lambda(this$0) {
     return function () {
-      return this$0.e32();
+      return this$0.h32();
     };
   }
   function AbstractState$_get_executionTime_$ref_gwd5wm() {
     return constructCallableReference(function (p0) {
-      return p0.c32();
+      return p0.f32();
     }, 1, 0, 87);
   }
   function AbstractState(context) {
-    this.a32_1 = context;
+    this.d32_1 = context;
     var tmp = this;
-    tmp.b32_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
+    tmp.e32_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
   }
-  protoOf(AbstractState).h8 = function () {
-    return this.a32_1;
+  protoOf(AbstractState).i8 = function () {
+    return this.d32_1;
   };
-  protoOf(AbstractState).c32 = function () {
-    var tmp0 = this.b32_1;
+  protoOf(AbstractState).f32 = function () {
+    var tmp0 = this.e32_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('executionTime', 1, tmp, AbstractState$_get_executionTime_$ref_gwd5wm(), null);
-    return tmp0.e2();
+    return tmp0.f2();
   };
-  protoOf(AbstractState).d32 = function () {
-    return subtract(this.c32(), this.h8().u2x_1) > this.h8().v2x_1;
+  protoOf(AbstractState).g32 = function () {
+    return subtract(this.f32(), this.i8().x2x_1) > this.i8().y2x_1;
   };
   protoOf(AbstractState).r = function () {
     var tmp;
-    if (this.d32()) {
-      var tmp0_exceededDuration = this.h8().v2x_1;
-      var tmp1_context = this.h8();
-      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.h8().w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+    if (this.g32()) {
+      var tmp0_exceededDuration = this.i8().y2x_1;
+      var tmp1_context = this.i8();
+      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.i8().z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
     } else {
-      tmp = this.z31();
+      tmp = this.c32();
     }
     return tmp;
   };
   protoOf(AbstractState).next = function () {
     return this.r();
   };
-  protoOf(AbstractState).e32 = function () {
+  protoOf(AbstractState).h32 = function () {
     return currentTimeInstant();
   };
-  protoOf(AbstractState).f32 = function () {
+  protoOf(AbstractState).i32 = function () {
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = this.h8().z2x_1;
+    var this_0 = this.i8().c2y_1;
     return add(this_0, fromInt(1));
   };
-  protoOf(AbstractState).j32 = function (_this__u8e3s4) {
-    var tmp0 = _this__u8e3s4.b2y_1;
+  protoOf(AbstractState).m32 = function (_this__u8e3s4) {
+    var tmp0 = _this__u8e3s4.e2y_1;
     var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.sequences.first' call
       var _iterator__ex2g4s = tmp0.n();
       while (_iterator__ex2g4s.q()) {
         var element = _iterator__ex2g4s.r();
-        var tmp0_safe_receiver = element.f2x_1;
-        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xt();
+        var tmp0_safe_receiver = element.i2x_1;
+        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.au();
         // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
         if (!(tmp === Throw_getInstance().signature.name)) {
           tmp$ret$0 = element;
@@ -1538,26 +1538,26 @@
   }
   function StateBacktracking(context) {
     AbstractState.call(this, context);
-    this.m32_1 = context;
+    this.p32_1 = context;
   }
-  protoOf(StateBacktracking).h8 = function () {
-    return this.m32_1;
+  protoOf(StateBacktracking).i8 = function () {
+    return this.p32_1;
   };
-  protoOf(StateBacktracking).z31 = function () {
-    var choicePoints = this.m32_1.w2x_1;
+  protoOf(StateBacktracking).c32 = function () {
+    var choicePoints = this.p32_1.z2x_1;
     var tmp;
     // Inline function 'kotlin.let' call
-    if (choicePoints === null || !choicePoints.d2z()) {
-      tmp = new StateEnd(Companion_instance_8.no(this.m32_1.q2x_1), this.m32_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+    if (choicePoints === null || !choicePoints.g2z()) {
+      tmp = new StateEnd(Companion_instance_8.no(this.p32_1.t2x_1), this.p32_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
     } else {
-      var tmp0 = ensureNotNull(choicePoints).e2z();
+      var tmp0 = ensureNotNull(choicePoints).h2z();
       var tmp$ret$2;
       $l$block: {
         // Inline function 'kotlin.sequences.first' call
         var _iterator__ex2g4s = tmp0.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          if (element.q2y().jp()) {
+          if (element.t2y().mp()) {
             tmp$ret$2 = element;
             break $l$block;
           }
@@ -1565,9 +1565,9 @@
         throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
       }
       var choicePointContext = tmp$ret$2;
-      var nextContext = choicePointContext.v2y(this.m32_1);
+      var nextContext = choicePointContext.y2y(this.p32_1);
       var tmp_0;
-      if (nextContext.t2x_1.jp()) {
+      if (nextContext.w2x_1.mp()) {
         tmp_0 = new StatePrimitiveExecution(nextContext);
       } else {
         tmp_0 = new StateRuleExecution(nextContext);
@@ -1576,71 +1576,71 @@
     }
     return tmp;
   };
-  protoOf(StateBacktracking).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StateBacktracking).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StateBacktracking).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateBacktracking) ? $super : THROW_CCE());
   };
-  protoOf(StateBacktracking).n32 = function (context) {
+  protoOf(StateBacktracking).q32 = function (context) {
     return new StateBacktracking(context);
   };
   protoOf(StateBacktracking).toString = function () {
-    return 'StateBacktracking(context=' + this.m32_1.toString() + ')';
+    return 'StateBacktracking(context=' + this.p32_1.toString() + ')';
   };
   protoOf(StateBacktracking).hashCode = function () {
-    return this.m32_1.hashCode();
+    return this.p32_1.hashCode();
   };
   protoOf(StateBacktracking).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateBacktracking))
       return false;
-    if (!this.m32_1.equals(other.m32_1))
+    if (!this.p32_1.equals(other.p32_1))
       return false;
     return true;
   };
   function StateEnd(solution, context) {
     AbstractEndState.call(this, solution, context);
-    this.s32_1 = solution;
-    this.t32_1 = context;
+    this.v32_1 = solution;
+    this.w32_1 = context;
   }
-  protoOf(StateEnd).j2h = function () {
-    return this.s32_1;
+  protoOf(StateEnd).m2h = function () {
+    return this.v32_1;
   };
-  protoOf(StateEnd).h8 = function () {
-    return this.t32_1;
+  protoOf(StateEnd).i8 = function () {
+    return this.w32_1;
   };
-  protoOf(StateEnd).d32 = function () {
+  protoOf(StateEnd).g32 = function () {
     return false;
   };
-  protoOf(StateEnd).z31 = function () {
+  protoOf(StateEnd).c32 = function () {
     var tmp;
-    if (this.t32_1.d2z()) {
-      var tmp0_$this = this.t32_1;
-      var tmp1_step = this.f32();
-      var tmp2_startTime = this.e32();
-      tmp = new StateBacktracking(tmp0_$this.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_startTime, VOID, VOID, VOID, VOID, tmp1_step));
+    if (this.w32_1.g2z()) {
+      var tmp0_$this = this.w32_1;
+      var tmp1_step = this.i32();
+      var tmp2_startTime = this.h32();
+      tmp = new StateBacktracking(tmp0_$this.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_startTime, VOID, VOID, VOID, VOID, tmp1_step));
     } else {
-      tmp = protoOf(AbstractEndState).z31.call(this);
+      tmp = protoOf(AbstractEndState).c32.call(this);
     }
     return tmp;
   };
-  protoOf(StateEnd).i32 = function (context) {
-    return this.u32(this.s32_1, context);
+  protoOf(StateEnd).l32 = function (context) {
+    return this.x32(this.v32_1, context);
   };
   protoOf(StateEnd).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateEnd) ? $super : THROW_CCE());
   };
-  protoOf(StateEnd).u32 = function (solution, context) {
+  protoOf(StateEnd).x32 = function (solution, context) {
     return new StateEnd(solution, context);
   };
   protoOf(StateEnd).toString = function () {
-    return 'StateEnd(solution=' + toString(this.s32_1) + ', context=' + this.t32_1.toString() + ')';
+    return 'StateEnd(solution=' + toString(this.v32_1) + ', context=' + this.w32_1.toString() + ')';
   };
   protoOf(StateEnd).hashCode = function () {
-    var result = hashCode(this.s32_1);
-    result = imul(result, 31) + this.t32_1.hashCode() | 0;
+    var result = hashCode(this.v32_1);
+    result = imul(result, 31) + this.w32_1.hashCode() | 0;
     return result;
   };
   protoOf(StateEnd).equals = function (other) {
@@ -1648,19 +1648,19 @@
       return true;
     if (!(other instanceof StateEnd))
       return false;
-    if (!equals(this.s32_1, other.s32_1))
+    if (!equals(this.v32_1, other.v32_1))
       return false;
-    if (!this.t32_1.equals(other.t32_1))
+    if (!this.w32_1.equals(other.w32_1))
       return false;
     return true;
   };
   protoOf(StateEnd).asEndState = function () {
-    return this.h32();
+    return this.k32();
   };
   function isCatch($this, $receiver) {
     var tmp;
-    if ($receiver.rt() === 3) {
-      var tmp_0 = $receiver.xt();
+    if ($receiver.ut() === 3) {
+      var tmp_0 = $receiver.au();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       tmp = tmp_0 === Catch_getInstance().signature.name;
     } else {
@@ -1671,9 +1671,9 @@
   function getExceptionContent($this, $receiver) {
     var tmp;
     if ($receiver instanceof MessageError) {
-      tmp = $receiver.w25();
+      tmp = $receiver.z25();
     } else {
-      tmp = $receiver.y23();
+      tmp = $receiver.b24();
     }
     return tmp;
   }
@@ -1687,17 +1687,17 @@
     return tmp;
   }
   function _get_finalState__3aigq8($this) {
-    return new StateHalt(toPublicException($this, $this.x32_1), $this.y32_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateHalt(toPublicException($this, $this.a33_1), $this.b33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function _get_handleExceptionInParentContext__yj3v4e($this) {
-    return new StateException($this.x32_1, ensureNotNull($this.y32_1.x2x_1).w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateException($this.a33_1, ensureNotNull($this.b33_1.a2y_1).z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function handleStruct($this, unificator, catchGoal, error) {
     var tmp;
     if (isCatch($this, catchGoal)) {
       var catcher = unificator.mgu(catchGoal.get(1), getExceptionContent($this, error));
       tmp = handleCatch($this, catchGoal, catcher);
-    } else if ($this.y32_1.t30()) {
+    } else if ($this.b33_1.w30()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1706,18 +1706,18 @@
   }
   function handleCatch($this, catchGoal, catcher) {
     var tmp;
-    if (catcher.d10()) {
-      var tmp_0 = $this.y32_1.p2x_1.plus(catcher);
+    if (catcher.g10()) {
+      var tmp_0 = $this.b33_1.s2x_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.y32_1.r2x_1.hp());
-      var tmp0_$this = $this.y32_1;
+      var newGoals = plus_0(toGoals(subGoals), $this.b33_1.u2x_1.kp());
+      var tmp0_$this = $this.b33_1;
       var tmp1_rules = Companion_instance_7.empty();
       var tmp2_primitives = Companion_instance_7.empty();
       var tmp3_substitution = newSubstitution.castToUnifier();
-      var tmp4_step = $this.f32();
-      tmp = new StateGoalSelection(tmp0_$this.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_substitution, VOID, newGoals, tmp1_rules, tmp2_primitives, VOID, VOID, VOID, VOID, VOID, tmp4_step));
-    } else if ($this.y32_1.t30()) {
+      var tmp4_step = $this.i32();
+      tmp = new StateGoalSelection(tmp0_$this.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_substitution, VOID, newGoals, tmp1_rules, tmp2_primitives, VOID, VOID, VOID, VOID, VOID, tmp4_step));
+    } else if ($this.b33_1.w30()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1727,43 +1727,43 @@
   function StateException$handleCatch$lambda(this$0) {
     return function (_destruct__k2r9zo) {
       // Inline function 'kotlin.collections.component1' call
-      var it = _destruct__k2r9zo.d2();
-      return this$0.y32_1.u30(it);
+      var it = _destruct__k2r9zo.e2();
+      return this$0.b33_1.x30(it);
     };
   }
   function StateException(exception, context) {
     AbstractState.call(this, context);
-    this.x32_1 = exception;
-    this.y32_1 = context;
+    this.a33_1 = exception;
+    this.b33_1 = context;
   }
-  protoOf(StateException).h8 = function () {
-    return this.y32_1;
+  protoOf(StateException).i8 = function () {
+    return this.b33_1;
   };
-  protoOf(StateException).z31 = function () {
+  protoOf(StateException).c32 = function () {
     var tmp;
-    if (this.x32_1 instanceof LogicError) {
-      var catchGoal = ensureNotNull(this.y32_1.r30());
-      tmp = catchGoal.du() ? handleStruct(this, this.y32_1.g2x_1, catchGoal.castToStruct(), this.x32_1) : this.y32_1.t30() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
+    if (this.a33_1 instanceof LogicError) {
+      var catchGoal = ensureNotNull(this.b33_1.u30());
+      tmp = catchGoal.gu() ? handleStruct(this, this.b33_1.j2x_1, catchGoal.castToStruct(), this.a33_1) : this.b33_1.w30() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
     } else {
       tmp = _get_finalState__3aigq8(this);
     }
     return tmp;
   };
-  protoOf(StateException).i32 = function (context) {
-    return this.z32(this.x32_1, context);
+  protoOf(StateException).l32 = function (context) {
+    return this.c33(this.a33_1, context);
   };
   protoOf(StateException).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateException) ? $super : THROW_CCE());
   };
-  protoOf(StateException).z32 = function (exception, context) {
+  protoOf(StateException).c33 = function (exception, context) {
     return new StateException(exception, context);
   };
   protoOf(StateException).toString = function () {
-    return 'StateException(exception=' + this.x32_1.toString() + ', context=' + this.y32_1.toString() + ')';
+    return 'StateException(exception=' + this.a33_1.toString() + ', context=' + this.b33_1.toString() + ')';
   };
   protoOf(StateException).hashCode = function () {
-    var result = hashCode(this.x32_1);
-    result = imul(result, 31) + this.y32_1.hashCode() | 0;
+    var result = hashCode(this.a33_1);
+    result = imul(result, 31) + this.b33_1.hashCode() | 0;
     return result;
   };
   protoOf(StateException).equals = function (other) {
@@ -1771,107 +1771,107 @@
       return true;
     if (!(other instanceof StateException))
       return false;
-    if (!equals(this.x32_1, other.x32_1))
+    if (!equals(this.a33_1, other.a33_1))
       return false;
-    if (!this.y32_1.equals(other.y32_1))
+    if (!this.b33_1.equals(other.b33_1))
       return false;
     return true;
   };
   function StateGoalSelection$computeNext$lambda(this$0) {
     return function (_destruct__k2r9zo) {
       // Inline function 'kotlin.collections.component1' call
-      var it = _destruct__k2r9zo.d2();
-      return this$0.c33_1.u30(it);
+      var it = _destruct__k2r9zo.e2();
+      return this$0.f33_1.x30(it);
     };
   }
   function StateGoalSelection(context) {
     AbstractState.call(this, context);
-    this.c33_1 = context;
+    this.f33_1 = context;
   }
-  protoOf(StateGoalSelection).h8 = function () {
-    return this.c33_1;
+  protoOf(StateGoalSelection).i8 = function () {
+    return this.f33_1;
   };
-  protoOf(StateGoalSelection).z31 = function () {
+  protoOf(StateGoalSelection).c32 = function () {
     var tmp;
-    if (this.c33_1.r2x_1.kp()) {
+    if (this.f33_1.u2x_1.np()) {
       var tmp_0;
-      if (this.c33_1.t30()) {
-        tmp_0 = new StateEnd(Companion_instance_8.a1w(this.c33_1.q2x_1, this.c33_1.p2x_1), this.c33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+      if (this.f33_1.w30()) {
+        tmp_0 = new StateEnd(Companion_instance_8.d1w(this.f33_1.t2x_1, this.f33_1.s2x_1), this.f33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
       } else {
         // Inline function 'kotlin.let' call
-        var it = ensureNotNull(this.c33_1.x2x_1);
-        var tmp0_choicePoints = this.c33_1.w2x_1;
-        var tmp1_flags = this.c33_1.i2x_1;
-        var tmp2_dynamicKb = this.c33_1.k2x_1;
-        var tmp3_staticKb = this.c33_1.j2x_1;
-        var tmp4_substitution = this.c33_1.p2x_1.xz(StateGoalSelection$computeNext$lambda(this));
-        var tmp5_goals = it.r2x_1.hp();
-        var tmp6_procedure = it.f2x_1;
-        var tmp7_step = this.f32();
-        var tmp8_startTime = this.c33_1.u2x_1;
-        var tmp9_operators = this.c33_1.l2x_1;
-        var tmp10_inputChannels = this.c33_1.m2x_1;
-        var tmp11_outputChannels = this.c33_1.n2x_1;
-        var tmp12_libraries = this.c33_1.h2x_1;
-        var tmp13_customData = this.c33_1.o2x_1;
-        var tmp$ret$0 = it.w2y(tmp6_procedure, VOID, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, VOID, tmp5_goals, VOID, VOID, tmp8_startTime, VOID, tmp0_choicePoints, VOID, VOID, tmp7_step);
+        var it = ensureNotNull(this.f33_1.a2y_1);
+        var tmp0_choicePoints = this.f33_1.z2x_1;
+        var tmp1_flags = this.f33_1.l2x_1;
+        var tmp2_dynamicKb = this.f33_1.n2x_1;
+        var tmp3_staticKb = this.f33_1.m2x_1;
+        var tmp4_substitution = this.f33_1.s2x_1.a10(StateGoalSelection$computeNext$lambda(this));
+        var tmp5_goals = it.u2x_1.kp();
+        var tmp6_procedure = it.i2x_1;
+        var tmp7_step = this.i32();
+        var tmp8_startTime = this.f33_1.x2x_1;
+        var tmp9_operators = this.f33_1.o2x_1;
+        var tmp10_inputChannels = this.f33_1.p2x_1;
+        var tmp11_outputChannels = this.f33_1.q2x_1;
+        var tmp12_libraries = this.f33_1.k2x_1;
+        var tmp13_customData = this.f33_1.r2x_1;
+        var tmp$ret$0 = it.z2y(tmp6_procedure, VOID, tmp12_libraries, tmp1_flags, tmp3_staticKb, tmp2_dynamicKb, tmp9_operators, tmp10_inputChannels, tmp11_outputChannels, tmp13_customData, tmp4_substitution, VOID, tmp5_goals, VOID, VOID, tmp8_startTime, VOID, tmp0_choicePoints, VOID, VOID, tmp7_step);
         tmp_0 = new StateGoalSelection(tmp$ret$0);
       }
       tmp = tmp_0;
-    } else if (equals(this.c33_1.i2x_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().d28_1)) {
-      tmp = new StatePrimitiveSelection(this.c33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32(), plus_1(this.c33_1.a2y_1, toSet(ensureNotNull(this.c33_1.r2x_1.ip()).zt()))));
+    } else if (equals(this.f33_1.l2x_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().g28_1)) {
+      tmp = new StatePrimitiveSelection(this.f33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32(), plus_1(this.f33_1.d2y_1, toSet(ensureNotNull(this.f33_1.u2x_1.lp()).cu()))));
     } else {
-      tmp = new StatePrimitiveSelection(this.c33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+      tmp = new StatePrimitiveSelection(this.f33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
     }
     return tmp;
   };
-  protoOf(StateGoalSelection).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StateGoalSelection).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StateGoalSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateGoalSelection) ? $super : THROW_CCE());
   };
-  protoOf(StateGoalSelection).n32 = function (context) {
+  protoOf(StateGoalSelection).q32 = function (context) {
     return new StateGoalSelection(context);
   };
   protoOf(StateGoalSelection).toString = function () {
-    return 'StateGoalSelection(context=' + this.c33_1.toString() + ')';
+    return 'StateGoalSelection(context=' + this.f33_1.toString() + ')';
   };
   protoOf(StateGoalSelection).hashCode = function () {
-    return this.c33_1.hashCode();
+    return this.f33_1.hashCode();
   };
   protoOf(StateGoalSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateGoalSelection))
       return false;
-    if (!this.c33_1.equals(other.c33_1))
+    if (!this.f33_1.equals(other.f33_1))
       return false;
     return true;
   };
   function StateHalt(exception, context) {
-    AbstractEndState.call(this, Companion_instance_8.halt(context.q2x_1, exception), context);
-    this.h33_1 = exception;
-    this.i33_1 = context;
+    AbstractEndState.call(this, Companion_instance_8.halt(context.t2x_1, exception), context);
+    this.k33_1 = exception;
+    this.l33_1 = context;
   }
-  protoOf(StateHalt).h8 = function () {
-    return this.i33_1;
+  protoOf(StateHalt).i8 = function () {
+    return this.l33_1;
   };
-  protoOf(StateHalt).i32 = function (context) {
-    return this.z32(this.h33_1, context);
+  protoOf(StateHalt).l32 = function (context) {
+    return this.c33(this.k33_1, context);
   };
   protoOf(StateHalt).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateHalt) ? $super : THROW_CCE());
   };
-  protoOf(StateHalt).z32 = function (exception, context) {
+  protoOf(StateHalt).c33 = function (exception, context) {
     return new StateHalt(exception, context);
   };
   protoOf(StateHalt).toString = function () {
-    return 'StateHalt(exception=' + this.h33_1.toString() + ', context=' + this.i33_1.toString() + ')';
+    return 'StateHalt(exception=' + this.k33_1.toString() + ', context=' + this.l33_1.toString() + ')';
   };
   protoOf(StateHalt).hashCode = function () {
-    var result = hashCode(this.h33_1);
-    result = imul(result, 31) + this.i33_1.hashCode() | 0;
+    var result = hashCode(this.k33_1);
+    result = imul(result, 31) + this.l33_1.hashCode() | 0;
     return result;
   };
   protoOf(StateHalt).equals = function (other) {
@@ -1879,53 +1879,53 @@
       return true;
     if (!(other instanceof StateHalt))
       return false;
-    if (!equals(this.h33_1, other.h33_1))
+    if (!equals(this.k33_1, other.k33_1))
       return false;
-    if (!this.i33_1.equals(other.i33_1))
+    if (!this.l33_1.equals(other.l33_1))
       return false;
     return true;
   };
   protoOf(StateHalt).asEndState = function () {
-    return this.h32();
+    return this.k32();
   };
   function StateInit(context) {
     AbstractState.call(this, context);
-    this.l33_1 = context;
+    this.o33_1 = context;
   }
-  protoOf(StateInit).h8 = function () {
-    return this.l33_1;
+  protoOf(StateInit).i8 = function () {
+    return this.o33_1;
   };
-  protoOf(StateInit).z31 = function () {
-    var tmp0_$this = this.l33_1;
-    var tmp1_goals = toGoals(this.l33_1.q2x_1);
+  protoOf(StateInit).c32 = function () {
+    var tmp0_$this = this.o33_1;
+    var tmp1_goals = toGoals(this.o33_1.t2x_1);
     var tmp2_rules = Companion_instance_7.empty();
     var tmp3_primitives = Companion_instance_7.empty();
     var tmp4_substitution = Companion_getInstance_2().empty();
-    var tmp5_customData = this.l33_1.o2x_1.preservePersistent();
+    var tmp5_customData = this.o33_1.r2x_1.preservePersistent();
     var tmp6_relevantVariables = emptySet();
-    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp5_customData, tmp4_substitution, VOID, tmp1_goals, tmp2_rules, tmp3_primitives, VOID, VOID, null, null, 0, 1n, tmp6_relevantVariables), Companion_instance_7.empty()));
+    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp5_customData, tmp4_substitution, VOID, tmp1_goals, tmp2_rules, tmp3_primitives, VOID, VOID, null, null, 0, 1n, tmp6_relevantVariables), Companion_instance_7.empty()));
   };
-  protoOf(StateInit).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StateInit).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StateInit).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateInit) ? $super : THROW_CCE());
   };
-  protoOf(StateInit).n32 = function (context) {
+  protoOf(StateInit).q32 = function (context) {
     return new StateInit(context);
   };
   protoOf(StateInit).toString = function () {
-    return 'StateInit(context=' + this.l33_1.toString() + ')';
+    return 'StateInit(context=' + this.o33_1.toString() + ')';
   };
   protoOf(StateInit).hashCode = function () {
-    return this.l33_1.hashCode();
+    return this.o33_1.hashCode();
   };
   protoOf(StateInit).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateInit))
       return false;
-    if (!this.l33_1.equals(other.l33_1))
+    if (!this.o33_1.equals(other.o33_1))
       return false;
     return true;
   };
@@ -1933,41 +1933,41 @@
     goals = goals === VOID ? null : goals;
     procedureFromAncestor = procedureFromAncestor === VOID ? 0 : procedureFromAncestor;
     substitution = substitution === VOID ? null : substitution;
-    var tmp0_safe_receiver = $receiver.t2x_1.ip();
+    var tmp0_safe_receiver = $receiver.w2x_1.lp();
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp = $receiver.w30(tmp0_safe_receiver.sideEffects);
+      tmp = $receiver.z30(tmp0_safe_receiver.sideEffects);
     }
     var tmp1_elvis_lhs = tmp;
     var ctx = tmp1_elvis_lhs == null ? $receiver : tmp1_elvis_lhs;
-    var tmp4_goals = goals == null ? $receiver.r2x_1 : goals;
-    var tmp_0 = drop($receiver.b2y_1, procedureFromAncestor);
+    var tmp4_goals = goals == null ? $receiver.u2x_1 : goals;
+    var tmp_0 = drop($receiver.e2y_1, procedureFromAncestor);
     var tmp5_procedure = first(map(tmp_0, StatePrimitiveExecution$copyFromCurrentPrimitive$lambda));
     var tmp6_primitives = Companion_instance_7.empty();
-    var tmp_1 = substitution == null ? $receiver.p2x_1 : substitution;
+    var tmp_1 = substitution == null ? $receiver.s2x_1 : substitution;
     var tmp7_substitution = isInterface(tmp_1, Unifier) ? tmp_1 : THROW_CCE();
-    var tmp8_step = $this.f32();
-    return ctx.w2y(tmp5_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp7_substitution, VOID, tmp4_goals, VOID, tmp6_primitives, VOID, VOID, VOID, VOID, VOID, tmp8_step);
+    var tmp8_step = $this.i32();
+    return ctx.z2y(tmp5_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp7_substitution, VOID, tmp4_goals, VOID, tmp6_primitives, VOID, VOID, VOID, VOID, VOID, tmp8_step);
   }
   function StatePrimitiveExecution$copyFromCurrentPrimitive$lambda(it) {
-    return it.f2x_1;
+    return it.i2x_1;
   }
   function StatePrimitiveExecution$computeNext$lambda(this$0) {
     return function (it) {
-      return new StateGoalSelection(copyFromCurrentPrimitive(this$0, this$0.o33_1, this$0.o33_1.r2x_1.hp(), 1, this$0.o33_1.g2x_1.mergeWithOccurCheck(this$0.o33_1.p2x_1, it.k1u(), false)));
+      return new StateGoalSelection(copyFromCurrentPrimitive(this$0, this$0.r33_1, this$0.r33_1.u2x_1.kp(), 1, this$0.r33_1.j2x_1.mergeWithOccurCheck(this$0.r33_1.s2x_1, it.n1u(), false)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_0(this$0) {
     return function (it) {
-      return new StateBacktracking(copyFromCurrentPrimitive(this$0, ensureNotNull(this$0.o33_1.x2x_1)));
+      return new StateBacktracking(copyFromCurrentPrimitive(this$0, ensureNotNull(this$0.r33_1.a2y_1)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_1(this$0) {
     return function (it) {
-      return new StateException(it.q1v().updateLastContext(this$0.j32(this$0.o33_1)), copyFromCurrentPrimitive(this$0, this$0.o33_1));
+      return new StateException(it.t1v().updateLastContext(this$0.m32(this$0.r33_1)), copyFromCurrentPrimitive(this$0, this$0.r33_1));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_2(it) {
@@ -1975,15 +1975,15 @@
   }
   function StatePrimitiveExecution(context) {
     AbstractState.call(this, context);
-    this.o33_1 = context;
+    this.r33_1 = context;
   }
-  protoOf(StatePrimitiveExecution).h8 = function () {
-    return this.o33_1;
+  protoOf(StatePrimitiveExecution).i8 = function () {
+    return this.r33_1;
   };
-  protoOf(StatePrimitiveExecution).z31 = function () {
+  protoOf(StatePrimitiveExecution).c32 = function () {
     var tmp;
     try {
-      var tmp0_safe_receiver = this.o33_1.t2x_1.ip();
+      var tmp0_safe_receiver = this.r33_1.w2x_1.lp();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.solution;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -1992,15 +1992,15 @@
         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.u1v(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
+        tmp_0 = tmp1_safe_receiver.x1v(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
       }
       var tmp2_elvis_lhs = tmp_0;
-      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive(this, this.o33_1)) : tmp2_elvis_lhs;
+      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive(this, this.r33_1)) : tmp2_elvis_lhs;
     } catch ($p) {
       var tmp_4;
       if ($p instanceof ResolutionException) {
         var exception = $p;
-        tmp_4 = new StateException(exception.updateLastContext(this.j32(this.o33_1)), this.o33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+        tmp_4 = new StateException(exception.updateLastContext(this.m32(this.r33_1)), this.r33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
       } else {
         throw $p;
       }
@@ -2008,57 +2008,57 @@
     }
     return tmp;
   };
-  protoOf(StatePrimitiveExecution).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StatePrimitiveExecution).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StatePrimitiveExecution).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StatePrimitiveExecution) ? $super : THROW_CCE());
   };
-  protoOf(StatePrimitiveExecution).n32 = function (context) {
+  protoOf(StatePrimitiveExecution).q32 = function (context) {
     return new StatePrimitiveExecution(context);
   };
   protoOf(StatePrimitiveExecution).toString = function () {
-    return 'StatePrimitiveExecution(context=' + this.o33_1.toString() + ')';
+    return 'StatePrimitiveExecution(context=' + this.r33_1.toString() + ')';
   };
   protoOf(StatePrimitiveExecution).hashCode = function () {
-    return this.o33_1.hashCode();
+    return this.r33_1.hashCode();
   };
   protoOf(StatePrimitiveExecution).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StatePrimitiveExecution))
       return false;
-    if (!this.o33_1.equals(other.o33_1))
+    if (!this.r33_1.equals(other.r33_1))
       return false;
     return true;
   };
   function exceptionalState($this, exception) {
-    return new StateException(exception, $this.r33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateException(exception, $this.u33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function StatePrimitiveSelection(context) {
     AbstractState.call(this, context);
-    this.r33_1 = context;
+    this.u33_1 = context;
   }
-  protoOf(StatePrimitiveSelection).h8 = function () {
-    return this.r33_1;
+  protoOf(StatePrimitiveSelection).i8 = function () {
+    return this.u33_1;
   };
-  protoOf(StatePrimitiveSelection).z31 = function () {
+  protoOf(StatePrimitiveSelection).c32 = function () {
     // Inline function 'kotlin.with' call
-    var $this$with = this.r33_1;
-    var goal = ensureNotNull($this$with.r30());
+    var $this$with = this.u33_1;
+    var goal = ensureNotNull($this$with.u30());
     var tmp;
-    if (goal.tu()) {
-      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.r33_1, extractSignature(ensureNotNull(this.r33_1.f2x_1)), goal.castToVar()));
-    } else if (goal.du()) {
+    if (goal.wu()) {
+      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.u33_1, extractSignature(ensureNotNull(this.u33_1.i2x_1)), goal.castToVar()));
+    } else if (goal.gu()) {
       var goalStruct = goal.castToStruct();
       var signature = extractSignature(goalStruct);
       var tmp_0;
-      if ($this$with.h2x_1.hasPrimitive(signature)) {
+      if ($this$with.k2x_1.hasPrimitive(signature)) {
         var childContext = createChild($this$with);
         var tmp_1;
         try {
-          var request = toRequest(childContext, goalStruct, signature, this.c32());
-          var tmp0_elvis_lhs = $this$with.h2x_1.b2d().h2(signature);
+          var request = toRequest(childContext, goalStruct, signature, this.f32());
+          var tmp0_elvis_lhs = $this$with.k2x_1.e2d().i2(signature);
           var tmp_2;
           if (tmp0_elvis_lhs == null) {
             // Inline function 'kotlin.error' call
@@ -2074,7 +2074,7 @@
           var tmp_3;
           if ($p instanceof ResolutionException) {
             var exception = $p;
-            tmp_3 = exceptionalState(this, exception.updateLastContext(this.j32(childContext)));
+            tmp_3 = exceptionalState(this, exception.updateLastContext(this.m32(childContext)));
           } else {
             throw $p;
           }
@@ -2082,106 +2082,106 @@
         }
         tmp_0 = tmp_1;
       } else {
-        tmp_0 = new StateRuleSelection(this.r33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f32()));
+        tmp_0 = new StateRuleSelection(this.u33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.i32()));
       }
       tmp = tmp_0;
     } else {
       var tmp_4 = Companion_instance_10;
-      var tmp1_safe_receiver = this.r33_1.f2x_1;
+      var tmp1_safe_receiver = this.u33_1.i2x_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : extractSignature(tmp1_safe_receiver);
-      tmp = exceptionalState(this, tmp_4.forGoal(this.r33_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
+      tmp = exceptionalState(this, tmp_4.forGoal(this.u33_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
     }
     return tmp;
   };
-  protoOf(StatePrimitiveSelection).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StatePrimitiveSelection).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StatePrimitiveSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StatePrimitiveSelection) ? $super : THROW_CCE());
   };
-  protoOf(StatePrimitiveSelection).n32 = function (context) {
+  protoOf(StatePrimitiveSelection).q32 = function (context) {
     return new StatePrimitiveSelection(context);
   };
   protoOf(StatePrimitiveSelection).toString = function () {
-    return 'StatePrimitiveSelection(context=' + this.r33_1.toString() + ')';
+    return 'StatePrimitiveSelection(context=' + this.u33_1.toString() + ')';
   };
   protoOf(StatePrimitiveSelection).hashCode = function () {
-    return this.r33_1.hashCode();
+    return this.u33_1.hashCode();
   };
   protoOf(StatePrimitiveSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StatePrimitiveSelection))
       return false;
-    if (!this.r33_1.equals(other.r33_1))
+    if (!this.u33_1.equals(other.u33_1))
       return false;
     return true;
   };
   function _get_failureState__yid9tw($this) {
-    return new StateBacktracking($this.u33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateBacktracking($this.x33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function StateRuleExecution(context) {
     AbstractState.call(this, context);
-    this.u33_1 = context;
+    this.x33_1 = context;
   }
-  protoOf(StateRuleExecution).h8 = function () {
-    return this.u33_1;
+  protoOf(StateRuleExecution).i8 = function () {
+    return this.x33_1;
   };
-  protoOf(StateRuleExecution).z31 = function () {
+  protoOf(StateRuleExecution).c32 = function () {
     // Inline function 'kotlin.with' call
-    var $this$with = this.u33_1;
-    var substitution = $this$with.g2x_1.mgu(ensureNotNull($this$with.r30()), ensureNotNull($this$with.s2x_1.ip()).dw());
+    var $this$with = this.x33_1;
+    var substitution = $this$with.j2x_1.mgu(ensureNotNull($this$with.u30()), ensureNotNull($this$with.v2x_1.lp()).gw());
     var tmp;
-    if (substitution.d10()) {
-      var newSubstitution = this.u33_1.p2x_1.plus(substitution).castToUnifier();
-      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.u33_1.s2x_1.ip()), newSubstitution).ew().getSubstituted(newSubstitution, []);
-      var tmp0_$this = this.u33_1;
+    if (substitution.g10()) {
+      var newSubstitution = this.x33_1.s2x_1.plus(substitution).castToUnifier();
+      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.x33_1.v2x_1.lp()), newSubstitution).hw().getSubstituted(newSubstitution, []);
+      var tmp0_$this = this.x33_1;
       var tmp1_goals = toGoals(subGoals);
       var tmp2_rules = Companion_instance_7.empty();
-      var tmp3_step = this.f32();
-      tmp = new StateGoalSelection(tmp0_$this.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, newSubstitution, VOID, tmp1_goals, tmp2_rules, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_step));
+      var tmp3_step = this.i32();
+      tmp = new StateGoalSelection(tmp0_$this.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, newSubstitution, VOID, tmp1_goals, tmp2_rules, VOID, VOID, VOID, VOID, VOID, VOID, tmp3_step));
     } else {
       tmp = _get_failureState__yid9tw(this);
     }
     return tmp;
   };
-  protoOf(StateRuleExecution).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StateRuleExecution).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StateRuleExecution).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateRuleExecution) ? $super : THROW_CCE());
   };
-  protoOf(StateRuleExecution).n32 = function (context) {
+  protoOf(StateRuleExecution).q32 = function (context) {
     return new StateRuleExecution(context);
   };
   protoOf(StateRuleExecution).toString = function () {
-    return 'StateRuleExecution(context=' + this.u33_1.toString() + ')';
+    return 'StateRuleExecution(context=' + this.x33_1.toString() + ')';
   };
   protoOf(StateRuleExecution).hashCode = function () {
-    return this.u33_1.hashCode();
+    return this.x33_1.hashCode();
   };
   protoOf(StateRuleExecution).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateRuleExecution))
       return false;
-    if (!this.u33_1.equals(other.u33_1))
+    if (!this.x33_1.equals(other.x33_1))
       return false;
     return true;
   };
   function None() {
     None_instance = this;
     CutLimit.call(this);
-    this.v33_1 = -1;
-    this.w33_1 = null;
+    this.y33_1 = -1;
+    this.z33_1 = null;
   }
-  protoOf(None).x33 = function () {
-    return this.v33_1;
+  protoOf(None).a34 = function () {
+    return this.y33_1;
   };
-  protoOf(None).j1u = function () {
-    return this.w33_1;
+  protoOf(None).m1u = function () {
+    return this.z33_1;
   };
-  protoOf(None).y33 = function () {
+  protoOf(None).b34 = function () {
     return true;
   };
   var None_instance;
@@ -2192,24 +2192,24 @@
   }
   function Actual(depthToCut, procedure) {
     CutLimit.call(this);
-    this.z33_1 = depthToCut;
-    this.a34_1 = procedure;
+    this.c34_1 = depthToCut;
+    this.d34_1 = procedure;
   }
-  protoOf(Actual).x33 = function () {
-    return this.z33_1;
+  protoOf(Actual).a34 = function () {
+    return this.c34_1;
   };
-  protoOf(Actual).j1u = function () {
-    return this.a34_1;
+  protoOf(Actual).m1u = function () {
+    return this.d34_1;
   };
   function CutLimit() {
   }
-  protoOf(CutLimit).y33 = function () {
+  protoOf(CutLimit).b34 = function () {
     return false;
   };
   function Companion_0() {
     Companion_instance_16 = this;
-    this.b34_1 = Catch_getInstance().signature;
-    this.c34_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
+    this.e34_1 = Catch_getInstance().signature;
+    this.f34_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
   }
   var Companion_instance_16;
   function Companion_getInstance_6() {
@@ -2218,15 +2218,15 @@
     return Companion_instance_16;
   }
   function _get_failureState__yid9tw_0($this) {
-    return new StateBacktracking($this.f34_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateBacktracking($this.i34_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function exceptionalState_0($this, exception) {
-    return new StateException(exception, $this.f34_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateException(exception, $this.i34_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function missingProcedure($this, ruleSources, missing) {
-    var unknown = $this.f34_1.i2x_1.get(Unknown_getInstance());
+    var unknown = $this.i34_1.l2x_1.get(Unknown_getInstance());
     var tmp;
-    if (equals(unknown, Unknown_getInstance().j28_1)) {
+    if (equals(unknown, Unknown_getInstance().m28_1)) {
       tmp = _get_failureState__yid9tw_0($this);
     } else {
       var tmp_0;
@@ -2245,12 +2245,12 @@
       }
       if (tmp$ret$0) {
         var tmp_1;
-        if (equals(unknown, Unknown_getInstance().h28_1)) {
-          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.f34_1, missing));
-        } else if (equals(unknown, Unknown_getInstance().i28_1)) {
+        if (equals(unknown, Unknown_getInstance().k28_1)) {
+          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.i34_1, missing));
+        } else if (equals(unknown, Unknown_getInstance().l28_1)) {
           // Inline function 'kotlin.also' call
           var this_0 = _get_failureState__yid9tw_0($this);
-          $this.f34_1.b1v().write(MissingPredicate_init_$Create$($this.f34_1, missing));
+          $this.i34_1.e1v().write(MissingPredicate_init_$Create$($this.i34_1, missing));
           tmp_1 = this_0;
         } else {
           tmp_1 = _get_failureState__yid9tw_0($this);
@@ -2264,26 +2264,26 @@
     return tmp;
   }
   function _get_ignoreState__t4wl8y($this) {
-    return new StateGoalSelection($this.f34_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f34_1.r2x_1.hp(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f32()));
+    return new StateGoalSelection($this.i34_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i34_1.u2x_1.kp(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.i32()));
   }
   function isCut($this, $receiver) {
-    return $receiver.st() && $receiver.castToAtom().e2() === '!';
+    return $receiver.vt() && $receiver.castToAtom().f2() === '!';
   }
   function computeCutLimit($this, $receiver, magicCut) {
     magicCut = magicCut === VOID ? false : magicCut;
     var tmp;
     if (magicCut) {
-      tmp = firstOrNull($receiver.b2y_1);
+      tmp = firstOrNull($receiver.e2y_1);
     } else {
-      var tmp0 = $receiver.b2y_1;
+      var tmp0 = $receiver.e2y_1;
       var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.sequences.firstOrNull' call
         var _iterator__ex2g4s = tmp0.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          var tmp_0 = Companion_getInstance_6().c34_1;
-          var tmp0_safe_receiver = element.f2x_1;
+          var tmp_0 = Companion_getInstance_6().f34_1;
+          var tmp0_safe_receiver = element.i2x_1;
           if (!contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver))) {
             tmp$ret$0 = element;
             break $l$block;
@@ -2298,21 +2298,21 @@
     if (cutLimit == null) {
       tmp_1 = None_getInstance();
     } else {
-      tmp_1 = new Actual(cutLimit.y2x_1, cutLimit.f2x_1);
+      tmp_1 = new Actual(cutLimit.b2y_1, cutLimit.i2x_1);
     }
     return tmp_1;
   }
   function cutCanBeSkipped($this, cutLimit, executionContext) {
-    return cutLimit.y33() || cutLimit.x33() > executionContext.y2x_1 || (cutLimit.x33() === executionContext.y2x_1 && !equals(cutLimit.j1u(), executionContext.f2x_1));
+    return cutLimit.b34() || cutLimit.a34() > executionContext.b2y_1 || (cutLimit.a34() === executionContext.b2y_1 && !equals(cutLimit.m1u(), executionContext.i2x_1));
   }
   function performCut($this, $receiver, cutLimit) {
     var tmp;
     if ($receiver === null) {
       tmp = null;
-    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull($receiver.r2y()))) {
+    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull($receiver.u2y()))) {
       tmp = $receiver;
     } else {
-      var tmp_0 = $receiver.e2z();
+      var tmp_0 = $receiver.h2z();
       var cutCandidates = filter(tmp_0, StateRuleSelection$performCut$lambda(cutLimit));
       var tmp_1;
       if (any(cutCandidates)) {
@@ -2322,7 +2322,7 @@
           var _iterator__ex2g4s = cutCandidates.n();
           while (_iterator__ex2g4s.q()) {
             var element = _iterator__ex2g4s.r();
-            if (ensureNotNull(element.r2y()).y2x_1 <= cutLimit.x33()) {
+            if (ensureNotNull(element.u2y()).b2y_1 <= cutLimit.a34()) {
               tmp$ret$0 = element;
               break $l$block;
             }
@@ -2330,7 +2330,7 @@
           tmp$ret$0 = null;
         }
         var tmp0_safe_receiver = tmp$ret$0;
-        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.s2y();
+        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2y();
       } else {
         tmp_1 = $receiver;
       }
@@ -2340,9 +2340,9 @@
   }
   function _get_isTailRecursive__h5eso7($this, $receiver) {
     var tmp;
-    if ($receiver.r2x_1.hp().kp() && equals($receiver.i2x_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().w27_1)) {
+    if ($receiver.u2x_1.kp().np() && equals($receiver.l2x_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().z27_1)) {
       // Inline function 'kotlin.let' call
-      var tmp0_safe_receiver = ensureNotNull($receiver.r30()).asStruct();
+      var tmp0_safe_receiver = ensureNotNull($receiver.u30()).asStruct();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver);
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2350,9 +2350,9 @@
       } else {
         // Inline function 'kotlin.let' call
         var tmp_1;
-        var tmp0_safe_receiver_0 = $receiver.f2x_1;
+        var tmp0_safe_receiver_0 = $receiver.i2x_1;
         if (tmp1_safe_receiver.equals(tmp0_safe_receiver_0 == null ? null : extractSignature(tmp0_safe_receiver_0))) {
-          tmp_1 = !tmp1_safe_receiver.equals(Companion_getInstance_6().b34_1);
+          tmp_1 = !tmp1_safe_receiver.equals(Companion_getInstance_6().e34_1);
         } else {
           tmp_1 = false;
         }
@@ -2370,7 +2370,7 @@
     // Inline function 'kotlin.let' call
     var it = ensureRules(map(tmp, StateRuleSelection$selectClauses$lambda));
     var tmp_0;
-    if ($receiver.h1s()) {
+    if ($receiver.k1s()) {
       tmp_0 = buffered(it);
     } else {
       tmp_0 = it;
@@ -2379,7 +2379,7 @@
   }
   function StateRuleSelection$performCut$lambda($cutLimit) {
     return function (it) {
-      return equals(ensureNotNull(it.r2y()).f2x_1, $cutLimit.j1u());
+      return equals(ensureNotNull(it.u2y()).i2x_1, $cutLimit.m1u());
     };
   }
   function StateRuleSelection$computeNext$lambda(this$0, $currentGoalStruct) {
@@ -2388,30 +2388,30 @@
     };
   }
   function StateRuleSelection$selectClauses$lambda(it) {
-    return it.au();
+    return it.du();
   }
   function StateRuleSelection(context) {
     Companion_getInstance_6();
     AbstractState.call(this, context);
-    this.f34_1 = context;
+    this.i34_1 = context;
   }
-  protoOf(StateRuleSelection).h8 = function () {
-    return this.f34_1;
+  protoOf(StateRuleSelection).i8 = function () {
+    return this.i34_1;
   };
-  protoOf(StateRuleSelection).z31 = function () {
-    var currentGoal = ensureNotNull(this.f34_1.r30());
+  protoOf(StateRuleSelection).c32 = function () {
+    var currentGoal = ensureNotNull(this.i34_1.u30());
     var tmp;
-    if (currentGoal.tu()) {
-      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.f34_1, extractSignature(ensureNotNull(this.f34_1.f2x_1)), currentGoal.castToVar()));
-    } else if (currentGoal.du()) {
+    if (currentGoal.wu()) {
+      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.i34_1, extractSignature(ensureNotNull(this.i34_1.i2x_1)), currentGoal.castToVar()));
+    } else if (currentGoal.gu()) {
       // Inline function 'kotlin.with' call
-      var $this$with = this.f34_1;
+      var $this$with = this.i34_1;
       var currentGoalStruct = currentGoal.castToStruct();
-      var ruleSources = sequenceOf([$this$with.h2x_1.asTheory($this$with.g2x_1), $this$with.j2x_1, $this$with.k2x_1]);
+      var ruleSources = sequenceOf([$this$with.k2x_1.asTheory($this$with.j2x_1), $this$with.m2x_1, $this$with.n2x_1]);
       var tmp_0;
-      if (currentGoalStruct.uu()) {
+      if (currentGoalStruct.xu()) {
         var tmp_1;
-        if (currentGoalStruct.vt()) {
+        if (currentGoalStruct.yt()) {
           tmp_1 = _get_ignoreState__t4wl8y(this);
         } else {
           tmp_1 = _get_failureState__yid9tw_0(this);
@@ -2422,7 +2422,7 @@
           var cutLimit = computeCutLimit(this, $this$with, currentGoalStruct instanceof MagicCut);
           // Inline function 'kotlin.let' call
           var it = _get_ignoreState__t4wl8y(this);
-          tmp_0 = it.n32(it.c33_1.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(this, it.c33_1.w2x_1, cutLimit)));
+          tmp_0 = it.q32(it.f33_1.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(this, it.f33_1.z2x_1, cutLimit)));
         } else {
           var tmp$ret$4;
           $l$block: {
@@ -2440,10 +2440,10 @@
           if (tmp$ret$4) {
             var rules = cursor(flatMap(ruleSources, StateRuleSelection$computeNext$lambda(this, currentGoalStruct)));
             var tmp_2;
-            if (_get_isTailRecursive__h5eso7(this, this.f34_1)) {
-              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.f34_1, rules));
+            if (_get_isTailRecursive__h5eso7(this, this.i34_1)) {
+              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.i34_1, rules));
             } else {
-              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.f34_1, rules));
+              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.i34_1, rules));
             }
             tmp_0 = tmp_2;
           } else {
@@ -2453,43 +2453,43 @@
       }
       tmp = tmp_0;
     } else {
-      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.f34_1, extractSignature(ensureNotNull(this.f34_1.f2x_1)), Expected_CALLABLE_getInstance(), currentGoal));
+      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.i34_1, extractSignature(ensureNotNull(this.i34_1.i2x_1)), Expected_CALLABLE_getInstance(), currentGoal));
     }
     return tmp;
   };
-  protoOf(StateRuleSelection).i32 = function (context) {
-    return this.n32(context);
+  protoOf(StateRuleSelection).l32 = function (context) {
+    return this.q32(context);
   };
   protoOf(StateRuleSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateRuleSelection) ? $super : THROW_CCE());
   };
-  protoOf(StateRuleSelection).n32 = function (context) {
+  protoOf(StateRuleSelection).q32 = function (context) {
     return new StateRuleSelection(context);
   };
   protoOf(StateRuleSelection).toString = function () {
-    return 'StateRuleSelection(context=' + this.f34_1.toString() + ')';
+    return 'StateRuleSelection(context=' + this.i34_1.toString() + ')';
   };
   protoOf(StateRuleSelection).hashCode = function () {
-    return this.f34_1.hashCode();
+    return this.i34_1.hashCode();
   };
   protoOf(StateRuleSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateRuleSelection))
       return false;
-    if (!this.f34_1.equals(other.f34_1))
+    if (!this.i34_1.equals(other.i34_1))
       return false;
     return true;
   };
   function appendRulesAndChoicePoints(_this__u8e3s4, rules) {
     var tmp;
-    if (rules.jp()) {
-      tmp = appendRules(_this__u8e3s4.w2x_1, rules.hp(), _this__u8e3s4);
+    if (rules.mp()) {
+      tmp = appendRules(_this__u8e3s4.z2x_1, rules.kp(), _this__u8e3s4);
     } else {
-      tmp = appendRules(_this__u8e3s4.w2x_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.z2x_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
   }
   function toGoals(_this__u8e3s4) {
     var tmp = unfoldGoals(_this__u8e3s4);
@@ -2497,8 +2497,8 @@
   }
   function unfoldGoals(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.iu()) {
-      var tmp_0 = _this__u8e3s4.castToTuple().ns();
+    if (_this__u8e3s4.lu()) {
+      var tmp_0 = _this__u8e3s4.castToTuple().qs();
       tmp = flatMap(tmp_0, unfoldGoals$lambda);
     } else {
       tmp = sequenceOf_0(_this__u8e3s4);
@@ -2507,28 +2507,28 @@
   }
   function createChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.r30()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.u30()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.f2x_1;
-    var tmp2_depth = _this__u8e3s4.y2x_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.i2x_1;
+    var tmp2_depth = _this__u8e3s4.b2y_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = _this__u8e3s4.z2x_1;
+    var this_0 = _this__u8e3s4.c2y_1;
     var tmp3_step = add(this_0, fromInt(1));
     var tmp4_relevantVariables = emptySet();
-    return _this__u8e3s4.w2y(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables);
+    return _this__u8e3s4.z2y(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, _this__u8e3s4, tmp2_depth, tmp3_step, tmp4_relevantVariables);
   }
   function toRequest(_this__u8e3s4, goal, signature, startTime) {
-    return new Request(signature, goal.yt(), _this__u8e3s4, startTime);
+    return new Request(signature, goal.bu(), _this__u8e3s4, startTime);
   }
   function appendPrimitivesAndChoicePoints(_this__u8e3s4, primitiveExecutions) {
     var tmp;
-    if (primitiveExecutions.jp()) {
-      tmp = appendPrimitives(_this__u8e3s4.w2x_1, primitiveExecutions.hp(), _this__u8e3s4);
+    if (primitiveExecutions.mp()) {
+      tmp = appendPrimitives(_this__u8e3s4.z2x_1, primitiveExecutions.kp(), _this__u8e3s4);
     } else {
-      tmp = appendPrimitives(_this__u8e3s4.w2x_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.z2x_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.w2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.z2y(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
   }
   function replaceWithChildAppendingRulesAndChoicePoints(_this__u8e3s4, rules, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
@@ -2545,17 +2545,17 @@
   }
   function replaceWithChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.r30()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.u30()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.f2x_1;
-    var tmp2_depth = _this__u8e3s4.y2x_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.i2x_1;
+    var tmp2_depth = _this__u8e3s4.b2y_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = _this__u8e3s4.z2x_1;
+    var this_0 = _this__u8e3s4.c2y_1;
     var tmp3_step = add(this_0, fromInt(1));
-    return _this__u8e3s4.w2y(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_depth, tmp3_step);
+    return _this__u8e3s4.z2y(tmp1_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_goals, VOID, VOID, VOID, VOID, VOID, VOID, tmp2_depth, tmp3_step);
   }
   function toGoals$lambda(it) {
-    return it.tu() ? Companion_getInstance_1().of('call', [it]) : it;
+    return it.wu() ? Companion_getInstance_1().of('call', [it]) : it;
   }
   function unfoldGoals$lambda(it) {
     return unfoldGoals(it);
@@ -2563,54 +2563,54 @@
   function ensureRules$lambda(it) {
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!it.fu()) {
+    if (!it.iu()) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     return it.castToRule();
   }
   function AbstractSolutionIterator(state) {
-    this.g34_1 = state;
-    this.h34_1 = 0n;
+    this.j34_1 = state;
+    this.k34_1 = 0n;
   }
   protoOf(AbstractSolutionIterator).q = function () {
     // Inline function 'kotlin.let' call
-    var it = this.g34_1;
-    return !it.g32() || it.castToEndState().d2z();
+    var it = this.j34_1;
+    return !it.j32() || it.castToEndState().g2z();
   };
   protoOf(AbstractSolutionIterator).r = function () {
     do {
-      var previousState = this.g34_1;
+      var previousState = this.j34_1;
       var tmp = this;
-      var tmp_0 = this.g34_1;
-      this.h34_1 = add(this.h34_1, get_ONE());
-      tmp.g34_1 = this.i34(tmp_0, this.h34_1);
-      this.onStateTransition(previousState, this.g34_1, this.h34_1);
+      var tmp_0 = this.j34_1;
+      this.k34_1 = add(this.k34_1, get_ONE());
+      tmp.j34_1 = this.l34(tmp_0, this.k34_1);
+      this.onStateTransition(previousState, this.j34_1, this.k34_1);
     }
-     while (!this.g34_1.g32());
-    return this.g34_1.castToEndState().j2h().cleanUp();
+     while (!this.j34_1.j32());
+    return this.j34_1.castToEndState().m2h().cleanUp();
   };
   function SimpleSolutionIterator(state, onStateTransitionCallback) {
     AbstractSolutionIterator.call(this, state);
-    this.l34_1 = onStateTransitionCallback;
+    this.o34_1 = onStateTransitionCallback;
   }
-  protoOf(SimpleSolutionIterator).i34 = function (state, step) {
+  protoOf(SimpleSolutionIterator).l34 = function (state, step) {
     return state.next();
   };
-  protoOf(SimpleSolutionIterator).m34 = function (source, destination, index) {
-    return this.l34_1(source, destination, index);
+  protoOf(SimpleSolutionIterator).p34 = function (source, destination, index) {
+    return this.o34_1(source, destination, index);
   };
   protoOf(SimpleSolutionIterator).onStateTransition = function (source, destination, index) {
-    return this.m34(source, destination, index);
+    return this.p34(source, destination, index);
   };
   function DefaultBuiltins() {
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, CommonBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).p2d = function () {
+  protoOf(DefaultBuiltins).s2d = function () {
     return listOf(Throw_getInstance());
   };
-  protoOf(DefaultBuiltins).o2d = function () {
+  protoOf(DefaultBuiltins).r2d = function () {
     return listOf_0([Catch_getInstance(), Call_getInstance(), Comma_getInstance(), Cut_getInstance(), Fail_getInstance(), Success_getInstance()]);
   };
   var DefaultBuiltins_instance;
@@ -2624,12 +2624,12 @@
     var tmp_0;
     var tmp_1;
     if (isInterface(error, Struct)) {
-      tmp_1 = error.xt() === 'error';
+      tmp_1 = error.au() === 'error';
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      var containsArg = error.rt();
+      var containsArg = error.ut();
       tmp_0 = 1 <= containsArg ? containsArg <= 2 : false;
     } else {
       tmp_0 = false;
@@ -2637,9 +2637,9 @@
     if (tmp_0) {
       var tmp_2 = Companion_instance_14;
       var tmp_3 = error.get(0);
-      tmp = tmp_2.of(VOID, VOID, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.rt() > 1 ? error.get(1) : null);
+      tmp = tmp_2.of(VOID, VOID, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.ut() > 1 ? error.get(1) : null);
     } else {
-      tmp = Companion_instance_13.r25(error, context);
+      tmp = Companion_instance_13.u25(error, context);
     }
     return tmp;
   }
@@ -2647,11 +2647,11 @@
     Throw_instance = this;
     UnaryPredicate.call(this, 'throw');
   }
-  protoOf(Throw).c2o = function (_this__u8e3s4, first) {
-    return sequenceOf_0(Companion_getInstance_4().p2e(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.x(0)), VOID, []));
+  protoOf(Throw).f2o = function (_this__u8e3s4, first) {
+    return sequenceOf_0(Companion_getInstance_4().s2e(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.x(0)), VOID, []));
   };
-  protoOf(Throw).c2i = function (_this__u8e3s4, first) {
-    return this.c2o(_this__u8e3s4, first);
+  protoOf(Throw).f2i = function (_this__u8e3s4, first) {
+    return this.f2o(_this__u8e3s4, first);
   };
   var Throw_instance;
   function Throw_getInstance() {
@@ -2663,10 +2663,10 @@
     Call_instance = this;
     RuleWrapper_init_$Init$('call', 1, VOID, this);
   }
-  protoOf(Call).g2i = function (_this__u8e3s4) {
+  protoOf(Call).j2i = function (_this__u8e3s4) {
     return listOf(_this__u8e3s4.varOf('G'));
   };
-  protoOf(Call).h2i = function (_this__u8e3s4) {
+  protoOf(Call).k2i = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = EnsureExecutable_getInstance().signature.name;
     return _this__u8e3s4.tupleOf([_this__u8e3s4.structOf(tmp$ret$0, [_this__u8e3s4.varOf('G')]), _this__u8e3s4.varOf('G')]);
@@ -2681,10 +2681,10 @@
     Catch_instance = this;
     RuleWrapper_init_$Init$('catch', 3, VOID, this);
   }
-  protoOf(Catch).g2i = function (_this__u8e3s4) {
+  protoOf(Catch).j2i = function (_this__u8e3s4) {
     return listOf_0([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
   };
-  protoOf(Catch).h2i = function (_this__u8e3s4) {
+  protoOf(Catch).k2i = function (_this__u8e3s4) {
     return _this__u8e3s4.varOf('G');
   };
   var Catch_instance;
@@ -2697,10 +2697,10 @@
     Comma_instance = this;
     RuleWrapper_init_$Init$(',', 2, VOID, this);
   }
-  protoOf(Comma).g2i = function (_this__u8e3s4) {
+  protoOf(Comma).j2i = function (_this__u8e3s4) {
     return listOf_0([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
-  protoOf(Comma).h2i = function (_this__u8e3s4) {
+  protoOf(Comma).k2i = function (_this__u8e3s4) {
     return _this__u8e3s4.tupleOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
   var Comma_instance;
@@ -2723,7 +2723,7 @@
     Fail_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Fail).h2i = function (_this__u8e3s4) {
+  protoOf(Fail).k2i = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = EnsureExecutable_getInstance().signature.name;
     var tmp = _this__u8e3s4.structOf(tmp$ret$0, [_this__u8e3s4.varOf('X')]);
@@ -2741,7 +2741,7 @@
     Success_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Success).h2i = function (_this__u8e3s4) {
+  protoOf(Success).k2i = function (_this__u8e3s4) {
     return _this__u8e3s4.truthOf(true);
   };
   var Success_instance;
@@ -2751,8 +2751,8 @@
     return Success_instance;
   }
   function Companion_1() {
-    this.m35_1 = '\\+';
-    this.n35_1 = 1;
+    this.p35_1 = '\\+';
+    this.q35_1 = 1;
   }
   var Companion_instance_17;
   function Companion_getInstance_7() {
@@ -2761,37 +2761,37 @@
   function NegationAsFailure() {
     RuleWrapper_init_$Init$('\\+', 1, VOID, this);
   }
-  protoOf(NegationAsFailure).g2i = function (_this__u8e3s4) {
+  protoOf(NegationAsFailure).j2i = function (_this__u8e3s4) {
     return listOf(_this__u8e3s4.varOf('X'));
   };
   //region block: post-declaration
   protoOf(ClassicExecutionContext).createSolver = createSolver;
   protoOf(ClassicExecutionContext).createMutableSolver = createMutableSolver;
   protoOf(ClassicExecutionContext).update = update;
-  protoOf(ClassicExecutionContext).y1u = get_standardInput;
-  protoOf(ClassicExecutionContext).z1u = get_standardOutput;
-  protoOf(ClassicExecutionContext).a1v = get_standardError;
-  protoOf(ClassicExecutionContext).b1v = get_warnings;
-  protoOf(ClassicExecutionContext).f1u = get_endTime;
-  protoOf(ClassicExecutionContext).h1u = get_remainingTime;
-  protoOf(ClassicExecutionContext).i1u = get_elapsedTime;
+  protoOf(ClassicExecutionContext).b1v = get_standardInput;
+  protoOf(ClassicExecutionContext).c1v = get_standardOutput;
+  protoOf(ClassicExecutionContext).d1v = get_standardError;
+  protoOf(ClassicExecutionContext).e1v = get_warnings;
+  protoOf(ClassicExecutionContext).i1u = get_endTime;
+  protoOf(ClassicExecutionContext).k1u = get_remainingTime;
+  protoOf(ClassicExecutionContext).l1u = get_elapsedTime;
   protoOf(ClassicSolverFactory).rawSolverOf = rawSolverOf;
   protoOf(ClassicSolverFactory).solverOf = solverOf;
   protoOf(ClassicSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ClassicSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ClassicSolverFactory).newBuilder = newBuilder;
-  protoOf(ClassicSolverFactory).z1w = get_defaultRuntime;
-  protoOf(ClassicSolverFactory).b1x = get_defaultUnificator;
-  protoOf(ClassicSolverFactory).c1x = get_defaultFlags;
-  protoOf(ClassicSolverFactory).f1x = get_defaultStaticKb;
-  protoOf(ClassicSolverFactory).g1x = get_defaultDynamicKb;
-  protoOf(ClassicSolverFactory).h1x = get_defaultInputChannel;
-  protoOf(ClassicSolverFactory).i1x = get_defaultOutputChannel;
-  protoOf(ClassicSolverFactory).j1x = get_defaultErrorChannel;
-  protoOf(ClassicSolverFactory).k1x = get_defaultWarningsChannel;
-  protoOf(ClassicSolverFactory).s1x = solverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).c1x = get_defaultRuntime;
+  protoOf(ClassicSolverFactory).e1x = get_defaultUnificator;
+  protoOf(ClassicSolverFactory).f1x = get_defaultFlags;
+  protoOf(ClassicSolverFactory).i1x = get_defaultStaticKb;
+  protoOf(ClassicSolverFactory).j1x = get_defaultDynamicKb;
+  protoOf(ClassicSolverFactory).k1x = get_defaultInputChannel;
+  protoOf(ClassicSolverFactory).l1x = get_defaultOutputChannel;
+  protoOf(ClassicSolverFactory).m1x = get_defaultErrorChannel;
+  protoOf(ClassicSolverFactory).n1x = get_defaultWarningsChannel;
+  protoOf(ClassicSolverFactory).v1x = solverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ClassicSolverFactory).u1x = mutableSolverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).x1x = mutableSolverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
   protoOf(MutableClassicSolver).loadStaticClauses = loadStaticClauses;
   protoOf(MutableClassicSolver).loadStaticClausesIterable = loadStaticClausesIterable;
@@ -2799,13 +2799,13 @@
   protoOf(MutableClassicSolver).loadDynamicClauses = loadDynamicClauses;
   protoOf(MutableClassicSolver).loadDynamicClausesIterable = loadDynamicClausesIterable;
   protoOf(MutableClassicSolver).loadDynamicClausesSequence = loadDynamicClausesSequence;
-  protoOf(AbstractState).g32 = get_isEndState;
+  protoOf(AbstractState).j32 = get_isEndState;
   protoOf(AbstractState).asEndState = asEndState;
   protoOf(AbstractState).castToEndState = castToEndState;
   protoOf(AbstractState).clone = clone;
-  protoOf(AbstractEndState).g32 = get_isEndState_0;
-  protoOf(AbstractEndState).h32 = asEndState_0;
-  protoOf(AbstractEndState).d2z = get_hasOpenAlternatives;
+  protoOf(AbstractEndState).j32 = get_isEndState_0;
+  protoOf(AbstractEndState).k32 = asEndState_0;
+  protoOf(AbstractEndState).g2z = get_hasOpenAlternatives;
   //endregion
   //region block: init
   ClassicSolverFactory_instance = new ClassicSolverFactory();