@tuprolog/2p-full 1.1.4 → 1.3.1

package/2p-solve-classic.js

@@ -30,63 +30,64 @@
   var imul = Math.imul;
   var Companion_getInstance = kotlin_it_unibo_tuprolog_unify.$_$.a;
   var VOID = kotlin_kotlin.$_$.b;
-  var Companion_instance = kotlin_it_unibo_tuprolog_solve.$_$.i1;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_solve.$_$.d1;
+  var Companion_instance = kotlin_it_unibo_tuprolog_solve.$_$.q;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_solve.$_$.l;
   var Companion_instance_0 = kotlin_it_unibo_tuprolog_theory.$_$.b;
   var Companion_instance_1 = kotlin_it_unibo_tuprolog_theory.$_$.a;
-  var Companion_instance_2 = kotlin_it_unibo_tuprolog_solve.$_$.s;
-  var Companion_instance_3 = kotlin_it_unibo_tuprolog_solve.$_$.u;
-  var Companion_instance_4 = kotlin_it_unibo_tuprolog_solve.$_$.t;
-  var Companion_instance_5 = kotlin_it_unibo_tuprolog_solve.$_$.v;
-  var toString = kotlin_kotlin.$_$.n6;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
-  var Unit_instance = kotlin_kotlin.$_$.k1;
+  var Companion_instance_2 = kotlin_it_unibo_tuprolog_solve.$_$.a;
+  var Companion_instance_3 = kotlin_it_unibo_tuprolog_solve.$_$.c;
+  var Companion_instance_4 = kotlin_it_unibo_tuprolog_solve.$_$.b;
+  var Companion_instance_5 = kotlin_it_unibo_tuprolog_solve.$_$.d;
+  var toString = kotlin_kotlin.$_$.s6;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.b1;
+  var Unit_instance = kotlin_kotlin.$_$.m;
+  var constructCallableReference = kotlin_kotlin.$_$.r5;
   var AbstractSolver = kotlin_it_unibo_tuprolog_solve.$_$.u1;
-  var protoOf = kotlin_kotlin.$_$.k6;
-  var THROW_CCE = kotlin_kotlin.$_$.ea;
-  var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.ma;
+  var protoOf = kotlin_kotlin.$_$.p6;
+  var THROW_CCE = kotlin_kotlin.$_$.na;
+  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.$_$.h7;
-  var initMetadataForClass = kotlin_kotlin.$_$.t5;
-  var ensureNotNull = kotlin_kotlin.$_$.ha;
-  var fromInt = kotlin_kotlin.$_$.s4;
-  var add = kotlin_kotlin.$_$.n4;
-  var hashCode = kotlin_kotlin.$_$.s5;
-  var equals = kotlin_kotlin.$_$.m5;
-  var CoroutineImpl = kotlin_kotlin.$_$.k4;
-  var SequenceScope = kotlin_kotlin.$_$.d7;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.j4;
-  var initMetadataForLambda = kotlin_kotlin.$_$.x5;
-  var sequence = kotlin_kotlin.$_$.k8;
-  var toString_0 = kotlin_kotlin.$_$.oa;
-  var asSequence_0 = kotlin_kotlin.$_$.w1;
-  var emptySequence = kotlin_kotlin.$_$.m7;
-  var plus = kotlin_kotlin.$_$.g8;
-  var KProperty1 = kotlin_kotlin.$_$.c7;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.q5;
-  var flatMap = kotlin_kotlin.$_$.t7;
-  var distinct = kotlin_kotlin.$_$.k7;
+  var asSequence = kotlin_kotlin.$_$.m7;
+  var initMetadataForClass = kotlin_kotlin.$_$.a6;
+  var ensureNotNull = kotlin_kotlin.$_$.ra;
+  var fromInt = kotlin_kotlin.$_$.y4;
+  var add = kotlin_kotlin.$_$.t4;
+  var hashCode = kotlin_kotlin.$_$.z5;
+  var equals = kotlin_kotlin.$_$.t5;
+  var CoroutineImpl = kotlin_kotlin.$_$.p4;
+  var SequenceScope = kotlin_kotlin.$_$.i7;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.o4;
+  var initMetadataForLambda = kotlin_kotlin.$_$.e6;
+  var sequence = kotlin_kotlin.$_$.p8;
+  var toString_0 = kotlin_kotlin.$_$.xa;
+  var asSequence_0 = kotlin_kotlin.$_$.a2;
+  var emptySequence = kotlin_kotlin.$_$.r7;
+  var plus = kotlin_kotlin.$_$.l8;
+  var KProperty1 = kotlin_kotlin.$_$.h7;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.x5;
+  var flatMap = kotlin_kotlin.$_$.y7;
+  var distinct = kotlin_kotlin.$_$.p7;
   var cached = kotlin_it_unibo_tuprolog_utils.$_$.r;
-  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.u;
-  var filter = kotlin_kotlin.$_$.q7;
-  var map = kotlin_kotlin.$_$.c8;
-  var toList = kotlin_kotlin.$_$.q8;
-  var Companion_instance_6 = kotlin_it_unibo_tuprolog_solve.$_$.w;
-  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.v;
-  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.x;
+  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.o;
+  var filter = kotlin_kotlin.$_$.v7;
+  var map = kotlin_kotlin.$_$.h8;
+  var toList = kotlin_kotlin.$_$.v8;
+  var Companion_instance_6 = kotlin_it_unibo_tuprolog_solve.$_$.e;
+  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.p;
+  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.r;
   var Companion_instance_7 = kotlin_it_unibo_tuprolog_utils.$_$.c;
-  var emptySet = kotlin_kotlin.$_$.j2;
-  var lazy = kotlin_kotlin.$_$.ja;
-  var contains = kotlin_kotlin.$_$.i7;
-  var createSolver = kotlin_it_unibo_tuprolog_solve.$_$.c;
-  var createMutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.b;
-  var update = kotlin_it_unibo_tuprolog_solve.$_$.d;
+  var emptySet = kotlin_kotlin.$_$.n2;
+  var lazy = kotlin_kotlin.$_$.ta;
+  var contains = kotlin_kotlin.$_$.n7;
+  var createSolver = kotlin_it_unibo_tuprolog_solve.$_$.z;
+  var createMutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.y;
+  var update = kotlin_it_unibo_tuprolog_solve.$_$.a1;
   var apply = kotlin_it_unibo_tuprolog_solve.$_$.l2;
   var applyIterable = kotlin_it_unibo_tuprolog_solve.$_$.k2;
   var applySequence = kotlin_it_unibo_tuprolog_solve.$_$.m2;
-  var getBigIntHashCode = kotlin_kotlin.$_$.n5;
+  var getBigIntHashCode = kotlin_kotlin.$_$.u5;
   var get_standardInput = kotlin_it_unibo_tuprolog_solve.$_$.o2;
   var get_standardOutput = kotlin_it_unibo_tuprolog_solve.$_$.p2;
   var get_standardError = kotlin_it_unibo_tuprolog_solve.$_$.n2;
@@ -95,11 +96,11 @@
   var get_remainingTime = kotlin_it_unibo_tuprolog_solve.$_$.j2;
   var get_elapsedTime = kotlin_it_unibo_tuprolog_solve.$_$.h2;
   var ExecutionContext = kotlin_it_unibo_tuprolog_solve.$_$.r2;
-  var objectCreate = kotlin_kotlin.$_$.j6;
-  var rawSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.j;
-  var solverOf = kotlin_it_unibo_tuprolog_solve.$_$.i;
-  var mutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.f;
-  var rawMutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.g;
+  var objectCreate = kotlin_kotlin.$_$.o6;
+  var rawSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.g1;
+  var solverOf = kotlin_it_unibo_tuprolog_solve.$_$.f1;
+  var mutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.c1;
+  var rawMutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.d1;
   var newBuilder = kotlin_it_unibo_tuprolog_solve.$_$.w3;
   var get_defaultRuntime = kotlin_it_unibo_tuprolog_solve.$_$.r3;
   var get_defaultUnificator = kotlin_it_unibo_tuprolog_solve.$_$.t3;
@@ -111,15 +112,15 @@
   var get_defaultErrorChannel = kotlin_it_unibo_tuprolog_solve.$_$.n3;
   var get_defaultWarningsChannel = kotlin_it_unibo_tuprolog_solve.$_$.u3;
   var solverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.x3;
-  var solverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.k;
+  var solverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.h1;
   var mutableSolverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.v3;
-  var mutableSolverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.h;
+  var mutableSolverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.e1;
   var SolverFactory = kotlin_it_unibo_tuprolog_solve.$_$.y3;
-  var initMetadataForObject = kotlin_kotlin.$_$.y5;
-  var defineProp = kotlin_kotlin.$_$.l5;
-  var listOf = kotlin_kotlin.$_$.x2;
+  var initMetadataForObject = kotlin_kotlin.$_$.f6;
+  var defineProp = kotlin_kotlin.$_$.s5;
+  var listOf = kotlin_kotlin.$_$.b3;
   var getAllOperators_0 = kotlin_it_unibo_tuprolog_solve.$_$.d4;
-  var to = kotlin_kotlin.$_$.pa;
+  var to = kotlin_kotlin.$_$.ya;
   var loadStaticClauses = kotlin_it_unibo_tuprolog_solve.$_$.v2;
   var loadStaticClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.w2;
   var loadStaticClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.x2;
@@ -127,61 +128,61 @@
   var loadDynamicClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.s2;
   var loadDynamicClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.t2;
   var MutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.y2;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.u5;
-  var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.w;
-  var subtract = kotlin_kotlin.$_$.a5;
-  var TimeOutException_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.o;
-  var NoSuchElementException_init_$Create$_0 = kotlin_kotlin.$_$.x;
-  var initMetadataForInterface = kotlin_kotlin.$_$.w5;
-  var getKClass = kotlin_kotlin.$_$.b7;
-  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.o;
-  var Companion_instance_8 = kotlin_it_unibo_tuprolog_solve.$_$.n1;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.b6;
+  var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.h1;
+  var subtract = kotlin_kotlin.$_$.g5;
+  var TimeOutException_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.l1;
+  var NoSuchElementException_init_$Create$_0 = kotlin_kotlin.$_$.i1;
+  var initMetadataForInterface = kotlin_kotlin.$_$.d6;
+  var getKClass = kotlin_kotlin.$_$.g7;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.z;
+  var Companion_instance_8 = kotlin_it_unibo_tuprolog_solve.$_$.v;
   var MessageError = kotlin_it_unibo_tuprolog_solve.$_$.p1;
-  var Companion_instance_9 = kotlin_it_unibo_tuprolog_solve.$_$.a1;
+  var Companion_instance_9 = kotlin_it_unibo_tuprolog_solve.$_$.i;
   var plus_0 = kotlin_it_unibo_tuprolog_utils.$_$.h1;
   var LogicError = kotlin_it_unibo_tuprolog_solve.$_$.r1;
-  var toSet = kotlin_kotlin.$_$.s8;
-  var plus_1 = kotlin_kotlin.$_$.n3;
-  var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.f1;
-  var drop = kotlin_kotlin.$_$.l7;
-  var first = kotlin_kotlin.$_$.s7;
+  var toSet = kotlin_kotlin.$_$.x8;
+  var plus_1 = kotlin_kotlin.$_$.r3;
+  var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.n;
+  var drop = kotlin_kotlin.$_$.q7;
+  var first = kotlin_kotlin.$_$.x7;
   var Unifier = kotlin_it_unibo_tuprolog_core.$_$.q1;
-  var isInterface = kotlin_kotlin.$_$.c6;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.t;
+  var isInterface = kotlin_kotlin.$_$.j6;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.e1;
   var ResolutionException = kotlin_it_unibo_tuprolog_solve.$_$.s1;
-  var Companion_instance_10 = kotlin_it_unibo_tuprolog_solve.$_$.b1;
+  var Companion_instance_10 = kotlin_it_unibo_tuprolog_solve.$_$.j;
   var extractSignature = kotlin_it_unibo_tuprolog_solve.$_$.b4;
   var Signature = kotlin_it_unibo_tuprolog_solve.$_$.z2;
-  var Expected_CALLABLE_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.a;
+  var Expected_CALLABLE_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.x;
   var cursor = kotlin_it_unibo_tuprolog_utils.$_$.t;
-  var Companion_instance_11 = kotlin_it_unibo_tuprolog_solve.$_$.y;
+  var Companion_instance_11 = kotlin_it_unibo_tuprolog_solve.$_$.g;
   var prepareForExecutionWithUnifier = kotlin_it_unibo_tuprolog_core.$_$.t2;
-  var setOf = kotlin_kotlin.$_$.t3;
-  var Unknown_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.g1;
-  var MissingPredicate_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.m;
-  var Companion_instance_12 = kotlin_it_unibo_tuprolog_solve.$_$.x;
-  var contains_0 = kotlin_kotlin.$_$.a2;
-  var firstOrNull = kotlin_kotlin.$_$.r7;
-  var any = kotlin_kotlin.$_$.f7;
-  var LastCallOptimization_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.e1;
+  var setOf = kotlin_kotlin.$_$.x3;
+  var Unknown_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.o;
+  var MissingPredicate_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.j1;
+  var Companion_instance_12 = kotlin_it_unibo_tuprolog_solve.$_$.f;
+  var contains_0 = kotlin_kotlin.$_$.e2;
+  var firstOrNull = kotlin_kotlin.$_$.w7;
+  var any = kotlin_kotlin.$_$.k7;
+  var LastCallOptimization_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.m;
   var buffered = kotlin_it_unibo_tuprolog_utils.$_$.q;
-  var sequenceOf = kotlin_kotlin.$_$.i8;
+  var sequenceOf = kotlin_kotlin.$_$.n8;
   var MagicCut = kotlin_it_unibo_tuprolog_solve.$_$.g2;
-  var sequenceOf_0 = kotlin_kotlin.$_$.j8;
+  var sequenceOf_0 = kotlin_kotlin.$_$.o8;
   var Request = kotlin_it_unibo_tuprolog_solve.$_$.a2;
-  var get_ONE = kotlin_kotlin.$_$.m4;
+  var get_ONE = kotlin_kotlin.$_$.s4;
   var ExtensionLibrary = kotlin_it_unibo_tuprolog_solve.$_$.v1;
-  var CommonBuiltins_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.m1;
-  var listOf_0 = kotlin_kotlin.$_$.y2;
+  var CommonBuiltins_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.u;
+  var listOf_0 = kotlin_kotlin.$_$.c3;
   var Struct = kotlin_it_unibo_tuprolog_core.$_$.p1;
-  var Companion_instance_13 = kotlin_it_unibo_tuprolog_solve.$_$.z;
-  var Companion_instance_14 = kotlin_it_unibo_tuprolog_solve.$_$.c1;
+  var Companion_instance_13 = kotlin_it_unibo_tuprolog_solve.$_$.h;
+  var Companion_instance_14 = kotlin_it_unibo_tuprolog_solve.$_$.k;
   var UnaryPredicate = kotlin_it_unibo_tuprolog_solve.$_$.e2;
-  var Companion_getInstance_4 = kotlin_it_unibo_tuprolog_solve.$_$.j1;
+  var Companion_getInstance_4 = kotlin_it_unibo_tuprolog_solve.$_$.r;
   var RuleWrapper = kotlin_it_unibo_tuprolog_solve.$_$.f2;
-  var RuleWrapper_init_$Init$ = kotlin_it_unibo_tuprolog_solve.$_$.q;
-  var EnsureExecutable_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.l1;
-  var MagicCut_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.k1;
+  var RuleWrapper_init_$Init$ = kotlin_it_unibo_tuprolog_solve.$_$.n1;
+  var EnsureExecutable_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.t;
+  var MagicCut_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.s;
   //endregion
   //region block: pre-declaration
   initMetadataForClass(AbstractClassicSolver, 'AbstractClassicSolver', VOID, AbstractSolver);
@@ -193,7 +194,7 @@
   initMetadataForClass(ClassicExecutionContext, 'ClassicExecutionContext', VOID, VOID, [ExecutionContext]);
   initMetadataForClass(ClassicSolver, 'ClassicSolver', VOID, AbstractClassicSolver);
   initMetadataForObject(ClassicSolverFactory, 'ClassicSolverFactory', VOID, VOID, [SolverFactory]);
-  initMetadataForClass(MutableClassicSolver, 'MutableClassicSolver', VOID, ClassicSolver, [ClassicSolver, MutableSolver]);
+  initMetadataForClass(MutableClassicSolver, 'MutableClassicSolver', VOID, ClassicSolver, [MutableSolver]);
   initMetadataForCompanion(Companion);
   function get_isEndState() {
     return false;
@@ -213,12 +214,12 @@
   }
   function clone(context, $super) {
     context = context === VOID ? this.h8() : context;
-    return $super === VOID ? this.e30(context) : $super.e30.call(this, context);
+    return $super === VOID ? this.d30(context) : $super.d30.call(this, context);
   }
   initMetadataForInterface(State, 'State');
   initMetadataForClass(AbstractState, 'AbstractState', VOID, VOID, [State]);
   function get_hasOpenAlternatives() {
-    return this.f2f().n1t() && this.h8().z2w();
+    return this.e2f().m1t() && this.h8().y2w();
   }
   function get_isEndState_0() {
     return true;
@@ -227,15 +228,15 @@
     return this;
   }
   function asEndState_1() {
-    return this.d30();
+    return this.c30();
   }
   initMetadataForInterface(EndState, 'EndState', VOID, VOID, [State]);
-  initMetadataForClass(AbstractEndState, 'AbstractEndState', VOID, AbstractState, [AbstractState, EndState]);
+  initMetadataForClass(AbstractEndState, 'AbstractEndState', VOID, AbstractState, [EndState]);
   initMetadataForClass(StateBacktracking, 'StateBacktracking', VOID, AbstractState);
   initMetadataForClass(StateEnd, 'StateEnd', VOID, AbstractEndState);
-  initMetadataForClass(StateException, 'StateException', VOID, AbstractState, [AbstractState, State]);
+  initMetadataForClass(StateException, 'StateException', VOID, AbstractState, [State]);
   initMetadataForClass(StateGoalSelection, 'StateGoalSelection', VOID, AbstractState);
-  initMetadataForClass(StateHalt, 'StateHalt', VOID, AbstractEndState, [AbstractEndState, State]);
+  initMetadataForClass(StateHalt, 'StateHalt', VOID, AbstractEndState, [State]);
   initMetadataForClass(StateInit, 'StateInit', VOID, AbstractState);
   initMetadataForClass(StatePrimitiveExecution, 'StatePrimitiveExecution', VOID, AbstractState);
   initMetadataForClass(StatePrimitiveSelection, 'StatePrimitiveSelection', VOID, AbstractState);
@@ -259,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().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -269,29 +270,27 @@
     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.j1v(stdIn), Companion_instance_5.m1v(stdOut, stdErr, warnings), trustKb);
+    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.i1v(stdIn), Companion_instance_5.l1v(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().v2v_1 === index)) {
+    if (!(destination.h8().u2v_1 === index)) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    $this.c2w(destination.h8());
+    $this.b2w(destination.h8());
   }
   function AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(p0) {
-    var l = function (_this__u8e3s4, p0_0, p1) {
+    return constructCallableReference(function (p0_0, p1, p2) {
       var tmp0 = p0;
-      updateCurrentContextAfterStateTransition(tmp0, _this__u8e3s4, p0_0, p1);
+      updateCurrentContextAfterStateTransition(tmp0, p0_0, p1, p2);
       return Unit_instance;
-    };
-    l.callableName = 'updateCurrentContextAfterStateTransition';
-    return l;
+    }, 3, 0, 83, 'updateCurrentContextAfterStateTransition', [p0]);
   }
   function AbstractClassicSolver(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb) {
-    unificator = unificator === VOID ? Companion_getInstance().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -301,49 +300,52 @@
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractSolver.call(this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
   }
-  protoOf(AbstractClassicSolver).c2w = function (_set____db54di) {
-    this.b2w_1 = _set____db54di;
+  protoOf(AbstractClassicSolver).b2w = function (_set____db54di) {
+    this.a2w_1 = _set____db54di;
   };
-  protoOf(AbstractClassicSolver).c28 = function (_set____db54di) {
-    return this.c2w(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
+  protoOf(AbstractClassicSolver).b28 = function (_set____db54di) {
+    return this.b2w(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
   };
-  protoOf(AbstractClassicSolver).a28 = function () {
-    var tmp = this.b2w_1;
+  protoOf(AbstractClassicSolver).z27 = function () {
+    var tmp = this.a2w_1;
     if (!(tmp == null))
       return tmp;
     else {
       throwUninitializedPropertyAccessException('currentContext');
     }
   };
-  protoOf(AbstractClassicSolver).b28 = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
+  protoOf(AbstractClassicSolver).a28 = 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).i28 = function (goal, options) {
-    var tmp0_unificator = this.n1i();
-    var tmp1_libraries = this.k1s();
-    var tmp2_flags = this.l1s();
-    var tmp3_staticKb = this.m1s().toImmutableTheory();
-    var tmp4_dynamicKb = this.n1s().toMutableTheory();
-    var tmp5_operators = this.t1s();
-    var tmp6_inputChannels = this.o1s();
-    var tmp7_outputChannels = this.p1s();
-    var tmp8_customData = this.a28().k2v_1;
+  protoOf(AbstractClassicSolver).h28 = function (goal, options) {
+    var tmp0_unificator = this.m1i();
+    var tmp1_libraries = this.j1s();
+    var tmp2_flags = this.k1s();
+    var tmp3_staticKb = this.l1s().toImmutableTheory();
+    var tmp4_dynamicKb = this.m1s().toMutableTheory();
+    var tmp5_operators = this.s1s();
+    var tmp6_inputChannels = this.n1s();
+    var tmp7_outputChannels = this.o1s();
+    var tmp8_customData = this.z27().j2v_1;
     var tmp9_startTime = currentTimeInstant();
-    var tmp10_maxDuration = options.r1u();
-    this.c2w(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.a28());
-    return asSequence(this.d2w(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
+    var tmp10_maxDuration = options.q1u();
+    this.b2w(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.z27());
+    return asSequence(this.c2w(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.i2w_1 = alternatives;
-    this.j2w_1 = executionContext;
-    this.k2w_1 = parent;
-    this.l2w_1 = depth;
+    this.h2w_1 = alternatives;
+    this.i2w_1 = executionContext;
+    this.j2w_1 = parent;
+    this.k2w_1 = depth;
   }
+  protoOf(Primitives).l2w = function () {
+    return this.h2w_1;
+  };
   protoOf(Primitives).m2w = function () {
     return this.i2w_1;
   };
@@ -353,49 +355,46 @@
   protoOf(Primitives).o2w = function () {
     return this.k2w_1;
   };
-  protoOf(Primitives).p2w = function () {
-    return this.l2w_1;
-  };
   protoOf(Primitives).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Primitives).q2w = function () {
+  protoOf(Primitives).p2w = function () {
     return 'Primitives';
   };
-  protoOf(Primitives).r2w = function (context) {
-    var tmp0_$this = ensureNotNull(this.j2w_1);
-    var tmp1_primitives = this.i2w_1;
+  protoOf(Primitives).q2w = function (context) {
+    var tmp0_$this = ensureNotNull(this.i2w_1);
+    var tmp1_primitives = this.h2w_1;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = context.v2v_1;
+    var this_0 = context.u2v_1;
     var tmp2_step = add(this_0, fromInt(1));
-    var tmp3_startTime = context.q2v_1;
-    var tmp4_flags = context.e2v_1;
-    var tmp5_dynamicKb = context.g2v_1;
-    var tmp6_staticKb = context.f2v_1;
-    var tmp7_operators = context.h2v_1;
-    var tmp8_inputChannels = context.i2v_1;
-    var tmp9_outputChannels = context.j2v_1;
-    var tmp10_libraries = context.d2v_1;
-    var tmp11_customData = context.k2v_1.discardEphemeral();
-    var tempContext = tmp0_$this.s2w(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.t2w(this.i2w_1.jp(), tempContext);
-    return tempContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Primitives).u2w = function (alternatives, executionContext, parent, depth) {
+    var tmp3_startTime = context.p2v_1;
+    var tmp4_flags = context.d2v_1;
+    var tmp5_dynamicKb = context.f2v_1;
+    var tmp6_staticKb = context.e2v_1;
+    var tmp7_operators = context.g2v_1;
+    var tmp8_inputChannels = context.h2v_1;
+    var tmp9_outputChannels = context.i2v_1;
+    var tmp10_libraries = context.c2v_1;
+    var tmp11_customData = context.j2v_1.discardEphemeral();
+    var tempContext = tmp0_$this.r2w(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.s2w(this.h2w_1.hp(), tempContext);
+    return tempContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Primitives).t2w = function (alternatives, executionContext, parent, depth) {
     return new Primitives(alternatives, executionContext, parent, depth);
   };
-  protoOf(Primitives).t2w = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.i2w_1 : alternatives;
-    executionContext = executionContext === VOID ? this.j2w_1 : executionContext;
-    parent = parent === VOID ? this.k2w_1 : parent;
-    depth = depth === VOID ? this.l2w_1 : depth;
-    return $super === VOID ? this.u2w(alternatives, executionContext, parent, depth) : $super.u2w.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Primitives).s2w = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.h2w_1 : alternatives;
+    executionContext = executionContext === VOID ? this.i2w_1 : executionContext;
+    parent = parent === VOID ? this.j2w_1 : parent;
+    depth = depth === VOID ? this.k2w_1 : depth;
+    return $super === VOID ? this.t2w(alternatives, executionContext, parent, depth) : $super.t2w.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Primitives).hashCode = function () {
-    var result = hashCode(this.i2w_1);
-    result = imul(result, 31) + (this.j2w_1 == null ? 0 : this.j2w_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.k2w_1 == null ? 0 : hashCode(this.k2w_1)) | 0;
-    result = imul(result, 31) + this.l2w_1 | 0;
+    var result = hashCode(this.h2w_1);
+    result = imul(result, 31) + (this.i2w_1 == null ? 0 : this.i2w_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.j2w_1 == null ? 0 : hashCode(this.j2w_1)) | 0;
+    result = imul(result, 31) + this.k2w_1 | 0;
     return result;
   };
   protoOf(Primitives).equals = function (other) {
@@ -403,23 +402,26 @@
       return true;
     if (!(other instanceof Primitives))
       return false;
+    if (!equals(this.h2w_1, other.h2w_1))
+      return false;
     if (!equals(this.i2w_1, other.i2w_1))
       return false;
     if (!equals(this.j2w_1, other.j2w_1))
       return false;
-    if (!equals(this.k2w_1, other.k2w_1))
-      return false;
-    if (!(this.l2w_1 === other.l2w_1))
+    if (!(this.k2w_1 === other.k2w_1))
       return false;
     return true;
   };
   function Rules(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.h2x_1 = alternatives;
-    this.i2x_1 = executionContext;
-    this.j2x_1 = parent;
-    this.k2x_1 = depth;
+    this.g2x_1 = alternatives;
+    this.h2x_1 = executionContext;
+    this.i2x_1 = parent;
+    this.j2x_1 = depth;
   }
+  protoOf(Rules).l2w = function () {
+    return this.g2x_1;
+  };
   protoOf(Rules).m2w = function () {
     return this.h2x_1;
   };
@@ -429,49 +431,46 @@
   protoOf(Rules).o2w = function () {
     return this.j2x_1;
   };
-  protoOf(Rules).p2w = function () {
-    return this.k2x_1;
-  };
   protoOf(Rules).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Rules).q2w = function () {
+  protoOf(Rules).p2w = function () {
     return 'Rules';
   };
-  protoOf(Rules).r2w = function (context) {
-    var tmp0_$this = ensureNotNull(this.i2x_1);
-    var tmp1_rules = this.h2x_1;
+  protoOf(Rules).q2w = function (context) {
+    var tmp0_$this = ensureNotNull(this.h2x_1);
+    var tmp1_rules = this.g2x_1;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = context.v2v_1;
+    var this_0 = context.u2v_1;
     var tmp2_step = add(this_0, fromInt(1));
-    var tmp3_startTime = context.q2v_1;
-    var tmp4_flags = context.e2v_1;
-    var tmp5_dynamicKb = context.g2v_1;
-    var tmp6_staticKb = context.f2v_1;
-    var tmp7_operators = context.h2v_1;
-    var tmp8_inputChannels = context.i2v_1;
-    var tmp9_outputChannels = context.j2v_1;
-    var tmp10_libraries = context.d2v_1;
-    var tmp11_customData = context.k2v_1.discardEphemeral();
-    var tempContext = tmp0_$this.s2w(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.l2x(this.h2x_1.jp(), tempContext);
-    return tempContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Rules).m2x = function (alternatives, executionContext, parent, depth) {
+    var tmp3_startTime = context.p2v_1;
+    var tmp4_flags = context.d2v_1;
+    var tmp5_dynamicKb = context.f2v_1;
+    var tmp6_staticKb = context.e2v_1;
+    var tmp7_operators = context.g2v_1;
+    var tmp8_inputChannels = context.h2v_1;
+    var tmp9_outputChannels = context.i2v_1;
+    var tmp10_libraries = context.c2v_1;
+    var tmp11_customData = context.j2v_1.discardEphemeral();
+    var tempContext = tmp0_$this.r2w(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.k2x(this.g2x_1.hp(), tempContext);
+    return tempContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Rules).l2x = function (alternatives, executionContext, parent, depth) {
     return new Rules(alternatives, executionContext, parent, depth);
   };
-  protoOf(Rules).l2x = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.h2x_1 : alternatives;
-    executionContext = executionContext === VOID ? this.i2x_1 : executionContext;
-    parent = parent === VOID ? this.j2x_1 : parent;
-    depth = depth === VOID ? this.k2x_1 : depth;
-    return $super === VOID ? this.m2x(alternatives, executionContext, parent, depth) : $super.m2x.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Rules).k2x = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.g2x_1 : alternatives;
+    executionContext = executionContext === VOID ? this.h2x_1 : executionContext;
+    parent = parent === VOID ? this.i2x_1 : parent;
+    depth = depth === VOID ? this.j2x_1 : depth;
+    return $super === VOID ? this.l2x(alternatives, executionContext, parent, depth) : $super.l2x.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Rules).hashCode = function () {
-    var result = hashCode(this.h2x_1);
-    result = imul(result, 31) + (this.i2x_1 == null ? 0 : this.i2x_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.j2x_1 == null ? 0 : hashCode(this.j2x_1)) | 0;
-    result = imul(result, 31) + this.k2x_1 | 0;
+    var result = hashCode(this.g2x_1);
+    result = imul(result, 31) + (this.h2x_1 == null ? 0 : this.h2x_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.i2x_1 == null ? 0 : hashCode(this.i2x_1)) | 0;
+    result = imul(result, 31) + this.j2x_1 | 0;
     return result;
   };
   protoOf(Rules).equals = function (other) {
@@ -479,28 +478,28 @@
       return true;
     if (!(other instanceof Rules))
       return false;
+    if (!equals(this.g2x_1, other.g2x_1))
+      return false;
     if (!equals(this.h2x_1, other.h2x_1))
       return false;
     if (!equals(this.i2x_1, other.i2x_1))
       return false;
-    if (!equals(this.j2x_1, other.j2x_1))
-      return false;
-    if (!(this.k2x_1 === other.k2x_1))
+    if (!(this.j2x_1 === other.j2x_1))
       return false;
     return true;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation) {
-    this.v2x_1 = this$0;
+    this.u2x_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).y2x = function ($this$sequence, $completion) {
-    var tmp = this.z2x($this$sequence, $completion);
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).x2x = function ($this$sequence, $completion) {
+    var tmp = this.y2x($this$sequence, $completion);
     tmp.d8_1 = Unit_instance;
     tmp.e8_1 = null;
     return tmp.j8();
   };
   protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).a9 = function (p1, $completion) {
-    return this.y2x(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.x2x(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).j8 = function () {
     var suspendResult = this.d8_1;
@@ -510,24 +509,24 @@
         switch (tmp) {
           case 0:
             this.c8_1 = 4;
-            this.x2x_1 = this.v2x_1;
+            this.w2x_1 = this.u2x_1;
             this.b8_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.x2x_1 == null)) {
+            if (!!(this.w2x_1 == null)) {
               this.b8_1 = 3;
               continue $sm;
             }
 
             this.b8_1 = 2;
-            suspendResult = this.w2x_1.gd(ensureNotNull(this.x2x_1), this);
+            suspendResult = this.v2x_1.bd(ensureNotNull(this.w2x_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.x2x_1 = this.x2x_1.o2w();
+            this.w2x_1 = this.w2x_1.n2w();
             this.b8_1 = 1;
             continue $sm;
           case 3:
@@ -546,26 +545,27 @@
       }
      while (true);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).z2x = function ($this$sequence, completion) {
-    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.v2x_1, completion);
-    i.w2x_1 = $this$sequence;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).y2x = function ($this$sequence, completion) {
+    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.u2x_1, completion);
+    i.v2x_1 = $this$sequence;
     return i;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this$0, resultContinuation) {
     var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation);
-    var l = function ($this$sequence, $completion) {
-      return i.y2x($this$sequence, $completion);
-    };
-    l.$arity = 1;
-    return l;
+    return constructCallableReference(function ($this$sequence, $completion) {
+      return i.x2x($this$sequence, $completion);
+    }, 1);
   }
   function ChoicePointContext(alternatives, executionContext, parent, depth) {
     depth = depth === VOID ? 0 : depth;
-    this.v2w_1 = alternatives;
-    this.w2w_1 = executionContext;
-    this.x2w_1 = parent;
-    this.y2w_1 = depth;
+    this.u2w_1 = alternatives;
+    this.v2w_1 = executionContext;
+    this.w2w_1 = parent;
+    this.x2w_1 = depth;
   }
+  protoOf(ChoicePointContext).l2w = function () {
+    return this.u2w_1;
+  };
   protoOf(ChoicePointContext).m2w = function () {
     return this.v2w_1;
   };
@@ -575,84 +575,81 @@
   protoOf(ChoicePointContext).o2w = function () {
     return this.x2w_1;
   };
-  protoOf(ChoicePointContext).p2w = function () {
-    return this.y2w_1;
-  };
-  protoOf(ChoicePointContext).z2w = function () {
-    var tmp0 = this.a2x();
-    var tmp$ret$1;
+  protoOf(ChoicePointContext).y2w = function () {
+    var tmp0 = this.z2w();
+    var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.sequences.any' call
-      var _iterator__ex2g4s = tmp0.p();
-      while (_iterator__ex2g4s.s()) {
-        var element = _iterator__ex2g4s.t();
-        if (element.m2w().lp()) {
-          tmp$ret$1 = true;
+      var _iterator__ex2g4s = tmp0.n();
+      while (_iterator__ex2g4s.q()) {
+        var element = _iterator__ex2g4s.r();
+        if (element.l2w().jp()) {
+          tmp$ret$0 = true;
           break $l$block;
         }
       }
-      tmp$ret$1 = false;
+      tmp$ret$0 = false;
     }
-    return tmp$ret$1;
+    return tmp$ret$0;
   };
-  protoOf(ChoicePointContext).a2x = function () {
+  protoOf(ChoicePointContext).z2w = function () {
     return sequence(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this, null));
   };
-  protoOf(ChoicePointContext).b2x = function () {
-    var tmp0_safe_receiver = this.n2w();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u2v_1;
+  protoOf(ChoicePointContext).a2x = function () {
+    var tmp0_safe_receiver = this.m2w();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.t2v_1;
   };
-  protoOf(ChoicePointContext).c2x = function () {
-    var tmp0_safe_receiver = this.n2w();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2v_1;
+  protoOf(ChoicePointContext).b2x = function () {
+    var tmp0_safe_receiver = this.m2w();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2v_1;
   };
   protoOf(ChoicePointContext).toString = function () {
-    var tmp = this.q2w() + '(' + ('alternatives=' + toString(this.m2w()) + ', ');
+    var tmp = this.p2w() + '(' + ('alternatives=' + toString(this.l2w()) + ', ');
     var tmp_0;
-    if (this.n2w() === null) {
-      tmp_0 = 'executionContext=' + toString_0(this.n2w()) + ', ';
+    if (this.m2w() === null) {
+      tmp_0 = 'executionContext=' + toString_0(this.m2w()) + ', ';
     } else {
-      'executionContextDepth=' + this.b2x() + ', ';
-      tmp_0 = 'executionContextProcedure=' + toString_0(this.c2x()) + ', ';
+      'executionContextDepth=' + this.a2x() + ', ';
+      tmp_0 = 'executionContextProcedure=' + toString_0(this.b2x()) + ', ';
     }
-    return tmp + tmp_0 + ('depth=' + this.p2w()) + ')';
+    return tmp + tmp_0 + ('depth=' + this.o2w()) + ')';
   };
   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.p2w() + 1 | 0;
+    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.o2w() + 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.w2v_1);
-    var tmp0_safe_receiver = $this.n2v_1.kp();
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bu();
+    var tmp = asSequence_0($this.v2v_1);
+    var tmp0_safe_receiver = $this.m2v_1.ip();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zt();
     return plus(tmp, tmp1_elvis_lhs == null ? emptySequence() : tmp1_elvis_lhs);
   }
   function _get_interestingVariables__k6uw5o($this) {
-    var tmp0 = $this.z2v_1;
+    var tmp0 = $this.y2v_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('interestingVariables', 1, tmp, ClassicExecutionContext$_get_interestingVariables_$ref_xwa4zu(), null);
     return tmp0.e2();
   }
   function ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation) {
-    this.i2y_1 = this$0;
+    this.h2y_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).l2y = function ($this$sequence, $completion) {
-    var tmp = this.m2y($this$sequence, $completion);
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).k2y = function ($this$sequence, $completion) {
+    var tmp = this.l2y($this$sequence, $completion);
     tmp.d8_1 = Unit_instance;
     tmp.e8_1 = null;
     return tmp.j8();
   };
   protoOf(ClassicExecutionContext$pathToRoot$slambda).a9 = function (p1, $completion) {
-    return this.l2y(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.k2y(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ClassicExecutionContext$pathToRoot$slambda).j8 = function () {
     var suspendResult = this.d8_1;
@@ -662,24 +659,24 @@
         switch (tmp) {
           case 0:
             this.c8_1 = 4;
-            this.k2y_1 = this.i2y_1;
+            this.j2y_1 = this.h2y_1;
             this.b8_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.k2y_1 == null)) {
+            if (!!(this.j2y_1 == null)) {
               this.b8_1 = 3;
               continue $sm;
             }
 
             this.b8_1 = 2;
-            suspendResult = this.j2y_1.gd(this.k2y_1, this);
+            suspendResult = this.i2y_1.bd(this.j2y_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.k2y_1 = this.k2y_1.t2v_1;
+            this.j2y_1 = this.j2y_1.s2v_1;
             this.b8_1 = 1;
             continue $sm;
           case 3:
@@ -698,73 +695,71 @@
       }
      while (true);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).m2y = function ($this$sequence, completion) {
-    var i = new ClassicExecutionContext$pathToRoot$slambda(this.i2y_1, completion);
-    i.j2y_1 = $this$sequence;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).l2y = function ($this$sequence, completion) {
+    var i = new ClassicExecutionContext$pathToRoot$slambda(this.h2y_1, completion);
+    i.i2y_1 = $this$sequence;
     return i;
   };
   function ClassicExecutionContext$pathToRoot$slambda_0(this$0, resultContinuation) {
     var i = new ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation);
-    var l = function ($this$sequence, $completion) {
-      return i.l2y($this$sequence, $completion);
-    };
-    l.$arity = 1;
-    return l;
+    return constructCallableReference(function ($this$sequence, $completion) {
+      return i.k2y($this$sequence, $completion);
+    }, 1);
   }
   function ClassicExecutionContext$currentGoal$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.n2v_1.mp()) {
+      if (this$0.m2v_1.kp()) {
         tmp = null;
       } else {
-        var tmp0_safe_receiver = this$0.n2v_1.kp();
-        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.l2v_1);
+        var tmp0_safe_receiver = this$0.m2v_1.ip();
+        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.k2v_1);
       }
       return tmp;
     };
   }
   function ClassicExecutionContext$_get_currentGoal_$ref_ulveh3() {
-    return function (p0) {
-      return p0.n2y();
-    };
+    return constructCallableReference(function (p0) {
+      return p0.m2y();
+    }, 1, 0, 84);
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda$lambda(it) {
     return _get_locallyInterestingVariables__39cqti(it);
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda(this$0) {
     return function () {
-      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.m2v_1.bu());
-      return cached(distinct(plus(tmp, flatMap(this$0.x2v_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
+      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.l2v_1.zt());
+      return cached(distinct(plus(tmp, flatMap(this$0.w2v_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
     };
   }
   function ClassicExecutionContext$_get_interestingVariables_$ref_xwa4zu() {
-    return function (p0) {
+    return constructCallableReference(function (p0) {
       return _get_interestingVariables__k6uw5o(p0);
-    };
+    }, 1, 0, 85);
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda(it) {
-    return it.o2y();
+    return it.n2y();
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0) {
     return function (it) {
-      var tmp0_elvis_lhs = it.b2v_1;
-      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.m2v_1]) : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = it.a2v_1;
+      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.l2v_1]) : tmp0_elvis_lhs;
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda(this$0) {
     return function () {
-      var tmp = filter(this$0.x2v_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
+      var tmp = filter(this$0.w2v_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 function (p0) {
-      return p0.h1s();
-    };
+    return constructCallableReference(function (p0) {
+      return p0.g1s();
+    }, 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().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -774,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().qt_1 : query;
+    query = query === VOID ? Companion_getInstance_3().ot_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;
@@ -784,59 +779,62 @@
     depth = depth === VOID ? 0 : depth;
     step = step === VOID ? 0n : step;
     relevantVariables = relevantVariables === VOID ? emptySet() : relevantVariables;
-    this.b2v_1 = procedure;
-    this.c2v_1 = unificator;
-    this.d2v_1 = libraries;
-    this.e2v_1 = flags;
-    this.f2v_1 = staticKb;
-    this.g2v_1 = dynamicKb;
-    this.h2v_1 = operators;
-    this.i2v_1 = inputChannels;
-    this.j2v_1 = outputChannels;
-    this.k2v_1 = customData;
-    this.l2v_1 = substitution;
-    this.m2v_1 = query;
-    this.n2v_1 = goals;
-    this.o2v_1 = rules;
-    this.p2v_1 = primitives;
-    this.q2v_1 = startTime;
-    this.r2v_1 = maxDuration;
-    this.s2v_1 = choicePoints;
-    this.t2v_1 = parent;
-    this.u2v_1 = depth;
-    this.v2v_1 = step;
-    this.w2v_1 = relevantVariables;
+    this.a2v_1 = procedure;
+    this.b2v_1 = unificator;
+    this.c2v_1 = libraries;
+    this.d2v_1 = flags;
+    this.e2v_1 = staticKb;
+    this.f2v_1 = dynamicKb;
+    this.g2v_1 = operators;
+    this.h2v_1 = inputChannels;
+    this.i2v_1 = outputChannels;
+    this.j2v_1 = customData;
+    this.k2v_1 = substitution;
+    this.l2v_1 = query;
+    this.m2v_1 = goals;
+    this.n2v_1 = rules;
+    this.o2v_1 = primitives;
+    this.p2v_1 = startTime;
+    this.q2v_1 = maxDuration;
+    this.r2v_1 = choicePoints;
+    this.s2v_1 = parent;
+    this.t2v_1 = depth;
+    this.u2v_1 = step;
+    this.v2v_1 = relevantVariables;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(this.u2v_1 === 0 && this.t2v_1 == null || (this.u2v_1 > 0 && !(this.t2v_1 == null)))) {
+    if (!(this.t2v_1 === 0 && this.s2v_1 == null || (this.t2v_1 > 0 && !(this.s2v_1 == null)))) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!(this.q2v_1 >= 0n)) {
+    if (!(this.p2v_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.r2v_1 >= 0n)) {
+    if (!(this.q2v_1 >= 0n)) {
       var message_1 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     var tmp = this;
-    tmp.x2v_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
+    tmp.w2v_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
     var tmp_0 = this;
-    tmp_0.y2v_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
+    tmp_0.x2v_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.z2v_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
+    tmp_1.y2v_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
     var tmp_2 = this;
-    tmp_2.a2w_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
+    tmp_2.z2v_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
   }
-  protoOf(ClassicExecutionContext).f1s = function () {
+  protoOf(ClassicExecutionContext).e1s = function () {
+    return this.a2v_1;
+  };
+  protoOf(ClassicExecutionContext).m1i = function () {
     return this.b2v_1;
   };
-  protoOf(ClassicExecutionContext).n1i = function () {
+  protoOf(ClassicExecutionContext).j1s = function () {
     return this.c2v_1;
   };
   protoOf(ClassicExecutionContext).k1s = function () {
@@ -848,151 +846,148 @@
   protoOf(ClassicExecutionContext).m1s = function () {
     return this.f2v_1;
   };
-  protoOf(ClassicExecutionContext).n1s = function () {
+  protoOf(ClassicExecutionContext).s1s = function () {
     return this.g2v_1;
   };
-  protoOf(ClassicExecutionContext).t1s = function () {
+  protoOf(ClassicExecutionContext).n1s = function () {
     return this.h2v_1;
   };
   protoOf(ClassicExecutionContext).o1s = function () {
     return this.i2v_1;
   };
-  protoOf(ClassicExecutionContext).p1s = function () {
+  protoOf(ClassicExecutionContext).h1s = function () {
     return this.j2v_1;
   };
-  protoOf(ClassicExecutionContext).i1s = function () {
+  protoOf(ClassicExecutionContext).f1s = function () {
     return this.k2v_1;
   };
-  protoOf(ClassicExecutionContext).g1s = function () {
-    return this.l2v_1;
+  protoOf(ClassicExecutionContext).z1r = function () {
+    return this.p2v_1;
   };
-  protoOf(ClassicExecutionContext).a1s = function () {
+  protoOf(ClassicExecutionContext).b1s = function () {
     return this.q2v_1;
   };
-  protoOf(ClassicExecutionContext).c1s = function () {
-    return this.r2v_1;
-  };
-  protoOf(ClassicExecutionContext).p2y = function () {
-    return this.u2v_1 === 0;
+  protoOf(ClassicExecutionContext).o2y = function () {
+    return this.t2v_1 === 0;
   };
-  protoOf(ClassicExecutionContext).z2w = function () {
-    var tmp0_safe_receiver = this.s2v_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z2w();
+  protoOf(ClassicExecutionContext).y2w = function () {
+    var tmp0_safe_receiver = this.r2v_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.y2w();
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(ClassicExecutionContext).o2y = function () {
-    return this.t2v_1 == null || (this.u2v_1 - this.t2v_1.u2v_1 | 0) >= 1;
-  };
   protoOf(ClassicExecutionContext).n2y = function () {
-    var tmp0 = this.y2v_1;
+    return this.s2v_1 == null || (this.t2v_1 - this.s2v_1.t2v_1 | 0) >= 1;
+  };
+  protoOf(ClassicExecutionContext).m2y = function () {
+    var tmp0 = this.x2v_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('currentGoal', 1, tmp, ClassicExecutionContext$_get_currentGoal_$ref_ulveh3(), null);
     return tmp0.e2();
   };
-  protoOf(ClassicExecutionContext).q2y = function (variable) {
+  protoOf(ClassicExecutionContext).p2y = function (variable) {
     return contains(_get_interestingVariables__k6uw5o(this), variable);
   };
-  protoOf(ClassicExecutionContext).h1s = function () {
-    var tmp0 = this.a2w_1;
+  protoOf(ClassicExecutionContext).g1s = function () {
+    var tmp0 = this.z2v_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('logicStackTrace', 1, tmp, ClassicExecutionContext$_get_logicStackTrace_$ref_p35zx2(), null);
     return tmp0.e2();
   };
-  protoOf(ClassicExecutionContext).j1s = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).i1s = 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).q1s = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).p1s = 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).s1s = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
-    return this.s2w(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
+  protoOf(ClassicExecutionContext).r1s = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
+    return this.r2w(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).r2y = function (sideEffect) {
+  protoOf(ClassicExecutionContext).q2y = function (sideEffect) {
     var tmp = apply.call(this, sideEffect);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).apply = function (sideEffect) {
-    return this.r2y(sideEffect);
+    return this.q2y(sideEffect);
   };
-  protoOf(ClassicExecutionContext).s2y = function (sideEffects) {
+  protoOf(ClassicExecutionContext).r2y = function (sideEffects) {
     var tmp = applyIterable.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applyIterable = function (sideEffects) {
-    return this.s2y(sideEffects);
+    return this.r2y(sideEffects);
   };
-  protoOf(ClassicExecutionContext).t2y = function (sideEffects) {
+  protoOf(ClassicExecutionContext).s2y = function (sideEffects) {
     var tmp = applySequence.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applySequence = function (sideEffects) {
-    return this.t2y(sideEffects);
+    return this.s2y(sideEffects);
   };
   protoOf(ClassicExecutionContext).toString = function () {
-    return 'ClassicExecutionContext(' + ('step=' + this.v2v_1.toString() + ', ') + ('depth=' + this.u2v_1 + ', ') + ('substitution=' + toString(this.l2v_1) + ', ') + ('logicStackTrace=' + toString(this.h1s()) + ', ') + ('goals=' + toString(this.n2v_1) + ', ') + ('rules=' + toString(this.o2v_1) + ', ') + ('primitives=' + toString(this.p2v_1) + ', ') + ('startTime=' + this.q2v_1.toString() + ', ') + ('endTime=' + this.b1s().toString() + ', ') + ('maxDuration=' + this.r2v_1.toString() + ', ') + ('unificator=' + toString(this.c2v_1) + ', ') + ('choicePoints=' + toString_0(this.s2v_1)) + ')';
+    return 'ClassicExecutionContext(' + ('step=' + this.u2v_1.toString() + ', ') + ('depth=' + this.t2v_1 + ', ') + ('substitution=' + toString(this.k2v_1) + ', ') + ('logicStackTrace=' + toString(this.g1s()) + ', ') + ('goals=' + toString(this.m2v_1) + ', ') + ('rules=' + toString(this.n2v_1) + ', ') + ('primitives=' + toString(this.o2v_1) + ', ') + ('startTime=' + this.p2v_1.toString() + ', ') + ('endTime=' + this.a1s().toString() + ', ') + ('maxDuration=' + this.q2v_1.toString() + ', ') + ('unificator=' + toString(this.b2v_1) + ', ') + ('choicePoints=' + toString_0(this.r2v_1)) + ')';
   };
-  protoOf(ClassicExecutionContext).u2y = 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).t2y = 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).s2w = 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.b2v_1 : procedure;
-    unificator = unificator === VOID ? this.c2v_1 : unificator;
-    libraries = libraries === VOID ? this.d2v_1 : libraries;
-    flags = flags === VOID ? this.e2v_1 : flags;
-    staticKb = staticKb === VOID ? this.f2v_1 : staticKb;
-    dynamicKb = dynamicKb === VOID ? this.g2v_1 : dynamicKb;
-    operators = operators === VOID ? this.h2v_1 : operators;
-    inputChannels = inputChannels === VOID ? this.i2v_1 : inputChannels;
-    outputChannels = outputChannels === VOID ? this.j2v_1 : outputChannels;
-    customData = customData === VOID ? this.k2v_1 : customData;
-    substitution = substitution === VOID ? this.l2v_1 : substitution;
-    query = query === VOID ? this.m2v_1 : query;
-    goals = goals === VOID ? this.n2v_1 : goals;
-    rules = rules === VOID ? this.o2v_1 : rules;
-    primitives = primitives === VOID ? this.p2v_1 : primitives;
-    startTime = startTime === VOID ? this.q2v_1 : startTime;
-    maxDuration = maxDuration === VOID ? this.r2v_1 : maxDuration;
-    choicePoints = choicePoints === VOID ? this.s2v_1 : choicePoints;
-    parent = parent === VOID ? this.t2v_1 : parent;
-    depth = depth === VOID ? this.u2v_1 : depth;
-    step = step === VOID ? this.v2v_1 : step;
-    relevantVariables = relevantVariables === VOID ? this.w2v_1 : relevantVariables;
-    return $super === VOID ? this.u2y(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.u2y.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).r2w = 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.a2v_1 : procedure;
+    unificator = unificator === VOID ? this.b2v_1 : unificator;
+    libraries = libraries === VOID ? this.c2v_1 : libraries;
+    flags = flags === VOID ? this.d2v_1 : flags;
+    staticKb = staticKb === VOID ? this.e2v_1 : staticKb;
+    dynamicKb = dynamicKb === VOID ? this.f2v_1 : dynamicKb;
+    operators = operators === VOID ? this.g2v_1 : operators;
+    inputChannels = inputChannels === VOID ? this.h2v_1 : inputChannels;
+    outputChannels = outputChannels === VOID ? this.i2v_1 : outputChannels;
+    customData = customData === VOID ? this.j2v_1 : customData;
+    substitution = substitution === VOID ? this.k2v_1 : substitution;
+    query = query === VOID ? this.l2v_1 : query;
+    goals = goals === VOID ? this.m2v_1 : goals;
+    rules = rules === VOID ? this.n2v_1 : rules;
+    primitives = primitives === VOID ? this.o2v_1 : primitives;
+    startTime = startTime === VOID ? this.p2v_1 : startTime;
+    maxDuration = maxDuration === VOID ? this.q2v_1 : maxDuration;
+    choicePoints = choicePoints === VOID ? this.r2v_1 : choicePoints;
+    parent = parent === VOID ? this.s2v_1 : parent;
+    depth = depth === VOID ? this.t2v_1 : depth;
+    step = step === VOID ? this.u2v_1 : step;
+    relevantVariables = relevantVariables === VOID ? this.v2v_1 : relevantVariables;
+    return $super === VOID ? this.t2y(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.t2y.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.b2v_1 == null ? 0 : this.b2v_1.hashCode();
+    var result = this.a2v_1 == null ? 0 : this.a2v_1.hashCode();
+    result = imul(result, 31) + hashCode(this.b2v_1) | 0;
     result = imul(result, 31) + hashCode(this.c2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.d2v_1) | 0;
-    result = imul(result, 31) + this.e2v_1.hashCode() | 0;
+    result = imul(result, 31) + this.d2v_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.e2v_1) | 0;
     result = imul(result, 31) + hashCode(this.f2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.g2v_1) | 0;
-    result = imul(result, 31) + this.h2v_1.hashCode() | 0;
+    result = imul(result, 31) + this.g2v_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.h2v_1) | 0;
     result = imul(result, 31) + hashCode(this.i2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.j2v_1) | 0;
-    result = imul(result, 31) + this.k2v_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.l2v_1) | 0;
-    result = imul(result, 31) + this.m2v_1.hashCode() | 0;
+    result = imul(result, 31) + this.j2v_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.k2v_1) | 0;
+    result = imul(result, 31) + this.l2v_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.m2v_1) | 0;
     result = imul(result, 31) + hashCode(this.n2v_1) | 0;
     result = imul(result, 31) + hashCode(this.o2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.p2v_1) | 0;
+    result = imul(result, 31) + getBigIntHashCode(this.p2v_1) | 0;
     result = imul(result, 31) + getBigIntHashCode(this.q2v_1) | 0;
-    result = imul(result, 31) + getBigIntHashCode(this.r2v_1) | 0;
-    result = imul(result, 31) + (this.s2v_1 == null ? 0 : hashCode(this.s2v_1)) | 0;
-    result = imul(result, 31) + (this.t2v_1 == null ? 0 : this.t2v_1.hashCode()) | 0;
-    result = imul(result, 31) + this.u2v_1 | 0;
-    result = imul(result, 31) + getBigIntHashCode(this.v2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.w2v_1) | 0;
+    result = imul(result, 31) + (this.r2v_1 == null ? 0 : hashCode(this.r2v_1)) | 0;
+    result = imul(result, 31) + (this.s2v_1 == null ? 0 : this.s2v_1.hashCode()) | 0;
+    result = imul(result, 31) + this.t2v_1 | 0;
+    result = imul(result, 31) + getBigIntHashCode(this.u2v_1) | 0;
+    result = imul(result, 31) + hashCode(this.v2v_1) | 0;
     return result;
   };
   protoOf(ClassicExecutionContext).equals = function (other) {
@@ -1000,54 +995,54 @@
       return true;
     if (!(other instanceof ClassicExecutionContext))
       return false;
+    if (!equals(this.a2v_1, other.a2v_1))
+      return false;
     if (!equals(this.b2v_1, other.b2v_1))
       return false;
     if (!equals(this.c2v_1, other.c2v_1))
       return false;
-    if (!equals(this.d2v_1, other.d2v_1))
+    if (!this.d2v_1.equals(other.d2v_1))
       return false;
-    if (!this.e2v_1.equals(other.e2v_1))
+    if (!equals(this.e2v_1, other.e2v_1))
       return false;
     if (!equals(this.f2v_1, other.f2v_1))
       return false;
-    if (!equals(this.g2v_1, other.g2v_1))
+    if (!this.g2v_1.equals(other.g2v_1))
       return false;
-    if (!this.h2v_1.equals(other.h2v_1))
+    if (!equals(this.h2v_1, other.h2v_1))
       return false;
     if (!equals(this.i2v_1, other.i2v_1))
       return false;
-    if (!equals(this.j2v_1, other.j2v_1))
+    if (!this.j2v_1.equals(other.j2v_1))
       return false;
-    if (!this.k2v_1.equals(other.k2v_1))
+    if (!equals(this.k2v_1, other.k2v_1))
       return false;
-    if (!equals(this.l2v_1, other.l2v_1))
+    if (!this.l2v_1.equals(other.l2v_1))
       return false;
-    if (!this.m2v_1.equals(other.m2v_1))
+    if (!equals(this.m2v_1, other.m2v_1))
       return false;
     if (!equals(this.n2v_1, other.n2v_1))
       return false;
     if (!equals(this.o2v_1, other.o2v_1))
       return false;
-    if (!equals(this.p2v_1, other.p2v_1))
+    if (!(this.p2v_1 === other.p2v_1))
       return false;
     if (!(this.q2v_1 === other.q2v_1))
       return false;
-    if (!(this.r2v_1 === other.r2v_1))
+    if (!equals(this.r2v_1, other.r2v_1))
       return false;
     if (!equals(this.s2v_1, other.s2v_1))
       return false;
-    if (!equals(this.t2v_1, other.t2v_1))
+    if (!(this.t2v_1 === other.t2v_1))
       return false;
     if (!(this.u2v_1 === other.u2v_1))
       return false;
-    if (!(this.v2v_1 === other.v2v_1))
-      return false;
-    if (!equals(this.w2v_1, other.w2v_1))
+    if (!equals(this.v2v_1, other.v2v_1))
       return false;
     return true;
   };
   function ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -1063,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().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -1080,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).d2w = function (initialState, onStateTransition) {
-    return Companion_instance_15.w2y(initialState, onStateTransition);
+  protoOf(ClassicSolver).c2w = function (initialState, onStateTransition) {
+    return Companion_instance_15.v2y(initialState, onStateTransition);
   };
-  protoOf(ClassicSolver).b1t = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolver).a1t = 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).c1q = function () {
+  protoOf(ClassicSolver).b1q = function () {
     return this.copy();
   };
   protoOf(ClassicSolver).clone = function () {
-    return this.c1q();
+    return this.b1q();
   };
   function ClassicSolver() {
   }
   function ClassicSolverFactory() {
   }
-  protoOf(ClassicSolverFactory).w1u = function () {
+  protoOf(ClassicSolverFactory).v1u = function () {
     return DefaultBuiltins_getInstance();
   };
-  protoOf(ClassicSolverFactory).h1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).g1v = 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).n1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).m1v = 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).p1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).o1v = 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).r1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).q1v = 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) {
@@ -1131,7 +1126,7 @@
     return ClassicSolverFactory_instance;
   }
   function MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -1147,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().g1i() : unificator;
+    unificator = unificator === VOID ? Companion_getInstance().f1i() : 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;
@@ -1166,265 +1161,265 @@
   }
   function MutableClassicSolver$loadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.d2v_1.plusLibrary($library);
-      return $this$updateContext.s2w(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.h2v_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
+      var newRuntime = $this$updateContext.c2v_1.plusLibrary($library);
+      return $this$updateContext.r2w(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.g2v_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
     };
   }
   function MutableClassicSolver$unloadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.d2v_1.plusLibrary($library);
-      return $this$updateContext.s2w(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.f2v_1, $this$updateContext.g2v_1])));
+      var newRuntime = $this$updateContext.c2v_1.plusLibrary($library);
+      return $this$updateContext.r2w(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.e2v_1, $this$updateContext.f2v_1])));
     };
   }
   function MutableClassicSolver$setRuntime$lambda($libraries) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.f2v_1, $this$updateContext.g2v_1])));
+      return $this$updateContext.r2w(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.e2v_1, $this$updateContext.f2v_1])));
     };
   }
   function MutableClassicSolver$resetStaticKb$lambda($this$updateContext) {
-    return $this$updateContext.s2w(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.c2v_1), VOID, toOperatorSet(getAllOperators($this$updateContext.d2v_1, [$this$updateContext.g2v_1])));
+    return $this$updateContext.r2w(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.b2v_1), VOID, toOperatorSet(getAllOperators($this$updateContext.c2v_1, [$this$updateContext.f2v_1])));
   }
   function MutableClassicSolver$resetDynamicKb$lambda($this$updateContext) {
-    return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.c2v_1), toOperatorSet(getAllOperators($this$updateContext.d2v_1, [$this$updateContext.f2v_1])));
+    return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.b2v_1), toOperatorSet(getAllOperators($this$updateContext.c2v_1, [$this$updateContext.e2v_1])));
   }
   function MutableClassicSolver$assertA$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g2v_1.s1p($clause), $this$updateContext.h2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.f2v_1.r1p($clause), $this$updateContext.g2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertA$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g2v_1.r1q($fact));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.f2v_1.q1q($fact));
     };
   }
   function MutableClassicSolver$assertZ$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g2v_1.w1p($clause), $this$updateContext.h2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.f2v_1.v1p($clause), $this$updateContext.g2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertZ$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g2v_1.s1q($fact));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.f2v_1.r1q($fact));
     };
   }
   function MutableClassicSolver$retract$lambda($result, $clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $result.k1p().toMutableTheory(), $this$updateContext.h2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $result.j1p().toMutableTheory(), $this$updateContext.g2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$retract$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $result.k1p().toMutableTheory());
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $result.j1p().toMutableTheory());
     };
   }
   function MutableClassicSolver$retractAll$lambda($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $result.k1p().toMutableTheory(), $this$updateContext.h2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.k1p()))));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $result.j1p().toMutableTheory(), $this$updateContext.g2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.j1p()))));
     };
   }
   function MutableClassicSolver$retractAll$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, $result.k1p().toMutableTheory());
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, $result.j1p().toMutableTheory());
     };
   }
   function MutableClassicSolver$setFlag$lambda($name, $value) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, $this$updateContext.e2v_1.set($name, $value));
+      return $this$updateContext.r2w(VOID, VOID, VOID, $this$updateContext.d2v_1.set($name, $value));
     };
   }
   function MutableClassicSolver$setFlag$lambda_0($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, $this$updateContext.e2v_1.plusPair($flag));
+      return $this$updateContext.r2w(VOID, VOID, VOID, $this$updateContext.d2v_1.plusPair($flag));
     };
   }
   function MutableClassicSolver$setFlag$lambda_1($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, $this$updateContext.e2v_1.plusNotable($flag));
+      return $this$updateContext.r2w(VOID, VOID, VOID, $this$updateContext.d2v_1.plusNotable($flag));
     };
   }
   function MutableClassicSolver$setStandardInput$lambda($stdIn) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.i2v_1.plus(to('stdin', $stdIn)));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.h2v_1.plus(to('stdin', $stdIn)));
     };
   }
   function MutableClassicSolver$setStandardError$lambda($stdErr) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.j2v_1.plus(to('stderr', $stdErr)));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.i2v_1.plus(to('stderr', $stdErr)));
     };
   }
   function MutableClassicSolver$setStandardOutput$lambda($stdOut) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.j2v_1.plus(to('stdout', $stdOut)));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.i2v_1.plus(to('stdout', $stdOut)));
     };
   }
   function MutableClassicSolver$setWarnings$lambda($warnings) {
     return function ($this$updateContext) {
-      return $this$updateContext.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.f1w($this$updateContext.j2v_1, $warnings));
+      return $this$updateContext.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.e1w($this$updateContext.i2v_1, $warnings));
     };
   }
-  protoOf(MutableClassicSolver).y2y = function (library) {
-    this.z27(MutableClassicSolver$loadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).x2y = function (library) {
+    this.y27(MutableClassicSolver$loadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).loadLibrary = function (library) {
-    return this.y2y(library);
+    return this.x2y(library);
   };
-  protoOf(MutableClassicSolver).z2y = function (library) {
-    this.z27(MutableClassicSolver$unloadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).y2y = function (library) {
+    this.y27(MutableClassicSolver$unloadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).unloadLibrary = function (library) {
-    return this.z2y(library);
+    return this.y2y(library);
   };
-  protoOf(MutableClassicSolver).a2z = function (libraries) {
-    this.z27(MutableClassicSolver$setRuntime$lambda(libraries));
+  protoOf(MutableClassicSolver).z2y = function (libraries) {
+    this.y27(MutableClassicSolver$setRuntime$lambda(libraries));
   };
   protoOf(MutableClassicSolver).setLibraries = function (libraries) {
-    return this.a2z(libraries);
+    return this.z2y(libraries);
   };
-  protoOf(MutableClassicSolver).b2z = function (theory) {
-    this.d28(theory, VOID, false);
+  protoOf(MutableClassicSolver).a2z = function (theory) {
+    this.c28(theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadStaticKb = function (theory) {
-    return this.b2z(theory);
+    return this.a2z(theory);
   };
-  protoOf(MutableClassicSolver).c2z = function (theory) {
-    this.d28(theory);
+  protoOf(MutableClassicSolver).b2z = function (theory) {
+    this.c28(theory);
   };
   protoOf(MutableClassicSolver).appendStaticKb = function (theory) {
-    return this.c2z(theory);
+    return this.b2z(theory);
   };
-  protoOf(MutableClassicSolver).d2z = function () {
-    this.z27(MutableClassicSolver$resetStaticKb$lambda);
+  protoOf(MutableClassicSolver).c2z = function () {
+    this.y27(MutableClassicSolver$resetStaticKb$lambda);
   };
   protoOf(MutableClassicSolver).resetStaticKb = function () {
-    return this.d2z();
+    return this.c2z();
   };
-  protoOf(MutableClassicSolver).e2z = function (theory) {
-    this.d28(VOID, theory, VOID, false);
+  protoOf(MutableClassicSolver).d2z = function (theory) {
+    this.c28(VOID, theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadDynamicKb = function (theory) {
-    return this.e2z(theory);
+    return this.d2z(theory);
   };
-  protoOf(MutableClassicSolver).f2z = function (theory) {
-    this.d28(VOID, theory);
+  protoOf(MutableClassicSolver).e2z = function (theory) {
+    this.c28(VOID, theory);
   };
   protoOf(MutableClassicSolver).appendDynamicKb = function (theory) {
-    return this.f2z(theory);
+    return this.e2z(theory);
   };
-  protoOf(MutableClassicSolver).g2z = function () {
-    this.z27(MutableClassicSolver$resetDynamicKb$lambda);
+  protoOf(MutableClassicSolver).f2z = function () {
+    this.y27(MutableClassicSolver$resetDynamicKb$lambda);
   };
   protoOf(MutableClassicSolver).resetDynamicKb = function () {
-    return this.g2z();
+    return this.f2z();
   };
-  protoOf(MutableClassicSolver).z1j = function (clause) {
-    this.z27(MutableClassicSolver$assertA$lambda(clause));
+  protoOf(MutableClassicSolver).y1j = function (clause) {
+    this.y27(MutableClassicSolver$assertA$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertA = function (clause) {
-    return this.z1j(clause);
+    return this.y1j(clause);
   };
-  protoOf(MutableClassicSolver).h2z = function (fact) {
-    this.z27(MutableClassicSolver$assertA$lambda_0(fact));
+  protoOf(MutableClassicSolver).g2z = function (fact) {
+    this.y27(MutableClassicSolver$assertA$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertAFact = function (fact) {
-    return this.h2z(fact);
+    return this.g2z(fact);
   };
-  protoOf(MutableClassicSolver).a1j = function (clause) {
-    this.z27(MutableClassicSolver$assertZ$lambda(clause));
+  protoOf(MutableClassicSolver).z1i = function (clause) {
+    this.y27(MutableClassicSolver$assertZ$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertZ = function (clause) {
-    return this.a1j(clause);
+    return this.z1i(clause);
   };
-  protoOf(MutableClassicSolver).i2z = function (fact) {
-    this.z27(MutableClassicSolver$assertZ$lambda_0(fact));
+  protoOf(MutableClassicSolver).h2z = function (fact) {
+    this.y27(MutableClassicSolver$assertZ$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertZFact = function (fact) {
-    return this.i2z(fact);
+    return this.h2z(fact);
   };
-  protoOf(MutableClassicSolver).t1q = function (clause) {
-    var result = this.n1s().retract(clause);
-    this.z27(MutableClassicSolver$retract$lambda(result, clause));
+  protoOf(MutableClassicSolver).s1q = function (clause) {
+    var result = this.m1s().retract(clause);
+    this.y27(MutableClassicSolver$retract$lambda(result, clause));
     return result;
   };
   protoOf(MutableClassicSolver).retract = function (clause) {
-    return this.t1q(clause);
+    return this.s1q(clause);
   };
-  protoOf(MutableClassicSolver).u1q = function (fact) {
-    var result = this.n1s().retractByHead(fact);
-    this.z27(MutableClassicSolver$retract$lambda_0(result));
+  protoOf(MutableClassicSolver).t1q = function (fact) {
+    var result = this.m1s().retractByHead(fact);
+    this.y27(MutableClassicSolver$retract$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractByHead = function (fact) {
-    return this.u1q(fact);
+    return this.t1q(fact);
   };
-  protoOf(MutableClassicSolver).f1j = function (clause) {
-    var result = this.n1s().retractAll(clause);
-    this.z27(MutableClassicSolver$retractAll$lambda(result));
+  protoOf(MutableClassicSolver).e1j = function (clause) {
+    var result = this.m1s().retractAll(clause);
+    this.y27(MutableClassicSolver$retractAll$lambda(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAll = function (clause) {
-    return this.f1j(clause);
+    return this.e1j(clause);
   };
-  protoOf(MutableClassicSolver).j2z = function (fact) {
-    var result = this.n1s().retractAllByHead(fact);
-    this.z27(MutableClassicSolver$retractAll$lambda_0(result));
+  protoOf(MutableClassicSolver).i2z = function (fact) {
+    var result = this.m1s().retractAllByHead(fact);
+    this.y27(MutableClassicSolver$retractAll$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAllBeHead = function (fact) {
-    return this.j2z(fact);
+    return this.i2z(fact);
   };
-  protoOf(MutableClassicSolver).k2z = function (name, value) {
-    this.z27(MutableClassicSolver$setFlag$lambda(name, value));
+  protoOf(MutableClassicSolver).j2z = function (name, value) {
+    this.y27(MutableClassicSolver$setFlag$lambda(name, value));
   };
   protoOf(MutableClassicSolver).setFlag = function (name, value) {
-    return this.k2z(name, value);
+    return this.j2z(name, value);
   };
-  protoOf(MutableClassicSolver).l2z = function (flag) {
-    this.z27(MutableClassicSolver$setFlag$lambda_0(flag));
+  protoOf(MutableClassicSolver).k2z = function (flag) {
+    this.y27(MutableClassicSolver$setFlag$lambda_0(flag));
   };
   protoOf(MutableClassicSolver).setFlagPair = function (flag) {
-    return this.l2z(flag);
+    return this.k2z(flag);
   };
-  protoOf(MutableClassicSolver).m2z = function (flag) {
-    this.z27(MutableClassicSolver$setFlag$lambda_1(flag));
+  protoOf(MutableClassicSolver).l2z = function (flag) {
+    this.y27(MutableClassicSolver$setFlag$lambda_1(flag));
   };
   protoOf(MutableClassicSolver).setFlagNotable = function (flag) {
-    return this.m2z(flag);
+    return this.l2z(flag);
   };
-  protoOf(MutableClassicSolver).n2z = function (stdIn) {
-    this.z27(MutableClassicSolver$setStandardInput$lambda(stdIn));
+  protoOf(MutableClassicSolver).m2z = function (stdIn) {
+    this.y27(MutableClassicSolver$setStandardInput$lambda(stdIn));
   };
   protoOf(MutableClassicSolver).setStandardInput = function (stdIn) {
-    return this.n2z(stdIn);
+    return this.m2z(stdIn);
   };
-  protoOf(MutableClassicSolver).o2z = function (stdErr) {
-    this.z27(MutableClassicSolver$setStandardError$lambda(stdErr));
+  protoOf(MutableClassicSolver).n2z = function (stdErr) {
+    this.y27(MutableClassicSolver$setStandardError$lambda(stdErr));
   };
   protoOf(MutableClassicSolver).setStandardError = function (stdErr) {
-    return this.o2z(stdErr);
+    return this.n2z(stdErr);
   };
-  protoOf(MutableClassicSolver).p2z = function (stdOut) {
-    this.z27(MutableClassicSolver$setStandardOutput$lambda(stdOut));
+  protoOf(MutableClassicSolver).o2z = function (stdOut) {
+    this.y27(MutableClassicSolver$setStandardOutput$lambda(stdOut));
   };
   protoOf(MutableClassicSolver).setStandardOutput = function (stdOut) {
-    return this.p2z(stdOut);
+    return this.o2z(stdOut);
   };
-  protoOf(MutableClassicSolver).q2z = function (warnings) {
-    this.z27(MutableClassicSolver$setWarnings$lambda(warnings));
+  protoOf(MutableClassicSolver).p2z = function (warnings) {
+    this.y27(MutableClassicSolver$setWarnings$lambda(warnings));
   };
   protoOf(MutableClassicSolver).setWarnings = function (warnings) {
-    return this.q2z(warnings);
+    return this.p2z(warnings);
   };
-  protoOf(MutableClassicSolver).b1t = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(MutableClassicSolver).a1t = 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).c1q = function () {
+  protoOf(MutableClassicSolver).b1q = function () {
     return this.copy();
   };
   protoOf(MutableClassicSolver).clone = function () {
-    return this.c1q();
+    return this.b1q();
   };
   function MutableClassicSolver() {
   }
@@ -1433,7 +1428,7 @@
   }
   function Companion() {
   }
-  protoOf(Companion).w2y = function (initialState, onStateTransition) {
+  protoOf(Companion).v2y = function (initialState, onStateTransition) {
     return new SimpleSolutionIterator(initialState, onStateTransition);
   };
   protoOf(Companion).of = function (initialState, onStateTransition, $super) {
@@ -1444,7 +1439,7 @@
       tmp = onStateTransition;
     }
     onStateTransition = tmp;
-    return $super === VOID ? this.w2y(initialState, onStateTransition) : $super.w2y.call(this, initialState, onStateTransition);
+    return $super === VOID ? this.v2y(initialState, onStateTransition) : $super.v2y.call(this, initialState, onStateTransition);
   };
   var Companion_instance_15;
   function Companion_getInstance_5() {
@@ -1452,90 +1447,90 @@
   }
   function AbstractEndState(solution, context) {
     AbstractState.call(this, context);
-    this.t2z_1 = solution;
-    this.u2z_1 = context;
+    this.s2z_1 = solution;
+    this.t2z_1 = context;
   }
-  protoOf(AbstractEndState).f2f = function () {
-    return this.t2z_1;
+  protoOf(AbstractEndState).e2f = function () {
+    return this.s2z_1;
   };
   protoOf(AbstractEndState).h8 = function () {
-    return this.u2z_1;
+    return this.t2z_1;
   };
-  protoOf(AbstractEndState).v2z = function () {
+  protoOf(AbstractEndState).u2z = function () {
     throw NoSuchElementException_init_$Create$();
   };
   protoOf(AbstractEndState).asEndState = function () {
-    return this.d30();
+    return this.c30();
   };
   function AbstractState$executionTime$delegate$lambda(this$0) {
     return function () {
-      return this$0.a30();
+      return this$0.z2z();
     };
   }
   function AbstractState$_get_executionTime_$ref_gwd5wm() {
-    return function (p0) {
-      return p0.y2z();
-    };
+    return constructCallableReference(function (p0) {
+      return p0.x2z();
+    }, 1, 0, 87);
   }
   function AbstractState(context) {
-    this.w2z_1 = context;
+    this.v2z_1 = context;
     var tmp = this;
-    tmp.x2z_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
+    tmp.w2z_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
   }
   protoOf(AbstractState).h8 = function () {
-    return this.w2z_1;
+    return this.v2z_1;
   };
-  protoOf(AbstractState).y2z = function () {
-    var tmp0 = this.x2z_1;
+  protoOf(AbstractState).x2z = function () {
+    var tmp0 = this.w2z_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('executionTime', 1, tmp, AbstractState$_get_executionTime_$ref_gwd5wm(), null);
     return tmp0.e2();
   };
-  protoOf(AbstractState).z2z = function () {
-    return subtract(this.y2z(), this.h8().q2v_1) > this.h8().r2v_1;
+  protoOf(AbstractState).y2z = function () {
+    return subtract(this.x2z(), this.h8().p2v_1) > this.h8().q2v_1;
   };
-  protoOf(AbstractState).t = function () {
+  protoOf(AbstractState).r = function () {
     var tmp;
-    if (this.z2z()) {
-      var tmp0_exceededDuration = this.h8().r2v_1;
+    if (this.y2z()) {
+      var tmp0_exceededDuration = this.h8().q2v_1;
       var tmp1_context = this.h8();
-      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.h8().s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.h8().r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
     } else {
-      tmp = this.v2z();
+      tmp = this.u2z();
     }
     return tmp;
   };
   protoOf(AbstractState).next = function () {
-    return this.t();
+    return this.r();
   };
-  protoOf(AbstractState).a30 = function () {
+  protoOf(AbstractState).z2z = function () {
     return currentTimeInstant();
   };
-  protoOf(AbstractState).b30 = function () {
+  protoOf(AbstractState).a30 = function () {
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = this.h8().v2v_1;
+    var this_0 = this.h8().u2v_1;
     return add(this_0, fromInt(1));
   };
-  protoOf(AbstractState).f30 = function (_this__u8e3s4) {
-    var tmp0 = _this__u8e3s4.x2v_1;
-    var tmp$ret$2;
+  protoOf(AbstractState).e30 = function (_this__u8e3s4) {
+    var tmp0 = _this__u8e3s4.w2v_1;
+    var tmp$ret$0;
     $l$block: {
       // Inline function 'kotlin.sequences.first' call
-      var _iterator__ex2g4s = tmp0.p();
-      while (_iterator__ex2g4s.s()) {
-        var element = _iterator__ex2g4s.t();
-        var tmp0_safe_receiver = element.b2v_1;
-        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zt();
+      var _iterator__ex2g4s = tmp0.n();
+      while (_iterator__ex2g4s.q()) {
+        var element = _iterator__ex2g4s.r();
+        var tmp0_safe_receiver = element.a2v_1;
+        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xt();
         // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
         if (!(tmp === Throw_getInstance().signature.name)) {
-          tmp$ret$2 = element;
+          tmp$ret$0 = element;
           break $l$block;
         }
       }
       throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
     }
-    return tmp$ret$2;
+    return tmp$ret$0;
   };
   function EndState() {
   }
@@ -1543,36 +1538,36 @@
   }
   function StateBacktracking(context) {
     AbstractState.call(this, context);
-    this.i30_1 = context;
+    this.h30_1 = context;
   }
   protoOf(StateBacktracking).h8 = function () {
-    return this.i30_1;
+    return this.h30_1;
   };
-  protoOf(StateBacktracking).v2z = function () {
-    var choicePoints = this.i30_1.s2v_1;
+  protoOf(StateBacktracking).u2z = function () {
+    var choicePoints = this.h30_1.r2v_1;
     var tmp;
     // Inline function 'kotlin.let' call
-    if (choicePoints === null || !choicePoints.z2w()) {
-      tmp = new StateEnd(Companion_instance_8.no(this.i30_1.m2v_1), this.i30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+    if (choicePoints === null || !choicePoints.y2w()) {
+      tmp = new StateEnd(Companion_instance_8.no(this.h30_1.l2v_1), this.h30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
     } else {
-      var tmp0 = ensureNotNull(choicePoints).a2x();
-      var tmp$ret$3;
+      var tmp0 = ensureNotNull(choicePoints).z2w();
+      var tmp$ret$2;
       $l$block: {
         // Inline function 'kotlin.sequences.first' call
-        var _iterator__ex2g4s = tmp0.p();
-        while (_iterator__ex2g4s.s()) {
-          var element = _iterator__ex2g4s.t();
-          if (element.m2w().lp()) {
-            tmp$ret$3 = element;
+        var _iterator__ex2g4s = tmp0.n();
+        while (_iterator__ex2g4s.q()) {
+          var element = _iterator__ex2g4s.r();
+          if (element.l2w().jp()) {
+            tmp$ret$2 = element;
             break $l$block;
           }
         }
         throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
       }
-      var choicePointContext = tmp$ret$3;
-      var nextContext = choicePointContext.r2w(this.i30_1);
+      var choicePointContext = tmp$ret$2;
+      var nextContext = choicePointContext.q2w(this.h30_1);
       var tmp_0;
-      if (nextContext.p2v_1.lp()) {
+      if (nextContext.o2v_1.jp()) {
         tmp_0 = new StatePrimitiveExecution(nextContext);
       } else {
         tmp_0 = new StateRuleExecution(nextContext);
@@ -1581,71 +1576,71 @@
     }
     return tmp;
   };
-  protoOf(StateBacktracking).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StateBacktracking).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StateBacktracking).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateBacktracking) ? $super : THROW_CCE());
   };
-  protoOf(StateBacktracking).j30 = function (context) {
+  protoOf(StateBacktracking).i30 = function (context) {
     return new StateBacktracking(context);
   };
   protoOf(StateBacktracking).toString = function () {
-    return 'StateBacktracking(context=' + this.i30_1.toString() + ')';
+    return 'StateBacktracking(context=' + this.h30_1.toString() + ')';
   };
   protoOf(StateBacktracking).hashCode = function () {
-    return this.i30_1.hashCode();
+    return this.h30_1.hashCode();
   };
   protoOf(StateBacktracking).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateBacktracking))
       return false;
-    if (!this.i30_1.equals(other.i30_1))
+    if (!this.h30_1.equals(other.h30_1))
       return false;
     return true;
   };
   function StateEnd(solution, context) {
     AbstractEndState.call(this, solution, context);
-    this.o30_1 = solution;
-    this.p30_1 = context;
+    this.n30_1 = solution;
+    this.o30_1 = context;
   }
-  protoOf(StateEnd).f2f = function () {
-    return this.o30_1;
+  protoOf(StateEnd).e2f = function () {
+    return this.n30_1;
   };
   protoOf(StateEnd).h8 = function () {
-    return this.p30_1;
+    return this.o30_1;
   };
-  protoOf(StateEnd).z2z = function () {
+  protoOf(StateEnd).y2z = function () {
     return false;
   };
-  protoOf(StateEnd).v2z = function () {
+  protoOf(StateEnd).u2z = function () {
     var tmp;
-    if (this.p30_1.z2w()) {
-      var tmp0_$this = this.p30_1;
-      var tmp1_step = this.b30();
-      var tmp2_startTime = this.a30();
-      tmp = new StateBacktracking(tmp0_$this.s2w(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.o30_1.y2w()) {
+      var tmp0_$this = this.o30_1;
+      var tmp1_step = this.a30();
+      var tmp2_startTime = this.z2z();
+      tmp = new StateBacktracking(tmp0_$this.r2w(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).v2z.call(this);
+      tmp = protoOf(AbstractEndState).u2z.call(this);
     }
     return tmp;
   };
-  protoOf(StateEnd).e30 = function (context) {
-    return this.q30(this.o30_1, context);
+  protoOf(StateEnd).d30 = function (context) {
+    return this.p30(this.n30_1, context);
   };
   protoOf(StateEnd).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateEnd) ? $super : THROW_CCE());
   };
-  protoOf(StateEnd).q30 = function (solution, context) {
+  protoOf(StateEnd).p30 = function (solution, context) {
     return new StateEnd(solution, context);
   };
   protoOf(StateEnd).toString = function () {
-    return 'StateEnd(solution=' + toString(this.o30_1) + ', context=' + this.p30_1.toString() + ')';
+    return 'StateEnd(solution=' + toString(this.n30_1) + ', context=' + this.o30_1.toString() + ')';
   };
   protoOf(StateEnd).hashCode = function () {
-    var result = hashCode(this.o30_1);
-    result = imul(result, 31) + this.p30_1.hashCode() | 0;
+    var result = hashCode(this.n30_1);
+    result = imul(result, 31) + this.o30_1.hashCode() | 0;
     return result;
   };
   protoOf(StateEnd).equals = function (other) {
@@ -1653,19 +1648,19 @@
       return true;
     if (!(other instanceof StateEnd))
       return false;
-    if (!equals(this.o30_1, other.o30_1))
+    if (!equals(this.n30_1, other.n30_1))
       return false;
-    if (!this.p30_1.equals(other.p30_1))
+    if (!this.o30_1.equals(other.o30_1))
       return false;
     return true;
   };
   protoOf(StateEnd).asEndState = function () {
-    return this.d30();
+    return this.c30();
   };
-  function isCatch($this, _this__u8e3s4) {
+  function isCatch($this, $receiver) {
     var tmp;
-    if (_this__u8e3s4.tt() === 3) {
-      var tmp_0 = _this__u8e3s4.zt();
+    if ($receiver.rt() === 3) {
+      var tmp_0 = $receiver.xt();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       tmp = tmp_0 === Catch_getInstance().signature.name;
     } else {
@@ -1673,36 +1668,36 @@
     }
     return tmp;
   }
-  function getExceptionContent($this, _this__u8e3s4) {
+  function getExceptionContent($this, $receiver) {
     var tmp;
-    if (_this__u8e3s4 instanceof MessageError) {
-      tmp = _this__u8e3s4.s23();
+    if ($receiver instanceof MessageError) {
+      tmp = $receiver.r23();
     } else {
-      tmp = _this__u8e3s4.u21();
+      tmp = $receiver.t21();
     }
     return tmp;
   }
-  function toPublicException($this, _this__u8e3s4) {
+  function toPublicException($this, $receiver) {
     var tmp;
-    if (_this__u8e3s4 instanceof MessageError) {
-      tmp = Companion_instance_9.forUncaughtError(_this__u8e3s4);
+    if ($receiver instanceof MessageError) {
+      tmp = Companion_instance_9.forUncaughtError($receiver);
     } else {
-      tmp = _this__u8e3s4;
+      tmp = $receiver;
     }
     return tmp;
   }
   function _get_finalState__3aigq8($this) {
-    return new StateHalt(toPublicException($this, $this.t30_1), $this.u30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateHalt(toPublicException($this, $this.s30_1), $this.t30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   function _get_handleExceptionInParentContext__yj3v4e($this) {
-    return new StateException($this.t30_1, ensureNotNull($this.u30_1.t2v_1).s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateException($this.s30_1, ensureNotNull($this.t30_1.s2v_1).r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   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.u30_1.p2y()) {
+    } else if ($this.t30_1.o2y()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1711,18 +1706,18 @@
   }
   function handleCatch($this, catchGoal, catcher) {
     var tmp;
-    if (catcher.f10()) {
-      var tmp_0 = $this.u30_1.l2v_1.plus(catcher);
+    if (catcher.d10()) {
+      var tmp_0 = $this.t30_1.k2v_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.u30_1.n2v_1.jp());
-      var tmp0_$this = $this.u30_1;
+      var newGoals = plus_0(toGoals(subGoals), $this.t30_1.m2v_1.hp());
+      var tmp0_$this = $this.t30_1;
       var tmp1_rules = Companion_instance_7.empty();
       var tmp2_primitives = Companion_instance_7.empty();
       var tmp3_substitution = newSubstitution.castToUnifier();
-      var tmp4_step = $this.b30();
-      tmp = new StateGoalSelection(tmp0_$this.s2w(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.u30_1.p2y()) {
+      var tmp4_step = $this.a30();
+      tmp = new StateGoalSelection(tmp0_$this.r2w(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.t30_1.o2y()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1733,42 +1728,42 @@
     return function (_destruct__k2r9zo) {
       // Inline function 'kotlin.collections.component1' call
       var it = _destruct__k2r9zo.d2();
-      return this$0.u30_1.q2y(it);
+      return this$0.t30_1.p2y(it);
     };
   }
   function StateException(exception, context) {
     AbstractState.call(this, context);
-    this.t30_1 = exception;
-    this.u30_1 = context;
+    this.s30_1 = exception;
+    this.t30_1 = context;
   }
   protoOf(StateException).h8 = function () {
-    return this.u30_1;
+    return this.t30_1;
   };
-  protoOf(StateException).v2z = function () {
+  protoOf(StateException).u2z = function () {
     var tmp;
-    if (this.t30_1 instanceof LogicError) {
-      var catchGoal = ensureNotNull(this.u30_1.n2y());
-      tmp = catchGoal.fu() ? handleStruct(this, this.u30_1.c2v_1, catchGoal.castToStruct(), this.t30_1) : this.u30_1.p2y() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
+    if (this.s30_1 instanceof LogicError) {
+      var catchGoal = ensureNotNull(this.t30_1.m2y());
+      tmp = catchGoal.du() ? handleStruct(this, this.t30_1.b2v_1, catchGoal.castToStruct(), this.s30_1) : this.t30_1.o2y() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
     } else {
       tmp = _get_finalState__3aigq8(this);
     }
     return tmp;
   };
-  protoOf(StateException).e30 = function (context) {
-    return this.v30(this.t30_1, context);
+  protoOf(StateException).d30 = function (context) {
+    return this.u30(this.s30_1, context);
   };
   protoOf(StateException).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateException) ? $super : THROW_CCE());
   };
-  protoOf(StateException).v30 = function (exception, context) {
+  protoOf(StateException).u30 = function (exception, context) {
     return new StateException(exception, context);
   };
   protoOf(StateException).toString = function () {
-    return 'StateException(exception=' + this.t30_1.toString() + ', context=' + this.u30_1.toString() + ')';
+    return 'StateException(exception=' + this.s30_1.toString() + ', context=' + this.t30_1.toString() + ')';
   };
   protoOf(StateException).hashCode = function () {
-    var result = hashCode(this.t30_1);
-    result = imul(result, 31) + this.u30_1.hashCode() | 0;
+    var result = hashCode(this.s30_1);
+    result = imul(result, 31) + this.t30_1.hashCode() | 0;
     return result;
   };
   protoOf(StateException).equals = function (other) {
@@ -1776,9 +1771,9 @@
       return true;
     if (!(other instanceof StateException))
       return false;
-    if (!equals(this.t30_1, other.t30_1))
+    if (!equals(this.s30_1, other.s30_1))
       return false;
-    if (!this.u30_1.equals(other.u30_1))
+    if (!this.t30_1.equals(other.t30_1))
       return false;
     return true;
   };
@@ -1786,97 +1781,97 @@
     return function (_destruct__k2r9zo) {
       // Inline function 'kotlin.collections.component1' call
       var it = _destruct__k2r9zo.d2();
-      return this$0.y30_1.q2y(it);
+      return this$0.x30_1.p2y(it);
     };
   }
   function StateGoalSelection(context) {
     AbstractState.call(this, context);
-    this.y30_1 = context;
+    this.x30_1 = context;
   }
   protoOf(StateGoalSelection).h8 = function () {
-    return this.y30_1;
+    return this.x30_1;
   };
-  protoOf(StateGoalSelection).v2z = function () {
+  protoOf(StateGoalSelection).u2z = function () {
     var tmp;
-    if (this.y30_1.n2v_1.mp()) {
+    if (this.x30_1.m2v_1.kp()) {
       var tmp_0;
-      if (this.y30_1.p2y()) {
-        tmp_0 = new StateEnd(Companion_instance_8.w1t(this.y30_1.m2v_1, this.y30_1.l2v_1), this.y30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+      if (this.x30_1.o2y()) {
+        tmp_0 = new StateEnd(Companion_instance_8.v1t(this.x30_1.l2v_1, this.x30_1.k2v_1), this.x30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
       } else {
         // Inline function 'kotlin.let' call
-        var it = ensureNotNull(this.y30_1.t2v_1);
-        var tmp0_choicePoints = this.y30_1.s2v_1;
-        var tmp1_flags = this.y30_1.e2v_1;
-        var tmp2_dynamicKb = this.y30_1.g2v_1;
-        var tmp3_staticKb = this.y30_1.f2v_1;
-        var tmp4_substitution = this.y30_1.l2v_1.zz(StateGoalSelection$computeNext$lambda(this));
-        var tmp5_goals = it.n2v_1.jp();
-        var tmp6_procedure = it.b2v_1;
-        var tmp7_step = this.b30();
-        var tmp8_startTime = this.y30_1.q2v_1;
-        var tmp9_operators = this.y30_1.h2v_1;
-        var tmp10_inputChannels = this.y30_1.i2v_1;
-        var tmp11_outputChannels = this.y30_1.j2v_1;
-        var tmp12_libraries = this.y30_1.d2v_1;
-        var tmp13_customData = this.y30_1.k2v_1;
-        var tmp$ret$1 = it.s2w(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$1);
+        var it = ensureNotNull(this.x30_1.s2v_1);
+        var tmp0_choicePoints = this.x30_1.r2v_1;
+        var tmp1_flags = this.x30_1.d2v_1;
+        var tmp2_dynamicKb = this.x30_1.f2v_1;
+        var tmp3_staticKb = this.x30_1.e2v_1;
+        var tmp4_substitution = this.x30_1.k2v_1.xz(StateGoalSelection$computeNext$lambda(this));
+        var tmp5_goals = it.m2v_1.hp();
+        var tmp6_procedure = it.a2v_1;
+        var tmp7_step = this.a30();
+        var tmp8_startTime = this.x30_1.p2v_1;
+        var tmp9_operators = this.x30_1.g2v_1;
+        var tmp10_inputChannels = this.x30_1.h2v_1;
+        var tmp11_outputChannels = this.x30_1.i2v_1;
+        var tmp12_libraries = this.x30_1.c2v_1;
+        var tmp13_customData = this.x30_1.j2v_1;
+        var tmp$ret$0 = it.r2w(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.y30_1.e2v_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().z25_1)) {
-      tmp = new StatePrimitiveSelection(this.y30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30(), plus_1(this.y30_1.w2v_1, toSet(ensureNotNull(this.y30_1.n2v_1.kp()).bu()))));
+    } else if (equals(this.x30_1.d2v_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().y25_1)) {
+      tmp = new StatePrimitiveSelection(this.x30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30(), plus_1(this.x30_1.v2v_1, toSet(ensureNotNull(this.x30_1.m2v_1.ip()).zt()))));
     } else {
-      tmp = new StatePrimitiveSelection(this.y30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+      tmp = new StatePrimitiveSelection(this.x30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
     }
     return tmp;
   };
-  protoOf(StateGoalSelection).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StateGoalSelection).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StateGoalSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateGoalSelection) ? $super : THROW_CCE());
   };
-  protoOf(StateGoalSelection).j30 = function (context) {
+  protoOf(StateGoalSelection).i30 = function (context) {
     return new StateGoalSelection(context);
   };
   protoOf(StateGoalSelection).toString = function () {
-    return 'StateGoalSelection(context=' + this.y30_1.toString() + ')';
+    return 'StateGoalSelection(context=' + this.x30_1.toString() + ')';
   };
   protoOf(StateGoalSelection).hashCode = function () {
-    return this.y30_1.hashCode();
+    return this.x30_1.hashCode();
   };
   protoOf(StateGoalSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateGoalSelection))
       return false;
-    if (!this.y30_1.equals(other.y30_1))
+    if (!this.x30_1.equals(other.x30_1))
       return false;
     return true;
   };
   function StateHalt(exception, context) {
-    AbstractEndState.call(this, Companion_instance_8.halt(context.m2v_1, exception), context);
-    this.d31_1 = exception;
-    this.e31_1 = context;
+    AbstractEndState.call(this, Companion_instance_8.halt(context.l2v_1, exception), context);
+    this.c31_1 = exception;
+    this.d31_1 = context;
   }
   protoOf(StateHalt).h8 = function () {
-    return this.e31_1;
+    return this.d31_1;
   };
-  protoOf(StateHalt).e30 = function (context) {
-    return this.v30(this.d31_1, context);
+  protoOf(StateHalt).d30 = function (context) {
+    return this.u30(this.c31_1, context);
   };
   protoOf(StateHalt).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateHalt) ? $super : THROW_CCE());
   };
-  protoOf(StateHalt).v30 = function (exception, context) {
+  protoOf(StateHalt).u30 = function (exception, context) {
     return new StateHalt(exception, context);
   };
   protoOf(StateHalt).toString = function () {
-    return 'StateHalt(exception=' + this.d31_1.toString() + ', context=' + this.e31_1.toString() + ')';
+    return 'StateHalt(exception=' + this.c31_1.toString() + ', context=' + this.d31_1.toString() + ')';
   };
   protoOf(StateHalt).hashCode = function () {
-    var result = hashCode(this.d31_1);
-    result = imul(result, 31) + this.e31_1.hashCode() | 0;
+    var result = hashCode(this.c31_1);
+    result = imul(result, 31) + this.d31_1.hashCode() | 0;
     return result;
   };
   protoOf(StateHalt).equals = function (other) {
@@ -1884,98 +1879,95 @@
       return true;
     if (!(other instanceof StateHalt))
       return false;
-    if (!equals(this.d31_1, other.d31_1))
+    if (!equals(this.c31_1, other.c31_1))
       return false;
-    if (!this.e31_1.equals(other.e31_1))
+    if (!this.d31_1.equals(other.d31_1))
       return false;
     return true;
   };
   protoOf(StateHalt).asEndState = function () {
-    return this.d30();
+    return this.c30();
   };
   function StateInit(context) {
     AbstractState.call(this, context);
-    this.h31_1 = context;
+    this.g31_1 = context;
   }
   protoOf(StateInit).h8 = function () {
-    return this.h31_1;
+    return this.g31_1;
   };
-  protoOf(StateInit).v2z = function () {
-    var tmp0_$this = this.h31_1;
-    var tmp1_goals = toGoals(this.h31_1.m2v_1);
+  protoOf(StateInit).u2z = function () {
+    var tmp0_$this = this.g31_1;
+    var tmp1_goals = toGoals(this.g31_1.l2v_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.h31_1.k2v_1.preservePersistent();
+    var tmp5_customData = this.g31_1.j2v_1.preservePersistent();
     var tmp6_relevantVariables = emptySet();
-    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.s2w(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.r2w(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).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StateInit).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StateInit).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateInit) ? $super : THROW_CCE());
   };
-  protoOf(StateInit).j30 = function (context) {
+  protoOf(StateInit).i30 = function (context) {
     return new StateInit(context);
   };
   protoOf(StateInit).toString = function () {
-    return 'StateInit(context=' + this.h31_1.toString() + ')';
+    return 'StateInit(context=' + this.g31_1.toString() + ')';
   };
   protoOf(StateInit).hashCode = function () {
-    return this.h31_1.hashCode();
+    return this.g31_1.hashCode();
   };
   protoOf(StateInit).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateInit))
       return false;
-    if (!this.h31_1.equals(other.h31_1))
+    if (!this.g31_1.equals(other.g31_1))
       return false;
     return true;
   };
-  function copyFromCurrentPrimitive($this, _this__u8e3s4, goals, procedureFromAncestor, substitution) {
-    var tmp0_safe_receiver = _this__u8e3s4.p2v_1.kp();
+  function copyFromCurrentPrimitive($this, $receiver, goals, procedureFromAncestor, substitution) {
+    goals = goals === VOID ? null : goals;
+    procedureFromAncestor = procedureFromAncestor === VOID ? 0 : procedureFromAncestor;
+    substitution = substitution === VOID ? null : substitution;
+    var tmp0_safe_receiver = $receiver.o2v_1.ip();
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp = _this__u8e3s4.s2y(tmp0_safe_receiver.sideEffects);
+      tmp = $receiver.r2y(tmp0_safe_receiver.sideEffects);
     }
     var tmp1_elvis_lhs = tmp;
-    var ctx = tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs;
-    var tmp4_goals = goals == null ? _this__u8e3s4.n2v_1 : goals;
-    var tmp_0 = drop(_this__u8e3s4.x2v_1, procedureFromAncestor);
+    var ctx = tmp1_elvis_lhs == null ? $receiver : tmp1_elvis_lhs;
+    var tmp4_goals = goals == null ? $receiver.m2v_1 : goals;
+    var tmp_0 = drop($receiver.w2v_1, procedureFromAncestor);
     var tmp5_procedure = first(map(tmp_0, StatePrimitiveExecution$copyFromCurrentPrimitive$lambda));
     var tmp6_primitives = Companion_instance_7.empty();
-    var tmp_1 = substitution == null ? _this__u8e3s4.l2v_1 : substitution;
+    var tmp_1 = substitution == null ? $receiver.k2v_1 : substitution;
     var tmp7_substitution = isInterface(tmp_1, Unifier) ? tmp_1 : THROW_CCE();
-    var tmp8_step = $this.b30();
-    return ctx.s2w(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 copyFromCurrentPrimitive$default($this, _this__u8e3s4, goals, procedureFromAncestor, substitution, $super) {
-    goals = goals === VOID ? null : goals;
-    procedureFromAncestor = procedureFromAncestor === VOID ? 0 : procedureFromAncestor;
-    substitution = substitution === VOID ? null : substitution;
-    return copyFromCurrentPrimitive($this, _this__u8e3s4, goals, procedureFromAncestor, substitution);
+    var tmp8_step = $this.a30();
+    return ctx.r2w(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.b2v_1;
+    return it.a2v_1;
   }
   function StatePrimitiveExecution$computeNext$lambda(this$0) {
     return function (it) {
-      return new StateGoalSelection(copyFromCurrentPrimitive(this$0, this$0.k31_1, this$0.k31_1.n2v_1.jp(), 1, this$0.k31_1.c2v_1.mergeWithOccurCheck(this$0.k31_1.l2v_1, it.g1s(), false)));
+      return new StateGoalSelection(copyFromCurrentPrimitive(this$0, this$0.j31_1, this$0.j31_1.m2v_1.hp(), 1, this$0.j31_1.b2v_1.mergeWithOccurCheck(this$0.j31_1.k2v_1, it.f1s(), false)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_0(this$0) {
     return function (it) {
-      return new StateBacktracking(copyFromCurrentPrimitive$default(this$0, ensureNotNull(this$0.k31_1.t2v_1)));
+      return new StateBacktracking(copyFromCurrentPrimitive(this$0, ensureNotNull(this$0.j31_1.s2v_1)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_1(this$0) {
     return function (it) {
-      return new StateException(it.m1t().updateLastContext(this$0.f30(this$0.k31_1)), copyFromCurrentPrimitive$default(this$0, this$0.k31_1));
+      return new StateException(it.l1t().updateLastContext(this$0.e30(this$0.j31_1)), copyFromCurrentPrimitive(this$0, this$0.j31_1));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_2(it) {
@@ -1983,15 +1975,15 @@
   }
   function StatePrimitiveExecution(context) {
     AbstractState.call(this, context);
-    this.k31_1 = context;
+    this.j31_1 = context;
   }
   protoOf(StatePrimitiveExecution).h8 = function () {
-    return this.k31_1;
+    return this.j31_1;
   };
-  protoOf(StatePrimitiveExecution).v2z = function () {
+  protoOf(StatePrimitiveExecution).u2z = function () {
     var tmp;
     try {
-      var tmp0_safe_receiver = this.k31_1.p2v_1.kp();
+      var tmp0_safe_receiver = this.j31_1.o2v_1.ip();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.solution;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2000,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.q1t(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
+        tmp_0 = tmp1_safe_receiver.p1t(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
       }
       var tmp2_elvis_lhs = tmp_0;
-      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive$default(this, this.k31_1)) : tmp2_elvis_lhs;
+      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive(this, this.j31_1)) : tmp2_elvis_lhs;
     } catch ($p) {
       var tmp_4;
       if ($p instanceof ResolutionException) {
         var exception = $p;
-        tmp_4 = new StateException(exception.updateLastContext(this.f30(this.k31_1)), this.k31_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+        tmp_4 = new StateException(exception.updateLastContext(this.e30(this.j31_1)), this.j31_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
       } else {
         throw $p;
       }
@@ -2016,59 +2008,60 @@
     }
     return tmp;
   };
-  protoOf(StatePrimitiveExecution).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StatePrimitiveExecution).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StatePrimitiveExecution).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StatePrimitiveExecution) ? $super : THROW_CCE());
   };
-  protoOf(StatePrimitiveExecution).j30 = function (context) {
+  protoOf(StatePrimitiveExecution).i30 = function (context) {
     return new StatePrimitiveExecution(context);
   };
   protoOf(StatePrimitiveExecution).toString = function () {
-    return 'StatePrimitiveExecution(context=' + this.k31_1.toString() + ')';
+    return 'StatePrimitiveExecution(context=' + this.j31_1.toString() + ')';
   };
   protoOf(StatePrimitiveExecution).hashCode = function () {
-    return this.k31_1.hashCode();
+    return this.j31_1.hashCode();
   };
   protoOf(StatePrimitiveExecution).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StatePrimitiveExecution))
       return false;
-    if (!this.k31_1.equals(other.k31_1))
+    if (!this.j31_1.equals(other.j31_1))
       return false;
     return true;
   };
   function exceptionalState($this, exception) {
-    return new StateException(exception, $this.n31_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateException(exception, $this.m31_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   function StatePrimitiveSelection(context) {
     AbstractState.call(this, context);
-    this.n31_1 = context;
+    this.m31_1 = context;
   }
   protoOf(StatePrimitiveSelection).h8 = function () {
-    return this.n31_1;
+    return this.m31_1;
   };
-  protoOf(StatePrimitiveSelection).v2z = function () {
+  protoOf(StatePrimitiveSelection).u2z = function () {
     // Inline function 'kotlin.with' call
-    var $this$with = this.n31_1;
-    var goal = ensureNotNull($this$with.n2y());
+    var $this$with = this.m31_1;
+    var goal = ensureNotNull($this$with.m2y());
     var tmp;
-    if (goal.vu()) {
-      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.n31_1, extractSignature(ensureNotNull(this.n31_1.b2v_1)), goal.castToVar()));
-    } else if (goal.fu()) {
+    if (goal.tu()) {
+      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.m31_1, extractSignature(ensureNotNull(this.m31_1.a2v_1)), goal.castToVar()));
+    } else if (goal.du()) {
       var goalStruct = goal.castToStruct();
       var signature = extractSignature(goalStruct);
       var tmp_0;
-      if ($this$with.d2v_1.hasPrimitive(signature)) {
+      if ($this$with.c2v_1.hasPrimitive(signature)) {
         var childContext = createChild($this$with);
         var tmp_1;
         try {
-          var request = toRequest(childContext, goalStruct, signature, this.y2z());
-          var tmp0_elvis_lhs = $this$with.d2v_1.x2a().h2(signature);
+          var request = toRequest(childContext, goalStruct, signature, this.x2z());
+          var tmp0_elvis_lhs = $this$with.c2v_1.w2a().h2(signature);
           var tmp_2;
           if (tmp0_elvis_lhs == null) {
+            // Inline function 'kotlin.error' call
             var message = 'Inconsistent behaviour of Library.contains and Library.get';
             throw IllegalStateException_init_$Create$(toString(message));
           } else {
@@ -2081,7 +2074,7 @@
           var tmp_3;
           if ($p instanceof ResolutionException) {
             var exception = $p;
-            tmp_3 = exceptionalState(this, exception.updateLastContext(this.f30(childContext)));
+            tmp_3 = exceptionalState(this, exception.updateLastContext(this.e30(childContext)));
           } else {
             throw $p;
           }
@@ -2089,106 +2082,106 @@
         }
         tmp_0 = tmp_1;
       } else {
-        tmp_0 = new StateRuleSelection(this.n31_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.b30()));
+        tmp_0 = new StateRuleSelection(this.m31_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.a30()));
       }
       tmp = tmp_0;
     } else {
       var tmp_4 = Companion_instance_10;
-      var tmp1_safe_receiver = this.n31_1.b2v_1;
+      var tmp1_safe_receiver = this.m31_1.a2v_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : extractSignature(tmp1_safe_receiver);
-      tmp = exceptionalState(this, tmp_4.forGoal(this.n31_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
+      tmp = exceptionalState(this, tmp_4.forGoal(this.m31_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
     }
     return tmp;
   };
-  protoOf(StatePrimitiveSelection).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StatePrimitiveSelection).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StatePrimitiveSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StatePrimitiveSelection) ? $super : THROW_CCE());
   };
-  protoOf(StatePrimitiveSelection).j30 = function (context) {
+  protoOf(StatePrimitiveSelection).i30 = function (context) {
     return new StatePrimitiveSelection(context);
   };
   protoOf(StatePrimitiveSelection).toString = function () {
-    return 'StatePrimitiveSelection(context=' + this.n31_1.toString() + ')';
+    return 'StatePrimitiveSelection(context=' + this.m31_1.toString() + ')';
   };
   protoOf(StatePrimitiveSelection).hashCode = function () {
-    return this.n31_1.hashCode();
+    return this.m31_1.hashCode();
   };
   protoOf(StatePrimitiveSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StatePrimitiveSelection))
       return false;
-    if (!this.n31_1.equals(other.n31_1))
+    if (!this.m31_1.equals(other.m31_1))
       return false;
     return true;
   };
   function _get_failureState__yid9tw($this) {
-    return new StateBacktracking($this.q31_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateBacktracking($this.p31_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   function StateRuleExecution(context) {
     AbstractState.call(this, context);
-    this.q31_1 = context;
+    this.p31_1 = context;
   }
   protoOf(StateRuleExecution).h8 = function () {
-    return this.q31_1;
+    return this.p31_1;
   };
-  protoOf(StateRuleExecution).v2z = function () {
+  protoOf(StateRuleExecution).u2z = function () {
     // Inline function 'kotlin.with' call
-    var $this$with = this.q31_1;
-    var substitution = $this$with.c2v_1.mgu(ensureNotNull($this$with.n2y()), ensureNotNull($this$with.o2v_1.kp()).fw());
+    var $this$with = this.p31_1;
+    var substitution = $this$with.b2v_1.mgu(ensureNotNull($this$with.m2y()), ensureNotNull($this$with.n2v_1.ip()).dw());
     var tmp;
-    if (substitution.f10()) {
-      var newSubstitution = this.q31_1.l2v_1.plus(substitution).castToUnifier();
-      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.q31_1.o2v_1.kp()), newSubstitution).gw().getSubstituted(newSubstitution, []);
-      var tmp0_$this = this.q31_1;
+    if (substitution.d10()) {
+      var newSubstitution = this.p31_1.k2v_1.plus(substitution).castToUnifier();
+      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.p31_1.n2v_1.ip()), newSubstitution).ew().getSubstituted(newSubstitution, []);
+      var tmp0_$this = this.p31_1;
       var tmp1_goals = toGoals(subGoals);
       var tmp2_rules = Companion_instance_7.empty();
-      var tmp3_step = this.b30();
-      tmp = new StateGoalSelection(tmp0_$this.s2w(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.a30();
+      tmp = new StateGoalSelection(tmp0_$this.r2w(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).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StateRuleExecution).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StateRuleExecution).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateRuleExecution) ? $super : THROW_CCE());
   };
-  protoOf(StateRuleExecution).j30 = function (context) {
+  protoOf(StateRuleExecution).i30 = function (context) {
     return new StateRuleExecution(context);
   };
   protoOf(StateRuleExecution).toString = function () {
-    return 'StateRuleExecution(context=' + this.q31_1.toString() + ')';
+    return 'StateRuleExecution(context=' + this.p31_1.toString() + ')';
   };
   protoOf(StateRuleExecution).hashCode = function () {
-    return this.q31_1.hashCode();
+    return this.p31_1.hashCode();
   };
   protoOf(StateRuleExecution).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateRuleExecution))
       return false;
-    if (!this.q31_1.equals(other.q31_1))
+    if (!this.p31_1.equals(other.p31_1))
       return false;
     return true;
   };
   function None() {
     None_instance = this;
     CutLimit.call(this);
-    this.r31_1 = -1;
-    this.s31_1 = null;
+    this.q31_1 = -1;
+    this.r31_1 = null;
   }
-  protoOf(None).t31 = function () {
-    return this.r31_1;
+  protoOf(None).s31 = function () {
+    return this.q31_1;
   };
-  protoOf(None).f1s = function () {
-    return this.s31_1;
+  protoOf(None).e1s = function () {
+    return this.r31_1;
   };
-  protoOf(None).u31 = function () {
+  protoOf(None).t31 = function () {
     return true;
   };
   var None_instance;
@@ -2199,24 +2192,24 @@
   }
   function Actual(depthToCut, procedure) {
     CutLimit.call(this);
-    this.v31_1 = depthToCut;
-    this.w31_1 = procedure;
+    this.u31_1 = depthToCut;
+    this.v31_1 = procedure;
   }
-  protoOf(Actual).t31 = function () {
-    return this.v31_1;
+  protoOf(Actual).s31 = function () {
+    return this.u31_1;
   };
-  protoOf(Actual).f1s = function () {
-    return this.w31_1;
+  protoOf(Actual).e1s = function () {
+    return this.v31_1;
   };
   function CutLimit() {
   }
-  protoOf(CutLimit).u31 = function () {
+  protoOf(CutLimit).t31 = function () {
     return false;
   };
   function Companion_0() {
     Companion_instance_16 = this;
-    this.x31_1 = Catch_getInstance().signature;
-    this.y31_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
+    this.w31_1 = Catch_getInstance().signature;
+    this.x31_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
   }
   var Companion_instance_16;
   function Companion_getInstance_6() {
@@ -2225,39 +2218,39 @@
     return Companion_instance_16;
   }
   function _get_failureState__yid9tw_0($this) {
-    return new StateBacktracking($this.b32_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateBacktracking($this.a32_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   function exceptionalState_0($this, exception) {
-    return new StateException(exception, $this.b32_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateException(exception, $this.a32_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
   function missingProcedure($this, ruleSources, missing) {
-    var unknown = $this.b32_1.e2v_1.get(Unknown_getInstance());
+    var unknown = $this.a32_1.d2v_1.get(Unknown_getInstance());
     var tmp;
-    if (equals(unknown, Unknown_getInstance().f26_1)) {
+    if (equals(unknown, Unknown_getInstance().e26_1)) {
       tmp = _get_failureState__yid9tw_0($this);
     } else {
       var tmp_0;
-      var tmp$ret$1;
+      var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.sequences.none' call
-        var _iterator__ex2g4s = ruleSources.p();
-        while (_iterator__ex2g4s.s()) {
-          var element = _iterator__ex2g4s.t();
+        var _iterator__ex2g4s = ruleSources.n();
+        while (_iterator__ex2g4s.q()) {
+          var element = _iterator__ex2g4s.r();
           if (element.containsIndicator(missing.toIndicator())) {
-            tmp$ret$1 = false;
+            tmp$ret$0 = false;
             break $l$block;
           }
         }
-        tmp$ret$1 = true;
+        tmp$ret$0 = true;
       }
-      if (tmp$ret$1) {
+      if (tmp$ret$0) {
         var tmp_1;
-        if (equals(unknown, Unknown_getInstance().d26_1)) {
-          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.b32_1, missing));
-        } else if (equals(unknown, Unknown_getInstance().e26_1)) {
+        if (equals(unknown, Unknown_getInstance().c26_1)) {
+          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.a32_1, missing));
+        } else if (equals(unknown, Unknown_getInstance().d26_1)) {
           // Inline function 'kotlin.also' call
           var this_0 = _get_failureState__yid9tw_0($this);
-          $this.b32_1.x1s().write(MissingPredicate_init_$Create$($this.b32_1, missing));
+          $this.a32_1.w1s().write(MissingPredicate_init_$Create$($this.a32_1, missing));
           tmp_1 = this_0;
         } else {
           tmp_1 = _get_failureState__yid9tw_0($this);
@@ -2271,84 +2264,85 @@
     return tmp;
   }
   function _get_ignoreState__t4wl8y($this) {
-    return new StateGoalSelection($this.b32_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b32_1.n2v_1.jp(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b30()));
+    return new StateGoalSelection($this.a32_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a32_1.m2v_1.hp(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.a30()));
   }
-  function isCut($this, _this__u8e3s4) {
-    return _this__u8e3s4.ut() && _this__u8e3s4.castToAtom().e2() === '!';
+  function isCut($this, $receiver) {
+    return $receiver.st() && $receiver.castToAtom().e2() === '!';
   }
-  function computeCutLimit($this, _this__u8e3s4, magicCut) {
+  function computeCutLimit($this, $receiver, magicCut) {
+    magicCut = magicCut === VOID ? false : magicCut;
     var tmp;
     if (magicCut) {
-      tmp = firstOrNull(_this__u8e3s4.x2v_1);
+      tmp = firstOrNull($receiver.w2v_1);
     } else {
-      var tmp0 = _this__u8e3s4.x2v_1;
-      var tmp$ret$1;
+      var tmp0 = $receiver.w2v_1;
+      var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.sequences.firstOrNull' call
-        var _iterator__ex2g4s = tmp0.p();
-        while (_iterator__ex2g4s.s()) {
-          var element = _iterator__ex2g4s.t();
-          var tmp_0 = Companion_getInstance_6().y31_1;
-          var tmp0_safe_receiver = element.b2v_1;
+        var _iterator__ex2g4s = tmp0.n();
+        while (_iterator__ex2g4s.q()) {
+          var element = _iterator__ex2g4s.r();
+          var tmp_0 = Companion_getInstance_6().x31_1;
+          var tmp0_safe_receiver = element.a2v_1;
           if (!contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver))) {
-            tmp$ret$1 = element;
+            tmp$ret$0 = element;
             break $l$block;
           }
         }
-        tmp$ret$1 = null;
+        tmp$ret$0 = null;
       }
-      tmp = tmp$ret$1;
+      tmp = tmp$ret$0;
     }
     var cutLimit = tmp;
     var tmp_1;
     if (cutLimit == null) {
       tmp_1 = None_getInstance();
     } else {
-      tmp_1 = new Actual(cutLimit.u2v_1, cutLimit.b2v_1);
+      tmp_1 = new Actual(cutLimit.t2v_1, cutLimit.a2v_1);
     }
     return tmp_1;
   }
   function cutCanBeSkipped($this, cutLimit, executionContext) {
-    return cutLimit.u31() || cutLimit.t31() > executionContext.u2v_1 || (cutLimit.t31() === executionContext.u2v_1 && !equals(cutLimit.f1s(), executionContext.b2v_1));
+    return cutLimit.t31() || cutLimit.s31() > executionContext.t2v_1 || (cutLimit.s31() === executionContext.t2v_1 && !equals(cutLimit.e1s(), executionContext.a2v_1));
   }
-  function performCut($this, _this__u8e3s4, cutLimit) {
+  function performCut($this, $receiver, cutLimit) {
     var tmp;
-    if (_this__u8e3s4 === null) {
+    if ($receiver === null) {
       tmp = null;
-    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.n2w()))) {
-      tmp = _this__u8e3s4;
+    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull($receiver.m2w()))) {
+      tmp = $receiver;
     } else {
-      var tmp_0 = _this__u8e3s4.a2x();
+      var tmp_0 = $receiver.z2w();
       var cutCandidates = filter(tmp_0, StateRuleSelection$performCut$lambda(cutLimit));
       var tmp_1;
       if (any(cutCandidates)) {
-        var tmp$ret$1;
+        var tmp$ret$0;
         $l$block: {
           // Inline function 'kotlin.sequences.firstOrNull' call
-          var _iterator__ex2g4s = cutCandidates.p();
-          while (_iterator__ex2g4s.s()) {
-            var element = _iterator__ex2g4s.t();
-            if (ensureNotNull(element.n2w()).u2v_1 <= cutLimit.t31()) {
-              tmp$ret$1 = element;
+          var _iterator__ex2g4s = cutCandidates.n();
+          while (_iterator__ex2g4s.q()) {
+            var element = _iterator__ex2g4s.r();
+            if (ensureNotNull(element.m2w()).t2v_1 <= cutLimit.s31()) {
+              tmp$ret$0 = element;
               break $l$block;
             }
           }
-          tmp$ret$1 = null;
+          tmp$ret$0 = null;
         }
-        var tmp0_safe_receiver = tmp$ret$1;
-        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o2w();
+        var tmp0_safe_receiver = tmp$ret$0;
+        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.n2w();
       } else {
-        tmp_1 = _this__u8e3s4;
+        tmp_1 = $receiver;
       }
       tmp = tmp_1;
     }
     return tmp;
   }
-  function _get_isTailRecursive__h5eso7($this, _this__u8e3s4) {
+  function _get_isTailRecursive__h5eso7($this, $receiver) {
     var tmp;
-    if (_this__u8e3s4.n2v_1.jp().mp() && equals(_this__u8e3s4.e2v_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().s25_1)) {
+    if ($receiver.m2v_1.hp().kp() && equals($receiver.d2v_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().r25_1)) {
       // Inline function 'kotlin.let' call
-      var tmp0_safe_receiver = ensureNotNull(_this__u8e3s4.n2y()).asStruct();
+      var tmp0_safe_receiver = ensureNotNull($receiver.m2y()).asStruct();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver);
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2356,9 +2350,9 @@
       } else {
         // Inline function 'kotlin.let' call
         var tmp_1;
-        var tmp0_safe_receiver_0 = _this__u8e3s4.b2v_1;
+        var tmp0_safe_receiver_0 = $receiver.a2v_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().x31_1);
+          tmp_1 = !tmp1_safe_receiver.equals(Companion_getInstance_6().w31_1);
         } else {
           tmp_1 = false;
         }
@@ -2371,12 +2365,12 @@
     }
     return tmp;
   }
-  function selectClauses($this, _this__u8e3s4, term) {
-    var tmp = _this__u8e3s4.getByHead(term);
+  function selectClauses($this, $receiver, term) {
+    var tmp = $receiver.getByHead(term);
     // Inline function 'kotlin.let' call
     var it = ensureRules(map(tmp, StateRuleSelection$selectClauses$lambda));
     var tmp_0;
-    if (_this__u8e3s4.d1q()) {
+    if ($receiver.c1q()) {
       tmp_0 = buffered(it);
     } else {
       tmp_0 = it;
@@ -2385,7 +2379,7 @@
   }
   function StateRuleSelection$performCut$lambda($cutLimit) {
     return function (it) {
-      return equals(ensureNotNull(it.n2w()).b2v_1, $cutLimit.f1s());
+      return equals(ensureNotNull(it.m2w()).a2v_1, $cutLimit.e1s());
     };
   }
   function StateRuleSelection$computeNext$lambda(this$0, $currentGoalStruct) {
@@ -2394,30 +2388,30 @@
     };
   }
   function StateRuleSelection$selectClauses$lambda(it) {
-    return it.cu();
+    return it.au();
   }
   function StateRuleSelection(context) {
     Companion_getInstance_6();
     AbstractState.call(this, context);
-    this.b32_1 = context;
+    this.a32_1 = context;
   }
   protoOf(StateRuleSelection).h8 = function () {
-    return this.b32_1;
+    return this.a32_1;
   };
-  protoOf(StateRuleSelection).v2z = function () {
-    var currentGoal = ensureNotNull(this.b32_1.n2y());
+  protoOf(StateRuleSelection).u2z = function () {
+    var currentGoal = ensureNotNull(this.a32_1.m2y());
     var tmp;
-    if (currentGoal.vu()) {
-      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.b32_1, extractSignature(ensureNotNull(this.b32_1.b2v_1)), currentGoal.castToVar()));
-    } else if (currentGoal.fu()) {
+    if (currentGoal.tu()) {
+      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.a32_1, extractSignature(ensureNotNull(this.a32_1.a2v_1)), currentGoal.castToVar()));
+    } else if (currentGoal.du()) {
       // Inline function 'kotlin.with' call
-      var $this$with = this.b32_1;
+      var $this$with = this.a32_1;
       var currentGoalStruct = currentGoal.castToStruct();
-      var ruleSources = sequenceOf([$this$with.d2v_1.asTheory($this$with.c2v_1), $this$with.f2v_1, $this$with.g2v_1]);
+      var ruleSources = sequenceOf([$this$with.c2v_1.asTheory($this$with.b2v_1), $this$with.e2v_1, $this$with.f2v_1]);
       var tmp_0;
-      if (currentGoalStruct.wu()) {
+      if (currentGoalStruct.uu()) {
         var tmp_1;
-        if (currentGoalStruct.xt()) {
+        if (currentGoalStruct.vt()) {
           tmp_1 = _get_ignoreState__t4wl8y(this);
         } else {
           tmp_1 = _get_failureState__yid9tw_0(this);
@@ -2428,28 +2422,28 @@
           var cutLimit = computeCutLimit(this, $this$with, currentGoalStruct instanceof MagicCut);
           // Inline function 'kotlin.let' call
           var it = _get_ignoreState__t4wl8y(this);
-          tmp_0 = it.j30(it.y30_1.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(this, it.y30_1.s2v_1, cutLimit)));
+          tmp_0 = it.i30(it.x30_1.r2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(this, it.x30_1.r2v_1, cutLimit)));
         } else {
-          var tmp$ret$3;
+          var tmp$ret$4;
           $l$block: {
             // Inline function 'kotlin.sequences.any' call
-            var _iterator__ex2g4s = ruleSources.p();
-            while (_iterator__ex2g4s.s()) {
-              var element = _iterator__ex2g4s.t();
+            var _iterator__ex2g4s = ruleSources.n();
+            while (_iterator__ex2g4s.q()) {
+              var element = _iterator__ex2g4s.r();
               if (element.containsHead(currentGoalStruct)) {
-                tmp$ret$3 = true;
+                tmp$ret$4 = true;
                 break $l$block;
               }
             }
-            tmp$ret$3 = false;
+            tmp$ret$4 = false;
           }
-          if (tmp$ret$3) {
+          if (tmp$ret$4) {
             var rules = cursor(flatMap(ruleSources, StateRuleSelection$computeNext$lambda(this, currentGoalStruct)));
             var tmp_2;
-            if (_get_isTailRecursive__h5eso7(this, this.b32_1)) {
-              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.b32_1, rules));
+            if (_get_isTailRecursive__h5eso7(this, this.a32_1)) {
+              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.a32_1, rules));
             } else {
-              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.b32_1, rules));
+              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.a32_1, rules));
             }
             tmp_0 = tmp_2;
           } else {
@@ -2459,43 +2453,43 @@
       }
       tmp = tmp_0;
     } else {
-      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.b32_1, extractSignature(ensureNotNull(this.b32_1.b2v_1)), Expected_CALLABLE_getInstance(), currentGoal));
+      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.a32_1, extractSignature(ensureNotNull(this.a32_1.a2v_1)), Expected_CALLABLE_getInstance(), currentGoal));
     }
     return tmp;
   };
-  protoOf(StateRuleSelection).e30 = function (context) {
-    return this.j30(context);
+  protoOf(StateRuleSelection).d30 = function (context) {
+    return this.i30(context);
   };
   protoOf(StateRuleSelection).clone = function (context, $super) {
     return this.clone(context, ($super == null ? true : $super instanceof StateRuleSelection) ? $super : THROW_CCE());
   };
-  protoOf(StateRuleSelection).j30 = function (context) {
+  protoOf(StateRuleSelection).i30 = function (context) {
     return new StateRuleSelection(context);
   };
   protoOf(StateRuleSelection).toString = function () {
-    return 'StateRuleSelection(context=' + this.b32_1.toString() + ')';
+    return 'StateRuleSelection(context=' + this.a32_1.toString() + ')';
   };
   protoOf(StateRuleSelection).hashCode = function () {
-    return this.b32_1.hashCode();
+    return this.a32_1.hashCode();
   };
   protoOf(StateRuleSelection).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof StateRuleSelection))
       return false;
-    if (!this.b32_1.equals(other.b32_1))
+    if (!this.a32_1.equals(other.a32_1))
       return false;
     return true;
   };
   function appendRulesAndChoicePoints(_this__u8e3s4, rules) {
     var tmp;
-    if (rules.lp()) {
-      tmp = appendRules(_this__u8e3s4.s2v_1, rules.jp(), _this__u8e3s4);
+    if (rules.jp()) {
+      tmp = appendRules(_this__u8e3s4.r2v_1, rules.hp(), _this__u8e3s4);
     } else {
-      tmp = appendRules(_this__u8e3s4.s2v_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.r2v_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.r2w(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);
@@ -2503,8 +2497,8 @@
   }
   function unfoldGoals(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.ku()) {
-      var tmp_0 = _this__u8e3s4.castToTuple().ps();
+    if (_this__u8e3s4.iu()) {
+      var tmp_0 = _this__u8e3s4.castToTuple().ns();
       tmp = flatMap(tmp_0, unfoldGoals$lambda);
     } else {
       tmp = sequenceOf_0(_this__u8e3s4);
@@ -2513,28 +2507,28 @@
   }
   function createChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.n2y()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.m2y()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.b2v_1;
-    var tmp2_depth = _this__u8e3s4.u2v_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.a2v_1;
+    var tmp2_depth = _this__u8e3s4.t2v_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = _this__u8e3s4.v2v_1;
+    var this_0 = _this__u8e3s4.u2v_1;
     var tmp3_step = add(this_0, fromInt(1));
     var tmp4_relevantVariables = emptySet();
-    return _this__u8e3s4.s2w(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.r2w(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.au(), _this__u8e3s4, startTime);
+    return new Request(signature, goal.yt(), _this__u8e3s4, startTime);
   }
   function appendPrimitivesAndChoicePoints(_this__u8e3s4, primitiveExecutions) {
     var tmp;
-    if (primitiveExecutions.lp()) {
-      tmp = appendPrimitives(_this__u8e3s4.s2v_1, primitiveExecutions.jp(), _this__u8e3s4);
+    if (primitiveExecutions.jp()) {
+      tmp = appendPrimitives(_this__u8e3s4.r2v_1, primitiveExecutions.hp(), _this__u8e3s4);
     } else {
-      tmp = appendPrimitives(_this__u8e3s4.s2v_1, Companion_instance_7.empty(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.r2v_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.s2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.r2w(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;
@@ -2551,17 +2545,17 @@
   }
   function replaceWithChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.n2y()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.m2y()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.b2v_1;
-    var tmp2_depth = _this__u8e3s4.u2v_1 + 1 | 0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.a2v_1;
+    var tmp2_depth = _this__u8e3s4.t2v_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var this_0 = _this__u8e3s4.v2v_1;
+    var this_0 = _this__u8e3s4.u2v_1;
     var tmp3_step = add(this_0, fromInt(1));
-    return _this__u8e3s4.s2w(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.r2w(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.vu() ? Companion_getInstance_1().of('call', [it]) : it;
+    return it.tu() ? Companion_getInstance_1().of('call', [it]) : it;
   }
   function unfoldGoals$lambda(it) {
     return unfoldGoals(it);
@@ -2569,54 +2563,54 @@
   function ensureRules$lambda(it) {
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.require' call
-    if (!it.hu()) {
+    if (!it.fu()) {
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     return it.castToRule();
   }
   function AbstractSolutionIterator(state) {
-    this.c32_1 = state;
-    this.d32_1 = 0n;
+    this.b32_1 = state;
+    this.c32_1 = 0n;
   }
-  protoOf(AbstractSolutionIterator).s = function () {
+  protoOf(AbstractSolutionIterator).q = function () {
     // Inline function 'kotlin.let' call
-    var it = this.c32_1;
-    return !it.c30() || it.castToEndState().z2w();
+    var it = this.b32_1;
+    return !it.b30() || it.castToEndState().y2w();
   };
-  protoOf(AbstractSolutionIterator).t = function () {
+  protoOf(AbstractSolutionIterator).r = function () {
     do {
-      var previousState = this.c32_1;
+      var previousState = this.b32_1;
       var tmp = this;
-      var tmp_0 = this.c32_1;
-      this.d32_1 = add(this.d32_1, get_ONE());
-      tmp.c32_1 = this.e32(tmp_0, this.d32_1);
-      this.onStateTransition(previousState, this.c32_1, this.d32_1);
+      var tmp_0 = this.b32_1;
+      this.c32_1 = add(this.c32_1, get_ONE());
+      tmp.b32_1 = this.d32(tmp_0, this.c32_1);
+      this.onStateTransition(previousState, this.b32_1, this.c32_1);
     }
-     while (!this.c32_1.c30());
-    return this.c32_1.castToEndState().f2f().cleanUp();
+     while (!this.b32_1.b30());
+    return this.b32_1.castToEndState().e2f().cleanUp();
   };
   function SimpleSolutionIterator(state, onStateTransitionCallback) {
     AbstractSolutionIterator.call(this, state);
-    this.h32_1 = onStateTransitionCallback;
+    this.g32_1 = onStateTransitionCallback;
   }
-  protoOf(SimpleSolutionIterator).e32 = function (state, step) {
+  protoOf(SimpleSolutionIterator).d32 = function (state, step) {
     return state.next();
   };
-  protoOf(SimpleSolutionIterator).i32 = function (source, destination, index) {
-    return this.h32_1(source, destination, index);
+  protoOf(SimpleSolutionIterator).h32 = function (source, destination, index) {
+    return this.g32_1(source, destination, index);
   };
   protoOf(SimpleSolutionIterator).onStateTransition = function (source, destination, index) {
-    return this.i32(source, destination, index);
+    return this.h32(source, destination, index);
   };
   function DefaultBuiltins() {
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, CommonBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).l2b = function () {
+  protoOf(DefaultBuiltins).k2b = function () {
     return listOf(Throw_getInstance());
   };
-  protoOf(DefaultBuiltins).k2b = function () {
+  protoOf(DefaultBuiltins).j2b = function () {
     return listOf_0([Catch_getInstance(), Call_getInstance(), Comma_getInstance(), Cut_getInstance(), Fail_getInstance(), Success_getInstance()]);
   };
   var DefaultBuiltins_instance;
@@ -2630,12 +2624,12 @@
     var tmp_0;
     var tmp_1;
     if (isInterface(error, Struct)) {
-      tmp_1 = error.zt() === 'error';
+      tmp_1 = error.xt() === 'error';
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      var containsArg = error.tt();
+      var containsArg = error.rt();
       tmp_0 = 1 <= containsArg ? containsArg <= 2 : false;
     } else {
       tmp_0 = false;
@@ -2643,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.tt() > 1 ? error.get(1) : null);
+      tmp = tmp_2.of(VOID, VOID, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.rt() > 1 ? error.get(1) : null);
     } else {
-      tmp = Companion_instance_13.n23(error, context);
+      tmp = Companion_instance_13.m23(error, context);
     }
     return tmp;
   }
@@ -2653,11 +2647,11 @@
     Throw_instance = this;
     UnaryPredicate.call(this, 'throw');
   }
-  protoOf(Throw).y2l = function (_this__u8e3s4, first) {
-    return sequenceOf_0(Companion_getInstance_4().l2c(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.z(0)), VOID, []));
+  protoOf(Throw).x2l = function (_this__u8e3s4, first) {
+    return sequenceOf_0(Companion_getInstance_4().k2c(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.x(0)), VOID, []));
   };
-  protoOf(Throw).y2f = function (_this__u8e3s4, first) {
-    return this.y2l(_this__u8e3s4, first);
+  protoOf(Throw).x2f = function (_this__u8e3s4, first) {
+    return this.x2l(_this__u8e3s4, first);
   };
   var Throw_instance;
   function Throw_getInstance() {
@@ -2669,10 +2663,10 @@
     Call_instance = this;
     RuleWrapper_init_$Init$('call', 1, VOID, this);
   }
-  protoOf(Call).c2g = function (_this__u8e3s4) {
+  protoOf(Call).b2g = function (_this__u8e3s4) {
     return listOf(_this__u8e3s4.varOf('G'));
   };
-  protoOf(Call).d2g = function (_this__u8e3s4) {
+  protoOf(Call).c2g = 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')]);
@@ -2687,10 +2681,10 @@
     Catch_instance = this;
     RuleWrapper_init_$Init$('catch', 3, VOID, this);
   }
-  protoOf(Catch).c2g = function (_this__u8e3s4) {
+  protoOf(Catch).b2g = function (_this__u8e3s4) {
     return listOf_0([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
   };
-  protoOf(Catch).d2g = function (_this__u8e3s4) {
+  protoOf(Catch).c2g = function (_this__u8e3s4) {
     return _this__u8e3s4.varOf('G');
   };
   var Catch_instance;
@@ -2703,10 +2697,10 @@
     Comma_instance = this;
     RuleWrapper_init_$Init$(',', 2, VOID, this);
   }
-  protoOf(Comma).c2g = function (_this__u8e3s4) {
+  protoOf(Comma).b2g = function (_this__u8e3s4) {
     return listOf_0([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
-  protoOf(Comma).d2g = function (_this__u8e3s4) {
+  protoOf(Comma).c2g = function (_this__u8e3s4) {
     return _this__u8e3s4.tupleOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
   var Comma_instance;
@@ -2729,7 +2723,7 @@
     Fail_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Fail).d2g = function (_this__u8e3s4) {
+  protoOf(Fail).c2g = 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')]);
@@ -2747,7 +2741,7 @@
     Success_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Success).d2g = function (_this__u8e3s4) {
+  protoOf(Success).c2g = function (_this__u8e3s4) {
     return _this__u8e3s4.truthOf(true);
   };
   var Success_instance;
@@ -2757,8 +2751,8 @@
     return Success_instance;
   }
   function Companion_1() {
-    this.i33_1 = '\\+';
-    this.j33_1 = 1;
+    this.h33_1 = '\\+';
+    this.i33_1 = 1;
   }
   var Companion_instance_17;
   function Companion_getInstance_7() {
@@ -2767,37 +2761,37 @@
   function NegationAsFailure() {
     RuleWrapper_init_$Init$('\\+', 1, VOID, this);
   }
-  protoOf(NegationAsFailure).c2g = function (_this__u8e3s4) {
+  protoOf(NegationAsFailure).b2g = 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).u1s = get_standardInput;
-  protoOf(ClassicExecutionContext).v1s = get_standardOutput;
-  protoOf(ClassicExecutionContext).w1s = get_standardError;
-  protoOf(ClassicExecutionContext).x1s = get_warnings;
-  protoOf(ClassicExecutionContext).b1s = get_endTime;
-  protoOf(ClassicExecutionContext).d1s = get_remainingTime;
-  protoOf(ClassicExecutionContext).e1s = get_elapsedTime;
+  protoOf(ClassicExecutionContext).t1s = get_standardInput;
+  protoOf(ClassicExecutionContext).u1s = get_standardOutput;
+  protoOf(ClassicExecutionContext).v1s = get_standardError;
+  protoOf(ClassicExecutionContext).w1s = get_warnings;
+  protoOf(ClassicExecutionContext).a1s = get_endTime;
+  protoOf(ClassicExecutionContext).c1s = get_remainingTime;
+  protoOf(ClassicExecutionContext).d1s = get_elapsedTime;
   protoOf(ClassicSolverFactory).rawSolverOf = rawSolverOf;
   protoOf(ClassicSolverFactory).solverOf = solverOf;
   protoOf(ClassicSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ClassicSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ClassicSolverFactory).newBuilder = newBuilder;
-  protoOf(ClassicSolverFactory).v1u = get_defaultRuntime;
-  protoOf(ClassicSolverFactory).x1u = get_defaultUnificator;
-  protoOf(ClassicSolverFactory).y1u = get_defaultFlags;
-  protoOf(ClassicSolverFactory).b1v = get_defaultStaticKb;
-  protoOf(ClassicSolverFactory).c1v = get_defaultDynamicKb;
-  protoOf(ClassicSolverFactory).d1v = get_defaultInputChannel;
-  protoOf(ClassicSolverFactory).e1v = get_defaultOutputChannel;
-  protoOf(ClassicSolverFactory).f1v = get_defaultErrorChannel;
-  protoOf(ClassicSolverFactory).g1v = get_defaultWarningsChannel;
-  protoOf(ClassicSolverFactory).o1v = solverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).u1u = get_defaultRuntime;
+  protoOf(ClassicSolverFactory).w1u = get_defaultUnificator;
+  protoOf(ClassicSolverFactory).x1u = get_defaultFlags;
+  protoOf(ClassicSolverFactory).a1v = get_defaultStaticKb;
+  protoOf(ClassicSolverFactory).b1v = get_defaultDynamicKb;
+  protoOf(ClassicSolverFactory).c1v = get_defaultInputChannel;
+  protoOf(ClassicSolverFactory).d1v = get_defaultOutputChannel;
+  protoOf(ClassicSolverFactory).e1v = get_defaultErrorChannel;
+  protoOf(ClassicSolverFactory).f1v = get_defaultWarningsChannel;
+  protoOf(ClassicSolverFactory).n1v = solverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ClassicSolverFactory).q1v = mutableSolverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).p1v = mutableSolverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
   protoOf(MutableClassicSolver).loadStaticClauses = loadStaticClauses;
   protoOf(MutableClassicSolver).loadStaticClausesIterable = loadStaticClausesIterable;
@@ -2805,13 +2799,13 @@
   protoOf(MutableClassicSolver).loadDynamicClauses = loadDynamicClauses;
   protoOf(MutableClassicSolver).loadDynamicClausesIterable = loadDynamicClausesIterable;
   protoOf(MutableClassicSolver).loadDynamicClausesSequence = loadDynamicClausesSequence;
-  protoOf(AbstractState).c30 = get_isEndState;
+  protoOf(AbstractState).b30 = get_isEndState;
   protoOf(AbstractState).asEndState = asEndState;
   protoOf(AbstractState).castToEndState = castToEndState;
   protoOf(AbstractState).clone = clone;
-  protoOf(AbstractEndState).c30 = get_isEndState_0;
-  protoOf(AbstractEndState).d30 = asEndState_0;
-  protoOf(AbstractEndState).z2w = get_hasOpenAlternatives;
+  protoOf(AbstractEndState).b30 = get_isEndState_0;
+  protoOf(AbstractEndState).c30 = asEndState_0;
+  protoOf(AbstractEndState).y2w = get_hasOpenAlternatives;
   //endregion
   //region block: init
   ClassicSolverFactory_instance = new ClassicSolverFactory();
@@ -2820,12 +2814,12 @@
   //endregion
   //region block: exports
   function $jsExportAll$(_) {
-    var $it = _.it || (_.it = {});
-    var $it$unibo = $it.unibo || ($it.unibo = {});
-    var $it$unibo$tuprolog = $it$unibo.tuprolog || ($it$unibo.tuprolog = {});
-    var $it$unibo$tuprolog$solve = $it$unibo$tuprolog.solve || ($it$unibo$tuprolog.solve = {});
-    var $it$unibo$tuprolog$solve$classic = $it$unibo$tuprolog$solve.classic || ($it$unibo$tuprolog$solve.classic = {});
-    defineProp($it$unibo$tuprolog$solve$classic, 'ClassicSolverFactory', ClassicSolverFactory_getInstance, VOID, true);
+    var it = _.it || (_.it = {});
+    var unibo = it.unibo || (it.unibo = {});
+    var tuprolog = unibo.tuprolog || (unibo.tuprolog = {});
+    var solve = tuprolog.solve || (tuprolog.solve = {});
+    var classic = solve.classic || (solve.classic = {});
+    defineProp(classic, 'ClassicSolverFactory', ClassicSolverFactory_getInstance, VOID, true);
   }
   $jsExportAll$(_);
   _.$jsExportAll$ = $jsExportAll$;