@tuprolog/arg2p-core 0.7.2 → 0.8.1

package/2p-solve-classic.js

@@ -1,14 +1,14 @@
 (function (root, factory) {
   if (typeof define === 'function' && define.amd)
-    define(['exports', './2p-unify.js', './kotlin-kotlin-stdlib-js-ir.js', './2p-solve.js', './2p-theory.js', './2p-utils.js', './2p-core.js'], factory);
+    define(['exports', './2p-unify.js', './kotlin-kotlin-stdlib.js', './2p-solve.js', './2p-theory.js', './2p-utils.js', './2p-core.js'], factory);
   else if (typeof exports === 'object')
-    factory(module.exports, require('./2p-unify.js'), require('./kotlin-kotlin-stdlib-js-ir.js'), require('./2p-solve.js'), require('./2p-theory.js'), require('./2p-utils.js'), require('./2p-core.js'));
+    factory(module.exports, require('./2p-unify.js'), require('./kotlin-kotlin-stdlib.js'), require('./2p-solve.js'), require('./2p-theory.js'), require('./2p-utils.js'), require('./2p-core.js'));
   else {
     if (typeof this['2p-unify'] === 'undefined') {
       throw new Error("Error loading module '2p-solve-classic'. Its dependency '2p-unify' was not found. Please, check whether '2p-unify' is loaded prior to '2p-solve-classic'.");
     }
-    if (typeof this['kotlin-kotlin-stdlib-js-ir'] === 'undefined') {
-      throw new Error("Error loading module '2p-solve-classic'. Its dependency 'kotlin-kotlin-stdlib-js-ir' was not found. Please, check whether 'kotlin-kotlin-stdlib-js-ir' is loaded prior to '2p-solve-classic'.");
+    if (typeof this['kotlin-kotlin-stdlib'] === 'undefined') {
+      throw new Error("Error loading module '2p-solve-classic'. Its dependency 'kotlin-kotlin-stdlib' was not found. Please, check whether 'kotlin-kotlin-stdlib' is loaded prior to '2p-solve-classic'.");
     }
     if (typeof this['2p-solve'] === 'undefined') {
       throw new Error("Error loading module '2p-solve-classic'. Its dependency '2p-solve' was not found. Please, check whether '2p-solve' is loaded prior to '2p-solve-classic'.");
@@ -22,182 +22,169 @@
     if (typeof this['2p-core'] === 'undefined') {
       throw new Error("Error loading module '2p-solve-classic'. Its dependency '2p-core' was not found. Please, check whether '2p-core' is loaded prior to '2p-solve-classic'.");
     }
-    root['2p-solve-classic'] = factory(typeof this['2p-solve-classic'] === 'undefined' ? {} : this['2p-solve-classic'], this['2p-unify'], this['kotlin-kotlin-stdlib-js-ir'], this['2p-solve'], this['2p-theory'], this['2p-utils'], this['2p-core']);
+    root['2p-solve-classic'] = factory(typeof this['2p-solve-classic'] === 'undefined' ? {} : this['2p-solve-classic'], this['2p-unify'], this['kotlin-kotlin-stdlib'], this['2p-solve'], this['2p-theory'], this['2p-utils'], this['2p-core']);
   }
 }(this, function (_, kotlin_it_unibo_tuprolog_unify, kotlin_kotlin, kotlin_it_unibo_tuprolog_solve, kotlin_it_unibo_tuprolog_theory, kotlin_it_unibo_tuprolog_utils, kotlin_it_unibo_tuprolog_core) {
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var Companion_getInstance = kotlin_it_unibo_tuprolog_unify.$_$.a;
-  var VOID = kotlin_kotlin.$_$.s9;
-  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_solve.$_$.c1;
-  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_solve.$_$.y;
-  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_theory.$_$.b;
-  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_theory.$_$.a;
-  var Companion_getInstance_4 = kotlin_it_unibo_tuprolog_solve.$_$.n;
-  var Companion_getInstance_5 = kotlin_it_unibo_tuprolog_solve.$_$.p;
-  var Companion_getInstance_6 = kotlin_it_unibo_tuprolog_solve.$_$.o;
-  var Companion_getInstance_7 = kotlin_it_unibo_tuprolog_solve.$_$.q;
-  var Unit_getInstance = kotlin_kotlin.$_$.o1;
-  var toString = kotlin_kotlin.$_$.v5;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q;
-  var AbstractSolver = kotlin_it_unibo_tuprolog_solve.$_$.m1;
-  var protoOf = kotlin_kotlin.$_$.q5;
-  var THROW_CCE = kotlin_kotlin.$_$.f9;
-  var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.o9;
-  var getAllOperators = kotlin_it_unibo_tuprolog_solve.$_$.o3;
-  var toOperatorSet = kotlin_it_unibo_tuprolog_solve.$_$.q3;
-  var Long = kotlin_kotlin.$_$.z8;
-  var currentTimeInstant = kotlin_it_unibo_tuprolog_solve.$_$.m3;
-  var asSequence = kotlin_kotlin.$_$.o6;
-  var copy = kotlin_it_unibo_tuprolog_solve.$_$.d;
-  var solveWithTimeout = kotlin_it_unibo_tuprolog_solve.$_$.x2;
-  var solve = kotlin_it_unibo_tuprolog_solve.$_$.y2;
-  var solveListWithTimeout = kotlin_it_unibo_tuprolog_solve.$_$.s2;
-  var solveList = kotlin_it_unibo_tuprolog_solve.$_$.r2;
-  var solveListWithOptions = kotlin_it_unibo_tuprolog_solve.$_$.t2;
-  var solveOnceWithTimeout = kotlin_it_unibo_tuprolog_solve.$_$.u2;
-  var solveOnce = kotlin_it_unibo_tuprolog_solve.$_$.w2;
-  var solveOnceWithOptions = kotlin_it_unibo_tuprolog_solve.$_$.v2;
-  var get_standardInput = kotlin_it_unibo_tuprolog_solve.$_$.f2;
-  var get_standardOutput = kotlin_it_unibo_tuprolog_solve.$_$.g2;
-  var get_standardError = kotlin_it_unibo_tuprolog_solve.$_$.e2;
-  var get_warnings = kotlin_it_unibo_tuprolog_solve.$_$.h2;
-  var classMeta = kotlin_kotlin.$_$.u4;
-  var setMetadataFor = kotlin_kotlin.$_$.r5;
-  var ensureNotNull = kotlin_kotlin.$_$.i9;
-  var hashCode = kotlin_kotlin.$_$.b5;
-  var equals = kotlin_kotlin.$_$.x4;
-  var CoroutineImpl = kotlin_kotlin.$_$.m4;
-  var SequenceScope = kotlin_kotlin.$_$.k6;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.l4;
-  var sequence = kotlin_kotlin.$_$.n7;
-  var asSequence_0 = kotlin_kotlin.$_$.b2;
-  var emptySequence = kotlin_kotlin.$_$.t6;
-  var plus = kotlin_kotlin.$_$.l7;
-  var flatMap = kotlin_kotlin.$_$.z6;
-  var distinct = kotlin_kotlin.$_$.r6;
-  var cached = kotlin_it_unibo_tuprolog_utils.$_$.p;
-  var Companion_getInstance_8 = kotlin_it_unibo_tuprolog_core.$_$.r;
-  var filter = kotlin_kotlin.$_$.w6;
-  var map = kotlin_kotlin.$_$.h7;
-  var toList = kotlin_kotlin.$_$.t7;
-  var Companion_getInstance_9 = kotlin_it_unibo_tuprolog_solve.$_$.r;
-  var Companion_getInstance_10 = kotlin_it_unibo_tuprolog_core.$_$.s;
-  var Companion_getInstance_11 = kotlin_it_unibo_tuprolog_core.$_$.u;
-  var Companion_getInstance_12 = kotlin_it_unibo_tuprolog_utils.$_$.c;
-  var Companion_getInstance_13 = kotlin_kotlin.$_$.n1;
-  var emptySet = kotlin_kotlin.$_$.n2;
-  var lazy = kotlin_kotlin.$_$.k9;
-  var contains = kotlin_kotlin.$_$.p6;
-  var createSolver = kotlin_it_unibo_tuprolog_solve.$_$.b;
-  var update = kotlin_it_unibo_tuprolog_solve.$_$.c;
-  var apply = kotlin_it_unibo_tuprolog_solve.$_$.c2;
-  var applyIterable = kotlin_it_unibo_tuprolog_solve.$_$.b2;
-  var applySequence = kotlin_it_unibo_tuprolog_solve.$_$.d2;
-  var get_endTime = kotlin_it_unibo_tuprolog_solve.$_$.z1;
-  var get_remainingTime = kotlin_it_unibo_tuprolog_solve.$_$.a2;
-  var get_elapsedTime = kotlin_it_unibo_tuprolog_solve.$_$.y1;
-  var ExecutionContext = kotlin_it_unibo_tuprolog_solve.$_$.i2;
-  var KProperty1 = kotlin_kotlin.$_$.j6;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.z4;
-  var objectCreate = kotlin_kotlin.$_$.o5;
-  var rawSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.i;
-  var solverOf = kotlin_it_unibo_tuprolog_solve.$_$.h;
-  var mutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.e;
-  var rawMutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.f;
-  var newBuilder = kotlin_it_unibo_tuprolog_solve.$_$.j3;
-  var get_defaultRuntime = kotlin_it_unibo_tuprolog_solve.$_$.e3;
-  var get_defaultUnificator = kotlin_it_unibo_tuprolog_solve.$_$.g3;
-  var get_defaultFlags = kotlin_it_unibo_tuprolog_solve.$_$.b3;
-  var get_defaultStaticKb = kotlin_it_unibo_tuprolog_solve.$_$.f3;
-  var get_defaultDynamicKb = kotlin_it_unibo_tuprolog_solve.$_$.z2;
-  var get_defaultInputChannel = kotlin_it_unibo_tuprolog_solve.$_$.c3;
-  var get_defaultOutputChannel = kotlin_it_unibo_tuprolog_solve.$_$.d3;
-  var get_defaultErrorChannel = kotlin_it_unibo_tuprolog_solve.$_$.a3;
-  var get_defaultWarningsChannel = kotlin_it_unibo_tuprolog_solve.$_$.h3;
-  var solverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.k3;
-  var solverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.j;
-  var mutableSolverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.i3;
-  var mutableSolverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.g;
-  var SolverFactory = kotlin_it_unibo_tuprolog_solve.$_$.l3;
-  var objectMeta = kotlin_kotlin.$_$.p5;
-  var defineProp = kotlin_kotlin.$_$.w4;
-  var listOf = kotlin_kotlin.$_$.a3;
-  var getAllOperators_0 = kotlin_it_unibo_tuprolog_solve.$_$.p3;
-  var to = kotlin_kotlin.$_$.r9;
-  var loadStaticClauses = kotlin_it_unibo_tuprolog_solve.$_$.m2;
-  var loadStaticClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.n2;
-  var loadStaticClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.o2;
-  var loadDynamicClauses = kotlin_it_unibo_tuprolog_solve.$_$.l2;
-  var loadDynamicClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.j2;
-  var loadDynamicClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.k2;
-  var MutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.p2;
-  var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.w;
-  var TimeOutException_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.l;
-  var NoSuchElementException_init_$Create$_0 = kotlin_kotlin.$_$.x;
-  var interfaceMeta = kotlin_kotlin.$_$.c5;
+  var Companion_getInstance = kotlin_it_unibo_tuprolog_unify.$_$.b;
+  var VOID = kotlin_kotlin.$_$.d;
+  var Companion_instance = kotlin_it_unibo_tuprolog_solve.$_$.i1;
+  var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_solve.$_$.d1;
+  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.$_$.q;
+  var Companion_instance_3 = kotlin_it_unibo_tuprolog_solve.$_$.s;
+  var Companion_instance_4 = kotlin_it_unibo_tuprolog_solve.$_$.r;
+  var Companion_instance_5 = kotlin_it_unibo_tuprolog_solve.$_$.t;
+  var toString = kotlin_kotlin.$_$.f6;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.s;
+  var Unit_instance = kotlin_kotlin.$_$.s1;
+  var AbstractSolver = kotlin_it_unibo_tuprolog_solve.$_$.t1;
+  var protoOf = kotlin_kotlin.$_$.a6;
+  var THROW_CCE = kotlin_kotlin.$_$.v9;
+  var throwUninitializedPropertyAccessException = kotlin_kotlin.$_$.ea;
+  var getAllOperators = kotlin_it_unibo_tuprolog_solve.$_$.k3;
+  var toOperatorSet = kotlin_it_unibo_tuprolog_solve.$_$.m3;
+  var Long = kotlin_kotlin.$_$.p9;
+  var currentTimeInstant = kotlin_it_unibo_tuprolog_solve.$_$.i3;
+  var asSequence = kotlin_kotlin.$_$.z6;
+  var classMeta = kotlin_kotlin.$_$.e5;
+  var setMetadataFor = kotlin_kotlin.$_$.b6;
+  var ensureNotNull = kotlin_kotlin.$_$.y9;
+  var toLong = kotlin_kotlin.$_$.d6;
+  var hashCode = kotlin_kotlin.$_$.m5;
+  var equals = kotlin_kotlin.$_$.h5;
+  var CoroutineImpl = kotlin_kotlin.$_$.w4;
+  var SequenceScope = kotlin_kotlin.$_$.v6;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.v4;
+  var sequence = kotlin_kotlin.$_$.z7;
+  var asSequence_0 = kotlin_kotlin.$_$.h2;
+  var emptySequence = kotlin_kotlin.$_$.e7;
+  var plus = kotlin_kotlin.$_$.w7;
+  var flatMap = kotlin_kotlin.$_$.k7;
+  var distinct = kotlin_kotlin.$_$.c7;
+  var cached = kotlin_it_unibo_tuprolog_utils.$_$.t;
+  var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.u;
+  var filter = kotlin_kotlin.$_$.h7;
+  var map = kotlin_kotlin.$_$.s7;
+  var toList = kotlin_kotlin.$_$.g8;
+  var Companion_instance_6 = kotlin_it_unibo_tuprolog_solve.$_$.u;
+  var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_core.$_$.v;
+  var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_core.$_$.x;
+  var Companion_instance_7 = kotlin_it_unibo_tuprolog_utils.$_$.c;
+  var Companion_getInstance_4 = kotlin_kotlin.$_$.r1;
+  var emptySet = kotlin_kotlin.$_$.v2;
+  var lazy = kotlin_kotlin.$_$.aa;
+  var contains = kotlin_kotlin.$_$.a7;
+  var createSolver = kotlin_it_unibo_tuprolog_solve.$_$.e;
+  var createMutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.d;
+  var update = kotlin_it_unibo_tuprolog_solve.$_$.f;
+  var apply = kotlin_it_unibo_tuprolog_solve.$_$.f2;
+  var applyIterable = kotlin_it_unibo_tuprolog_solve.$_$.e2;
+  var applySequence = kotlin_it_unibo_tuprolog_solve.$_$.g2;
+  var get_standardInput = kotlin_it_unibo_tuprolog_solve.$_$.i2;
+  var get_standardOutput = kotlin_it_unibo_tuprolog_solve.$_$.j2;
+  var get_standardError = kotlin_it_unibo_tuprolog_solve.$_$.h2;
+  var get_warnings = kotlin_it_unibo_tuprolog_solve.$_$.k2;
+  var get_endTime = kotlin_it_unibo_tuprolog_solve.$_$.c2;
+  var get_remainingTime = kotlin_it_unibo_tuprolog_solve.$_$.d2;
+  var get_elapsedTime = kotlin_it_unibo_tuprolog_solve.$_$.b2;
+  var ExecutionContext = kotlin_it_unibo_tuprolog_solve.$_$.l2;
+  var KProperty1 = kotlin_kotlin.$_$.u6;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.k5;
+  var objectCreate = kotlin_kotlin.$_$.y5;
+  var rawSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.l;
+  var solverOf = kotlin_it_unibo_tuprolog_solve.$_$.k;
+  var mutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.h;
+  var rawMutableSolverOf = kotlin_it_unibo_tuprolog_solve.$_$.i;
+  var newBuilder = kotlin_it_unibo_tuprolog_solve.$_$.f3;
+  var get_defaultRuntime = kotlin_it_unibo_tuprolog_solve.$_$.a3;
+  var get_defaultUnificator = kotlin_it_unibo_tuprolog_solve.$_$.c3;
+  var get_defaultFlags = kotlin_it_unibo_tuprolog_solve.$_$.x2;
+  var get_defaultStaticKb = kotlin_it_unibo_tuprolog_solve.$_$.b3;
+  var get_defaultDynamicKb = kotlin_it_unibo_tuprolog_solve.$_$.v2;
+  var get_defaultInputChannel = kotlin_it_unibo_tuprolog_solve.$_$.y2;
+  var get_defaultOutputChannel = kotlin_it_unibo_tuprolog_solve.$_$.z2;
+  var get_defaultErrorChannel = kotlin_it_unibo_tuprolog_solve.$_$.w2;
+  var get_defaultWarningsChannel = kotlin_it_unibo_tuprolog_solve.$_$.d3;
+  var solverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.g3;
+  var solverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.m;
+  var mutableSolverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.e3;
+  var mutableSolverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.j;
+  var SolverFactory = kotlin_it_unibo_tuprolog_solve.$_$.h3;
+  var objectMeta = kotlin_kotlin.$_$.z5;
+  var defineProp = kotlin_kotlin.$_$.g5;
+  var listOf = kotlin_kotlin.$_$.j3;
+  var getAllOperators_0 = kotlin_it_unibo_tuprolog_solve.$_$.l3;
+  var to = kotlin_kotlin.$_$.ha;
+  var loadStaticClauses = kotlin_it_unibo_tuprolog_solve.$_$.p2;
+  var loadStaticClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.q2;
+  var loadStaticClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.r2;
+  var loadDynamicClauses = kotlin_it_unibo_tuprolog_solve.$_$.o2;
+  var loadDynamicClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.m2;
+  var loadDynamicClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.n2;
+  var MutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.s2;
+  var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.y;
+  var TimeOutException_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.o;
+  var NoSuchElementException_init_$Create$_0 = kotlin_kotlin.$_$.z;
+  var interfaceMeta = kotlin_kotlin.$_$.n5;
   var getKClass = kotlin_kotlin.$_$.c;
-  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.o;
-  var Companion_getInstance_14 = kotlin_it_unibo_tuprolog_solve.$_$.h1;
-  var MessageError = kotlin_it_unibo_tuprolog_solve.$_$.j1;
-  var Companion_getInstance_15 = kotlin_it_unibo_tuprolog_solve.$_$.v;
-  var plus_0 = kotlin_it_unibo_tuprolog_utils.$_$.f1;
-  var LogicError = kotlin_it_unibo_tuprolog_solve.$_$.k1;
-  var toSet = kotlin_kotlin.$_$.v7;
-  var plus_1 = kotlin_kotlin.$_$.q3;
-  var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.a1;
-  var drop = kotlin_kotlin.$_$.s6;
-  var first = kotlin_kotlin.$_$.y6;
-  var Unifier = kotlin_it_unibo_tuprolog_core.$_$.m1;
-  var isInterface = kotlin_kotlin.$_$.f5;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.t;
-  var ResolutionException = kotlin_it_unibo_tuprolog_solve.$_$.l1;
-  var Companion_getInstance_16 = kotlin_it_unibo_tuprolog_solve.$_$.w;
-  var extractSignature = kotlin_it_unibo_tuprolog_solve.$_$.n3;
-  var Signature = kotlin_it_unibo_tuprolog_solve.$_$.q2;
+  var ClassCastException_init_$Create$ = kotlin_kotlin.$_$.q;
+  var Companion_instance_8 = kotlin_it_unibo_tuprolog_solve.$_$.n1;
+  var MessageError = kotlin_it_unibo_tuprolog_solve.$_$.q1;
+  var Companion_instance_9 = kotlin_it_unibo_tuprolog_solve.$_$.a1;
+  var plus_0 = kotlin_it_unibo_tuprolog_utils.$_$.j1;
+  var LogicError = kotlin_it_unibo_tuprolog_solve.$_$.r1;
+  var toSet = kotlin_kotlin.$_$.i8;
+  var plus_1 = kotlin_kotlin.$_$.z3;
+  var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.f1;
+  var drop = kotlin_kotlin.$_$.d7;
+  var first = kotlin_kotlin.$_$.j7;
+  var Unifier = kotlin_it_unibo_tuprolog_core.$_$.s1;
+  var isInterface = kotlin_kotlin.$_$.q5;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.v;
+  var ResolutionException = kotlin_it_unibo_tuprolog_solve.$_$.s1;
+  var Companion_instance_10 = kotlin_it_unibo_tuprolog_solve.$_$.b1;
+  var extractSignature = kotlin_it_unibo_tuprolog_solve.$_$.j3;
+  var Signature = kotlin_it_unibo_tuprolog_solve.$_$.t2;
   var Expected_CALLABLE_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.a;
-  var cursor = kotlin_it_unibo_tuprolog_utils.$_$.r;
-  var Companion_getInstance_17 = kotlin_it_unibo_tuprolog_solve.$_$.t;
-  var prepareForExecutionWithUnifier = kotlin_it_unibo_tuprolog_core.$_$.n2;
-  var setOf = kotlin_kotlin.$_$.w3;
-  var Unknown_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.b1;
-  var MissingPredicate_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.k;
-  var Companion_getInstance_18 = kotlin_it_unibo_tuprolog_solve.$_$.s;
-  var contains_0 = kotlin_kotlin.$_$.e2;
-  var firstOrNull = kotlin_kotlin.$_$.x6;
-  var any = kotlin_kotlin.$_$.m6;
-  var LastCallOptimization_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.z;
-  var buffered = kotlin_it_unibo_tuprolog_utils.$_$.o;
-  var sequenceOf = kotlin_kotlin.$_$.m7;
-  var MagicCut = kotlin_it_unibo_tuprolog_solve.$_$.x1;
-  var Request = kotlin_it_unibo_tuprolog_solve.$_$.u1;
-  var ExtensionLibrary = kotlin_it_unibo_tuprolog_solve.$_$.n1;
-  var CommonBuiltins_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.g1;
-  var listOf_0 = kotlin_kotlin.$_$.b3;
-  var containsSignature = kotlin_it_unibo_tuprolog_solve.$_$.p1;
-  var containsOperator = kotlin_it_unibo_tuprolog_solve.$_$.o1;
-  var hasPrimitive = kotlin_it_unibo_tuprolog_solve.$_$.r1;
-  var hasFunction = kotlin_it_unibo_tuprolog_solve.$_$.q1;
-  var get_ruleSignatures = kotlin_it_unibo_tuprolog_solve.$_$.t1;
-  var hasProtected = kotlin_it_unibo_tuprolog_solve.$_$.s1;
-  var Struct = kotlin_it_unibo_tuprolog_core.$_$.l1;
-  var Companion_getInstance_19 = kotlin_it_unibo_tuprolog_solve.$_$.u;
-  var Companion_getInstance_20 = kotlin_it_unibo_tuprolog_solve.$_$.x;
-  var UnaryPredicate = kotlin_it_unibo_tuprolog_solve.$_$.v1;
-  var Companion_getInstance_21 = kotlin_it_unibo_tuprolog_solve.$_$.d1;
-  var RuleWrapper = kotlin_it_unibo_tuprolog_solve.$_$.w1;
-  var RuleWrapper_init_$Init$ = kotlin_it_unibo_tuprolog_solve.$_$.m;
-  var EnsureExecutable_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.f1;
-  var MagicCut_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.e1;
+  var cursor = kotlin_it_unibo_tuprolog_utils.$_$.v;
+  var Companion_instance_11 = kotlin_it_unibo_tuprolog_solve.$_$.y;
+  var prepareForExecutionWithUnifier = kotlin_it_unibo_tuprolog_core.$_$.u2;
+  var setOf = kotlin_kotlin.$_$.g4;
+  var Unknown_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.g1;
+  var MissingPredicate_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.n;
+  var Companion_instance_12 = kotlin_it_unibo_tuprolog_solve.$_$.x;
+  var contains_0 = kotlin_kotlin.$_$.k2;
+  var firstOrNull = kotlin_kotlin.$_$.i7;
+  var any = kotlin_kotlin.$_$.x6;
+  var LastCallOptimization_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.e1;
+  var buffered = kotlin_it_unibo_tuprolog_utils.$_$.s;
+  var sequenceOf = kotlin_kotlin.$_$.y7;
+  var MagicCut = kotlin_it_unibo_tuprolog_solve.$_$.a2;
+  var Request = kotlin_it_unibo_tuprolog_solve.$_$.w1;
+  var ExtensionLibrary = kotlin_it_unibo_tuprolog_solve.$_$.u1;
+  var CommonBuiltins_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.m1;
+  var listOf_0 = kotlin_kotlin.$_$.k3;
+  var Struct = kotlin_it_unibo_tuprolog_core.$_$.r1;
+  var Companion_instance_13 = kotlin_it_unibo_tuprolog_solve.$_$.z;
+  var Companion_instance_14 = kotlin_it_unibo_tuprolog_solve.$_$.c1;
+  var UnaryPredicate = kotlin_it_unibo_tuprolog_solve.$_$.y1;
+  var Companion_getInstance_5 = kotlin_it_unibo_tuprolog_solve.$_$.j1;
+  var RuleWrapper = kotlin_it_unibo_tuprolog_solve.$_$.z1;
+  var RuleWrapper_init_$Init$ = kotlin_it_unibo_tuprolog_solve.$_$.p;
+  var EnsureExecutable_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.l1;
+  var MagicCut_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.k1;
   //endregion
   //region block: pre-declaration
   setMetadataFor(AbstractClassicSolver, 'AbstractClassicSolver', classMeta, AbstractSolver);
   setMetadataFor(ChoicePointContext, 'ChoicePointContext', classMeta);
   setMetadataFor(Primitives, 'Primitives', classMeta, ChoicePointContext);
   setMetadataFor(Rules, 'Rules', classMeta, ChoicePointContext);
-  setMetadataFor(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn, 'ChoicePointContext$<get-pathToRoot>$slambda', classMeta, CoroutineImpl, VOID, VOID, VOID, [1]);
-  setMetadataFor(ClassicExecutionContext$pathToRoot$slambda, 'ClassicExecutionContext$pathToRoot$slambda', classMeta, CoroutineImpl, VOID, VOID, VOID, [1]);
+  setMetadataFor(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn, 'ChoicePointContext$<get-pathToRoot>$slambda', classMeta, CoroutineImpl, VOID, VOID, VOID, VOID, [1]);
+  setMetadataFor(ClassicExecutionContext$pathToRoot$slambda, 'ClassicExecutionContext$pathToRoot$slambda', classMeta, CoroutineImpl, VOID, VOID, VOID, VOID, [1]);
   setMetadataFor(ClassicExecutionContext, 'ClassicExecutionContext', classMeta, VOID, [ExecutionContext]);
   setMetadataFor(ClassicSolver, 'ClassicSolver', classMeta, AbstractClassicSolver);
   setMetadataFor(ClassicSolverFactory, 'ClassicSolverFactory', objectMeta, VOID, [SolverFactory]);
@@ -213,19 +200,19 @@
     var tmp0_elvis_lhs = this.asEndState();
     var tmp;
     if (tmp0_elvis_lhs == null) {
-      throw ClassCastException_init_$Create$('Cannot cast ' + this + ' to ' + getKClass(EndState).xc());
+      throw ClassCastException_init_$Create$('Cannot cast ' + this + ' to ' + getKClass(EndState).o6());
     } else {
       tmp = tmp0_elvis_lhs;
     }
     return tmp;
   }
   function clone(context, $super) {
-    context = context === VOID ? this.j5() : context;
-    return $super === VOID ? this.b30(context) : $super.b30.call(this, context);
+    context = context === VOID ? this.mb() : context;
+    return $super === VOID ? this.a35(context) : $super.a35.call(this, context);
   }
   setMetadataFor(State, 'State', interfaceMeta);
   function get_hasOpenAlternatives() {
-    return this.g2e().u1s() ? this.j5().a2x() : false;
+    return this.q2i().o1w() ? this.mb().z31() : false;
   }
   function get_isEndState_0() {
     return true;
@@ -233,6 +220,9 @@
   function asEndState_0() {
     return this;
   }
+  function asEndState_1() {
+    return this.x34();
+  }
   setMetadataFor(EndState, 'EndState', interfaceMeta, VOID, [State]);
   setMetadataFor(AbstractState, 'AbstractState', classMeta, VOID, [State]);
   setMetadataFor(AbstractEndState, 'AbstractEndState', classMeta, AbstractState, [EndState, AbstractState]);
@@ -264,147 +254,141 @@
   setMetadataFor(Companion_1, 'Companion', objectMeta);
   //endregion
   function AbstractClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    staticKb = staticKb === VOID ? Companion_getInstance_2().empty(unificator) : staticKb;
-    dynamicKb = dynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : dynamicKb;
-    stdIn = stdIn === VOID ? Companion_getInstance_4().stdIn() : stdIn;
-    stdOut = stdOut === VOID ? Companion_getInstance_5().stdOut() : stdOut;
-    stdErr = stdErr === VOID ? Companion_getInstance_5().stdErr() : stdErr;
-    warnings = warnings === VOID ? Companion_getInstance_5().warning() : warnings;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    dynamicKb = dynamicKb === VOID ? Companion_instance_1.empty(unificator) : dynamicKb;
+    stdIn = stdIn === VOID ? Companion_instance_2.stdIn() : stdIn;
+    stdOut = stdOut === VOID ? Companion_instance_3.stdOut() : stdOut;
+    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_getInstance_6().a1v(stdIn), Companion_getInstance_7().d1v(stdOut, stdErr, warnings), trustKb);
+    AbstractClassicSolver.call($this, unificator, libraries, flags, staticKb, dynamicKb, Companion_instance_4.x1y(stdIn), Companion_instance_5.a1z(stdOut, stdErr, warnings), trustKb);
     return $this;
   }
   function updateCurrentContextAfterStateTransition($this, source, destination, index) {
     // Inline function 'kotlin.require' call
-    var tmp0_require = destination.j5().w2v_1.equals(index);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!tmp0_require) {
-      var tmp$ret$0;
+    if (!destination.mb().v30_1.equals(index)) {
       // Inline function 'kotlin.require.<anonymous>' call
-      tmp$ret$0 = 'Failed requirement.';
-      var message = tmp$ret$0;
+      var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
-    $this.d2w(destination.j5());
+    $this.c31(destination.mb());
   }
   function AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref($boundThis) {
     var l = function (p0, p1, p2) {
       updateCurrentContextAfterStateTransition($boundThis, p0, p1, p2);
-      return Unit_getInstance();
+      return Unit_instance;
     };
     l.callableName = 'updateCurrentContextAfterStateTransition';
     return l;
   }
   function AbstractClassicSolver(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb) {
-    unificator = unificator === VOID ? Companion_getInstance().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    initialStaticKb = initialStaticKb === VOID ? Companion_getInstance_2().empty(unificator) : initialStaticKb;
-    initialDynamicKb = initialDynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : initialDynamicKb;
-    inputChannels = inputChannels === VOID ? Companion_getInstance_6().fromStandard() : inputChannels;
-    outputChannels = outputChannels === VOID ? Companion_getInstance_7().fromStandard() : outputChannels;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    initialDynamicKb = initialDynamicKb === VOID ? Companion_instance_1.empty(unificator) : initialDynamicKb;
+    inputChannels = inputChannels === VOID ? Companion_instance_4.fromStandard() : inputChannels;
+    outputChannels = outputChannels === VOID ? Companion_instance_5.fromStandard() : outputChannels;
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractSolver.call(this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
   }
-  protoOf(AbstractClassicSolver).d2w = function (_set____db54di) {
-    this.c2w_1 = _set____db54di;
+  protoOf(AbstractClassicSolver).c31 = function (_set____db54di) {
+    this.b31_1 = _set____db54di;
   };
-  protoOf(AbstractClassicSolver).t27 = function (_set____db54di) {
-    return this.d2w(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
+  protoOf(AbstractClassicSolver).s2b = function (_set____db54di) {
+    return this.c31(_set____db54di instanceof ClassicExecutionContext ? _set____db54di : THROW_CCE());
   };
-  protoOf(AbstractClassicSolver).r27 = function () {
-    var tmp = this.c2w_1;
+  protoOf(AbstractClassicSolver).q2b = function () {
+    var tmp = this.b31_1;
     if (!(tmp == null))
       return tmp;
     else {
       throwUninitializedPropertyAccessException('currentContext');
     }
   };
-  protoOf(AbstractClassicSolver).s27 = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, trustKb) {
-    return new ClassicExecutionContext(VOID, unificator, libraries, flags, trustKb ? staticKb.toImmutableTheory() : Companion_getInstance_2().empty(unificator), trustKb ? dynamicKb.toMutableTheory() : Companion_getInstance_3().empty(unificator), toOperatorSet(getAllOperators(libraries, [])), inputChannels, outputChannels, VOID, VOID, VOID, VOID, VOID, VOID, new Long(0, 0));
-  };
-  protoOf(AbstractClassicSolver).z27 = function (goal, options) {
-    var tmp0_unificator = this.f1i();
-    var tmp1_libraries = this.q1r();
-    var tmp2_flags = this.r1r();
-    var tmp3_staticKb = this.s1r().toImmutableTheory();
-    var tmp4_dynamicKb = this.t1r().toMutableTheory();
-    var tmp5_operators = this.y1r();
-    var tmp6_inputChannels = this.u1r();
-    var tmp7_outputChannels = this.v1r();
-    var tmp8_customData = this.r27().l2v_1;
+  protoOf(AbstractClassicSolver).r2b = 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, new Long(0, 0));
+  };
+  protoOf(AbstractClassicSolver).y2b = function (goal, options) {
+    var tmp0_unificator = this.e1l();
+    var tmp1_libraries = this.k1v();
+    var tmp2_flags = this.l1v();
+    var tmp3_staticKb = this.m1v().toImmutableTheory();
+    var tmp4_dynamicKb = this.n1v().toMutableTheory();
+    var tmp5_operators = this.t1v();
+    var tmp6_inputChannels = this.o1v();
+    var tmp7_outputChannels = this.p1v();
+    var tmp8_customData = this.q2b().k30_1;
     var tmp9_startTime = currentTimeInstant();
-    var tmp10_maxDuration = options.t1t();
-    this.d2w(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.r27());
-    return asSequence(this.e2w(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
+    var tmp10_maxDuration = options.r1x();
+    this.c31(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.q2b());
+    return asSequence(this.d31(tmp, AbstractClassicSolver$updateCurrentContextAfterStateTransition$ref(this)));
   };
   function Primitives(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.j2w_1 = alternatives;
-    this.k2w_1 = executionContext;
-    this.l2w_1 = parent;
-    this.m2w_1 = depth;
+    this.i31_1 = alternatives;
+    this.j31_1 = executionContext;
+    this.k31_1 = parent;
+    this.l31_1 = depth;
   }
-  protoOf(Primitives).n2w = function () {
-    return this.j2w_1;
+  protoOf(Primitives).m31 = function () {
+    return this.i31_1;
   };
-  protoOf(Primitives).o2w = function () {
-    return this.k2w_1;
+  protoOf(Primitives).n31 = function () {
+    return this.j31_1;
   };
-  protoOf(Primitives).p2w = function () {
-    return this.l2w_1;
+  protoOf(Primitives).o31 = function () {
+    return this.k31_1;
   };
-  protoOf(Primitives).q2w = function () {
-    return this.m2w_1;
+  protoOf(Primitives).p31 = function () {
+    return this.l31_1;
   };
   protoOf(Primitives).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Primitives).r2w = function () {
+  protoOf(Primitives).q31 = function () {
     return 'Primitives';
   };
-  protoOf(Primitives).s2w = function (context) {
-    var tmp0_$this = ensureNotNull(this.k2w_1);
-    var tmp1_primitives = this.j2w_1;
-    var tmp$ret$0;
+  protoOf(Primitives).r31 = function (context) {
+    var tmp0_$this = ensureNotNull(this.j31_1);
+    var tmp1_primitives = this.i31_1;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = context.w2v_1;
-    tmp$ret$0 = tmp0_plus.sf(new Long(1, 0));
-    var tmp2_step = tmp$ret$0;
-    var tmp3_startTime = context.r2v_1;
-    var tmp4_flags = context.f2v_1;
-    var tmp5_dynamicKb = context.h2v_1;
-    var tmp6_staticKb = context.g2v_1;
-    var tmp7_operators = context.i2v_1;
-    var tmp8_inputChannels = context.j2v_1;
-    var tmp9_outputChannels = context.k2v_1;
-    var tmp10_libraries = context.e2v_1;
-    var tmp11_customData = context.l2v_1.discardEphemeral();
-    var tempContext = tmp0_$this.t2w(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.u2w(this.j2w_1.wo(), tempContext);
-    return tempContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Primitives).v2w = function (alternatives, executionContext, parent, depth) {
+    var tmp2_step = context.v30_1.la(toLong(1));
+    var tmp3_startTime = context.q30_1;
+    var tmp4_flags = context.e30_1;
+    var tmp5_dynamicKb = context.g30_1;
+    var tmp6_staticKb = context.f30_1;
+    var tmp7_operators = context.h30_1;
+    var tmp8_inputChannels = context.i30_1;
+    var tmp9_outputChannels = context.j30_1;
+    var tmp10_libraries = context.d30_1;
+    var tmp11_customData = context.k30_1.discardEphemeral();
+    var tempContext = tmp0_$this.s31(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.t31(this.i31_1.wp(), tempContext);
+    return tempContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Primitives).u31 = function (alternatives, executionContext, parent, depth) {
     return new Primitives(alternatives, executionContext, parent, depth);
   };
-  protoOf(Primitives).u2w = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.j2w_1 : alternatives;
-    executionContext = executionContext === VOID ? this.k2w_1 : executionContext;
-    parent = parent === VOID ? this.l2w_1 : parent;
-    depth = depth === VOID ? this.m2w_1 : depth;
-    return $super === VOID ? this.v2w(alternatives, executionContext, parent, depth) : $super.v2w.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Primitives).t31 = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.i31_1 : alternatives;
+    executionContext = executionContext === VOID ? this.j31_1 : executionContext;
+    parent = parent === VOID ? this.k31_1 : parent;
+    depth = depth === VOID ? this.l31_1 : depth;
+    return $super === VOID ? this.u31(alternatives, executionContext, parent, depth) : $super.u31.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Primitives).hashCode = function () {
-    var result = hashCode(this.j2w_1);
-    result = imul(result, 31) + (this.k2w_1 == null ? 0 : this.k2w_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.l2w_1 == null ? 0 : hashCode(this.l2w_1)) | 0;
-    result = imul(result, 31) + this.m2w_1 | 0;
+    var result = hashCode(this.i31_1);
+    result = imul(result, 31) + (this.j31_1 == null ? 0 : this.j31_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.k31_1 == null ? 0 : hashCode(this.k31_1)) | 0;
+    result = imul(result, 31) + this.l31_1 | 0;
     return result;
   };
   protoOf(Primitives).equals = function (other) {
@@ -413,77 +397,74 @@
     if (!(other instanceof Primitives))
       return false;
     var tmp0_other_with_cast = other instanceof Primitives ? other : THROW_CCE();
-    if (!equals(this.j2w_1, tmp0_other_with_cast.j2w_1))
+    if (!equals(this.i31_1, tmp0_other_with_cast.i31_1))
       return false;
-    if (!equals(this.k2w_1, tmp0_other_with_cast.k2w_1))
+    if (!equals(this.j31_1, tmp0_other_with_cast.j31_1))
       return false;
-    if (!equals(this.l2w_1, tmp0_other_with_cast.l2w_1))
+    if (!equals(this.k31_1, tmp0_other_with_cast.k31_1))
       return false;
-    if (!(this.m2w_1 === tmp0_other_with_cast.m2w_1))
+    if (!(this.l31_1 === tmp0_other_with_cast.l31_1))
       return false;
     return true;
   };
   function Rules(alternatives, executionContext, parent, depth) {
     ChoicePointContext.call(this, alternatives, executionContext, parent, depth);
-    this.i2x_1 = alternatives;
-    this.j2x_1 = executionContext;
-    this.k2x_1 = parent;
-    this.l2x_1 = depth;
+    this.h32_1 = alternatives;
+    this.i32_1 = executionContext;
+    this.j32_1 = parent;
+    this.k32_1 = depth;
   }
-  protoOf(Rules).n2w = function () {
-    return this.i2x_1;
+  protoOf(Rules).m31 = function () {
+    return this.h32_1;
   };
-  protoOf(Rules).o2w = function () {
-    return this.j2x_1;
+  protoOf(Rules).n31 = function () {
+    return this.i32_1;
   };
-  protoOf(Rules).p2w = function () {
-    return this.k2x_1;
+  protoOf(Rules).o31 = function () {
+    return this.j32_1;
   };
-  protoOf(Rules).q2w = function () {
-    return this.l2x_1;
+  protoOf(Rules).p31 = function () {
+    return this.k32_1;
   };
   protoOf(Rules).toString = function () {
     return protoOf(ChoicePointContext).toString.call(this);
   };
-  protoOf(Rules).r2w = function () {
+  protoOf(Rules).q31 = function () {
     return 'Rules';
   };
-  protoOf(Rules).s2w = function (context) {
-    var tmp0_$this = ensureNotNull(this.j2x_1);
-    var tmp1_rules = this.i2x_1;
-    var tmp$ret$0;
+  protoOf(Rules).r31 = function (context) {
+    var tmp0_$this = ensureNotNull(this.i32_1);
+    var tmp1_rules = this.h32_1;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = context.w2v_1;
-    tmp$ret$0 = tmp0_plus.sf(new Long(1, 0));
-    var tmp2_step = tmp$ret$0;
-    var tmp3_startTime = context.r2v_1;
-    var tmp4_flags = context.f2v_1;
-    var tmp5_dynamicKb = context.h2v_1;
-    var tmp6_staticKb = context.g2v_1;
-    var tmp7_operators = context.i2v_1;
-    var tmp8_inputChannels = context.j2v_1;
-    var tmp9_outputChannels = context.k2v_1;
-    var tmp10_libraries = context.e2v_1;
-    var tmp11_customData = context.l2v_1.discardEphemeral();
-    var tempContext = tmp0_$this.t2w(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.m2x(this.i2x_1.wo(), tempContext);
-    return tempContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
-  };
-  protoOf(Rules).n2x = function (alternatives, executionContext, parent, depth) {
+    var tmp2_step = context.v30_1.la(toLong(1));
+    var tmp3_startTime = context.q30_1;
+    var tmp4_flags = context.e30_1;
+    var tmp5_dynamicKb = context.g30_1;
+    var tmp6_staticKb = context.f30_1;
+    var tmp7_operators = context.h30_1;
+    var tmp8_inputChannels = context.i30_1;
+    var tmp9_outputChannels = context.j30_1;
+    var tmp10_libraries = context.d30_1;
+    var tmp11_customData = context.k30_1.discardEphemeral();
+    var tempContext = tmp0_$this.s31(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.l32(this.h32_1.wp(), tempContext);
+    return tempContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, nextChoicePointContext);
+  };
+  protoOf(Rules).m32 = function (alternatives, executionContext, parent, depth) {
     return new Rules(alternatives, executionContext, parent, depth);
   };
-  protoOf(Rules).m2x = function (alternatives, executionContext, parent, depth, $super) {
-    alternatives = alternatives === VOID ? this.i2x_1 : alternatives;
-    executionContext = executionContext === VOID ? this.j2x_1 : executionContext;
-    parent = parent === VOID ? this.k2x_1 : parent;
-    depth = depth === VOID ? this.l2x_1 : depth;
-    return $super === VOID ? this.n2x(alternatives, executionContext, parent, depth) : $super.n2x.call(this, alternatives, executionContext, parent, depth);
+  protoOf(Rules).l32 = function (alternatives, executionContext, parent, depth, $super) {
+    alternatives = alternatives === VOID ? this.h32_1 : alternatives;
+    executionContext = executionContext === VOID ? this.i32_1 : executionContext;
+    parent = parent === VOID ? this.j32_1 : parent;
+    depth = depth === VOID ? this.k32_1 : depth;
+    return $super === VOID ? this.m32(alternatives, executionContext, parent, depth) : $super.m32.call(this, alternatives, executionContext, parent, depth);
   };
   protoOf(Rules).hashCode = function () {
-    var result = hashCode(this.i2x_1);
-    result = imul(result, 31) + (this.j2x_1 == null ? 0 : this.j2x_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.k2x_1 == null ? 0 : hashCode(this.k2x_1)) | 0;
-    result = imul(result, 31) + this.l2x_1 | 0;
+    var result = hashCode(this.h32_1);
+    result = imul(result, 31) + (this.i32_1 == null ? 0 : this.i32_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.j32_1 == null ? 0 : hashCode(this.j32_1)) | 0;
+    result = imul(result, 31) + this.k32_1 | 0;
     return result;
   };
   protoOf(Rules).equals = function (other) {
@@ -492,117 +473,114 @@
     if (!(other instanceof Rules))
       return false;
     var tmp0_other_with_cast = other instanceof Rules ? other : THROW_CCE();
-    if (!equals(this.i2x_1, tmp0_other_with_cast.i2x_1))
+    if (!equals(this.h32_1, tmp0_other_with_cast.h32_1))
       return false;
-    if (!equals(this.j2x_1, tmp0_other_with_cast.j2x_1))
+    if (!equals(this.i32_1, tmp0_other_with_cast.i32_1))
       return false;
-    if (!equals(this.k2x_1, tmp0_other_with_cast.k2x_1))
+    if (!equals(this.j32_1, tmp0_other_with_cast.j32_1))
       return false;
-    if (!(this.l2x_1 === tmp0_other_with_cast.l2x_1))
+    if (!(this.k32_1 === tmp0_other_with_cast.k32_1))
       return false;
     return true;
   };
   function ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this$0, resultContinuation) {
-    this.w2x_1 = this$0;
+    this.v32_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).z2x = function ($this$sequence, $completion) {
-    var tmp = this.a2y($this$sequence, $completion);
-    tmp.og_1 = Unit_getInstance();
-    tmp.pg_1 = null;
-    return tmp.ug();
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).y32 = function ($this$sequence, $completion) {
+    var tmp = this.z32($this$sequence, $completion);
+    tmp.hb_1 = Unit_instance;
+    tmp.ib_1 = null;
+    return tmp.qb();
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).gh = function (p1, $completion) {
-    return this.z2x(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).dc = function (p1, $completion) {
+    return this.y32(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).ug = function () {
-    var suspendResult = this.og_1;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).qb = function () {
+    var suspendResult = this.hb_1;
     $sm: do
       try {
-        var tmp = this.mg_1;
+        var tmp = this.fb_1;
         switch (tmp) {
           case 0:
-            this.ng_1 = 4;
-            this.y2x_1 = this.w2x_1;
-            this.mg_1 = 1;
+            this.gb_1 = 4;
+            this.x32_1 = this.v32_1;
+            this.fb_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.y2x_1 == null)) {
-              this.mg_1 = 3;
+            if (!!(this.x32_1 == null)) {
+              this.fb_1 = 3;
               continue $sm;
             }
 
-            this.mg_1 = 2;
-            suspendResult = this.x2x_1.a5(ensureNotNull(this.y2x_1), this);
+            this.fb_1 = 2;
+            suspendResult = this.w32_1.wd(ensureNotNull(this.x32_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.y2x_1 = this.y2x_1.p2w();
-            this.mg_1 = 1;
+            this.x32_1 = this.x32_1.o31();
+            this.fb_1 = 1;
             continue $sm;
           case 3:
-            return Unit_getInstance();
+            return Unit_instance;
           case 4:
-            throw this.pg_1;
+            throw this.ib_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.ng_1 === 4) {
+        if (this.gb_1 === 4) {
           throw e;
         } else {
-          this.mg_1 = this.ng_1;
-          this.pg_1 = e;
+          this.fb_1 = this.gb_1;
+          this.ib_1 = e;
         }
       }
      while (true);
   };
-  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).a2y = function ($this$sequence, completion) {
-    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.w2x_1, completion);
-    i.x2x_1 = $this$sequence;
+  protoOf(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn).z32 = function ($this$sequence, completion) {
+    var i = new ChoicePointContext$_get_pathToRoot_$slambda_q0myjn(this.v32_1, completion);
+    i.w32_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.z2x($this$sequence, $completion);
+      return i.y32($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
   }
   function ChoicePointContext(alternatives, executionContext, parent, depth) {
     depth = depth === VOID ? 0 : depth;
-    this.w2w_1 = alternatives;
-    this.x2w_1 = executionContext;
-    this.y2w_1 = parent;
-    this.z2w_1 = depth;
+    this.v31_1 = alternatives;
+    this.w31_1 = executionContext;
+    this.x31_1 = parent;
+    this.y31_1 = depth;
   }
-  protoOf(ChoicePointContext).n2w = function () {
-    return this.w2w_1;
+  protoOf(ChoicePointContext).m31 = function () {
+    return this.v31_1;
   };
-  protoOf(ChoicePointContext).o2w = function () {
-    return this.x2w_1;
+  protoOf(ChoicePointContext).n31 = function () {
+    return this.w31_1;
   };
-  protoOf(ChoicePointContext).p2w = function () {
-    return this.y2w_1;
+  protoOf(ChoicePointContext).o31 = function () {
+    return this.x31_1;
   };
-  protoOf(ChoicePointContext).q2w = function () {
-    return this.z2w_1;
+  protoOf(ChoicePointContext).p31 = function () {
+    return this.y31_1;
   };
-  protoOf(ChoicePointContext).a2x = function () {
+  protoOf(ChoicePointContext).z31 = function () {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.sequences.any' call
-      var tmp0_any = this.b2x();
-      var tmp0_iterator = tmp0_any.j();
-      while (tmp0_iterator.m()) {
-        var element = tmp0_iterator.n();
-        var tmp$ret$0;
+      var tmp0_iterator = this.a32().r();
+      while (tmp0_iterator.s()) {
+        var element = tmp0_iterator.u();
         // Inline function 'it.unibo.tuprolog.solve.classic.ChoicePointContext.<get-hasOpenAlternatives>.<anonymous>' call
-        tmp$ret$0 = element.n2w().yo();
-        if (tmp$ret$0) {
+        if (element.m31().yp()) {
           tmp$ret$1 = true;
           break $l$block;
         }
@@ -611,118 +589,117 @@
     }
     return tmp$ret$1;
   };
-  protoOf(ChoicePointContext).b2x = function () {
+  protoOf(ChoicePointContext).a32 = function () {
     return sequence(ChoicePointContext$_get_pathToRoot_$slambda_q0myjn_0(this, null));
   };
-  protoOf(ChoicePointContext).c2x = function () {
-    var tmp0_safe_receiver = this.o2w();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.v2v_1;
+  protoOf(ChoicePointContext).b32 = function () {
+    var tmp0_safe_receiver = this.n31();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.u30_1;
   };
-  protoOf(ChoicePointContext).d2x = function () {
-    var tmp0_safe_receiver = this.o2w();
-    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c2v_1;
+  protoOf(ChoicePointContext).c32 = function () {
+    var tmp0_safe_receiver = this.n31();
+    return tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b30_1;
   };
   protoOf(ChoicePointContext).toString = function () {
-    var tmp = this.r2w() + '(' + ('alternatives=' + this.n2w() + ', ');
+    var tmp = this.q31() + '(' + ('alternatives=' + this.m31() + ', ');
     var tmp_0;
-    if (this.o2w() === null) {
-      tmp_0 = 'executionContext=' + this.o2w() + ', ';
+    if (this.n31() === null) {
+      tmp_0 = 'executionContext=' + this.n31() + ', ';
     } else {
-      'executionContextDepth=' + this.c2x() + ', ';
-      tmp_0 = 'executionContextProcedure=' + this.d2x() + ', ';
+      'executionContextDepth=' + this.b32() + ', ';
+      tmp_0 = 'executionContextProcedure=' + this.c32() + ', ';
     }
-    return tmp + tmp_0 + ('depth=' + this.q2w()) + ')';
+    return tmp + tmp_0 + ('depth=' + this.p31()) + ')';
   };
   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.q2w() + 1 | 0;
+    return _this__u8e3s4 == null ? 0 : _this__u8e3s4.p31() + 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.x2v_1);
-    var tmp0_safe_receiver = $this.o2v_1.xo();
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.tt();
+    var tmp = asSequence_0($this.w30_1);
+    var tmp0_safe_receiver = $this.n30_1.xp();
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bv();
     return plus(tmp, tmp1_elvis_lhs == null ? emptySequence() : tmp1_elvis_lhs);
   }
   function _get_interestingVariables__k6uw5o($this) {
-    var tmp$ret$0;
     // Inline function 'kotlin.getValue' call
-    var tmp0_getValue = interestingVariables$factory();
-    tmp$ret$0 = $this.a2w_1.p2();
-    return tmp$ret$0;
+    var this_0 = $this.z30_1;
+    interestingVariables$factory();
+    return this_0.r2();
   }
   function ClassicExecutionContext$pathToRoot$slambda(this$0, resultContinuation) {
-    this.j2y_1 = this$0;
+    this.i33_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).m2y = function ($this$sequence, $completion) {
-    var tmp = this.n2y($this$sequence, $completion);
-    tmp.og_1 = Unit_getInstance();
-    tmp.pg_1 = null;
-    return tmp.ug();
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).l33 = function ($this$sequence, $completion) {
+    var tmp = this.m33($this$sequence, $completion);
+    tmp.hb_1 = Unit_instance;
+    tmp.ib_1 = null;
+    return tmp.qb();
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).gh = function (p1, $completion) {
-    return this.m2y(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).dc = function (p1, $completion) {
+    return this.l33(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).ug = function () {
-    var suspendResult = this.og_1;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).qb = function () {
+    var suspendResult = this.hb_1;
     $sm: do
       try {
-        var tmp = this.mg_1;
+        var tmp = this.fb_1;
         switch (tmp) {
           case 0:
-            this.ng_1 = 4;
-            this.l2y_1 = this.j2y_1;
-            this.mg_1 = 1;
+            this.gb_1 = 4;
+            this.k33_1 = this.i33_1;
+            this.fb_1 = 1;
             continue $sm;
           case 1:
-            if (!!(this.l2y_1 == null)) {
-              this.mg_1 = 3;
+            if (!!(this.k33_1 == null)) {
+              this.fb_1 = 3;
               continue $sm;
             }
 
-            this.mg_1 = 2;
-            suspendResult = this.k2y_1.a5(this.l2y_1, this);
+            this.fb_1 = 2;
+            suspendResult = this.j33_1.wd(this.k33_1, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
 
             continue $sm;
           case 2:
-            this.l2y_1 = this.l2y_1.u2v_1;
-            this.mg_1 = 1;
+            this.k33_1 = this.k33_1.t30_1;
+            this.fb_1 = 1;
             continue $sm;
           case 3:
-            return Unit_getInstance();
+            return Unit_instance;
           case 4:
-            throw this.pg_1;
+            throw this.ib_1;
         }
       } catch ($p) {
         var e = $p;
-        if (this.ng_1 === 4) {
+        if (this.gb_1 === 4) {
           throw e;
         } else {
-          this.mg_1 = this.ng_1;
-          this.pg_1 = e;
+          this.fb_1 = this.gb_1;
+          this.ib_1 = e;
         }
       }
      while (true);
   };
-  protoOf(ClassicExecutionContext$pathToRoot$slambda).n2y = function ($this$sequence, completion) {
-    var i = new ClassicExecutionContext$pathToRoot$slambda(this.j2y_1, completion);
-    i.k2y_1 = $this$sequence;
+  protoOf(ClassicExecutionContext$pathToRoot$slambda).m33 = function ($this$sequence, completion) {
+    var i = new ClassicExecutionContext$pathToRoot$slambda(this.i33_1, completion);
+    i.j33_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.m2y($this$sequence, $completion);
+      return i.l33($this$sequence, $completion);
     };
     l.$arity = 1;
     return l;
@@ -730,11 +707,11 @@
   function ClassicExecutionContext$currentGoal$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.o2v_1.zo()) {
+      if (this$0.n30_1.zp()) {
         tmp = null;
       } else {
-        var tmp0_safe_receiver = this$0.o2v_1.xo();
-        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.m2v_1);
+        var tmp0_safe_receiver = this$0.n30_1.xp();
+        tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.applySubstitution(this$0.l30_1);
       }
       return tmp;
     };
@@ -744,44 +721,44 @@
   }
   function ClassicExecutionContext$interestingVariables$delegate$lambda(this$0) {
     return function () {
-      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.n2v_1.tt());
-      return cached(distinct(plus(tmp, flatMap(this$0.y2v_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
+      var tmp = plus(_get_locallyInterestingVariables__39cqti(this$0), this$0.m30_1.bv());
+      return cached(distinct(plus(tmp, flatMap(this$0.x30_1, ClassicExecutionContext$interestingVariables$delegate$lambda$lambda))));
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda(it) {
-    return it.o2y();
+    return it.n33();
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0) {
     return function (it) {
-      var tmp0_elvis_lhs = it.c2v_1;
-      return tmp0_elvis_lhs == null ? Companion_getInstance_8().of('?-', [this$0.n2v_1]) : tmp0_elvis_lhs;
+      var tmp0_elvis_lhs = it.b30_1;
+      return tmp0_elvis_lhs == null ? Companion_getInstance_1().of('?-', [this$0.m30_1]) : tmp0_elvis_lhs;
     };
   }
   function ClassicExecutionContext$logicStackTrace$delegate$lambda(this$0) {
     return function () {
-      var tmp = filter(this$0.y2v_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
+      var tmp = filter(this$0.x30_1, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda);
       return toList(map(tmp, ClassicExecutionContext$logicStackTrace$delegate$lambda$lambda_0(this$0)));
     };
   }
   function ClassicExecutionContext(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) {
     procedure = procedure === VOID ? null : procedure;
-    unificator = unificator === VOID ? Companion_getInstance().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    staticKb = staticKb === VOID ? Companion_getInstance_2().empty(unificator) : staticKb;
-    dynamicKb = dynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : dynamicKb;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    dynamicKb = dynamicKb === VOID ? Companion_instance_1.empty(unificator) : dynamicKb;
     operators = operators === VOID ? toOperatorSet(getAllOperators(libraries, [staticKb, dynamicKb])) : operators;
-    inputChannels = inputChannels === VOID ? Companion_getInstance_6().fromStandard() : inputChannels;
-    outputChannels = outputChannels === VOID ? Companion_getInstance_7().fromStandard() : outputChannels;
-    customData = customData === VOID ? Companion_getInstance_9().empty() : customData;
-    substitution = substitution === VOID ? Companion_getInstance_10().empty() : substitution;
-    query = query === VOID ? Companion_getInstance_11().it_1 : query;
-    goals = goals === VOID ? Companion_getInstance_12().empty() : goals;
-    rules = rules === VOID ? Companion_getInstance_12().empty() : rules;
-    primitives = primitives === VOID ? Companion_getInstance_12().empty() : primitives;
+    inputChannels = inputChannels === VOID ? Companion_instance_4.fromStandard() : inputChannels;
+    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().qu_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;
     var tmp;
     if (maxDuration === VOID) {
-      Companion_getInstance_13();
+      Companion_getInstance_4();
       tmp = new Long(-1, 2147483647);
     } else {
       tmp = maxDuration;
@@ -792,221 +769,213 @@
     depth = depth === VOID ? 0 : depth;
     step = step === VOID ? new Long(0, 0) : step;
     relevantVariables = relevantVariables === VOID ? emptySet() : relevantVariables;
-    this.c2v_1 = procedure;
-    this.d2v_1 = unificator;
-    this.e2v_1 = libraries;
-    this.f2v_1 = flags;
-    this.g2v_1 = staticKb;
-    this.h2v_1 = dynamicKb;
-    this.i2v_1 = operators;
-    this.j2v_1 = inputChannels;
-    this.k2v_1 = outputChannels;
-    this.l2v_1 = customData;
-    this.m2v_1 = substitution;
-    this.n2v_1 = query;
-    this.o2v_1 = goals;
-    this.p2v_1 = rules;
-    this.q2v_1 = primitives;
-    this.r2v_1 = startTime;
-    this.s2v_1 = maxDuration;
-    this.t2v_1 = choicePoints;
-    this.u2v_1 = parent;
-    this.v2v_1 = depth;
-    this.w2v_1 = step;
-    this.x2v_1 = relevantVariables;
+    this.b30_1 = procedure;
+    this.c30_1 = unificator;
+    this.d30_1 = libraries;
+    this.e30_1 = flags;
+    this.f30_1 = staticKb;
+    this.g30_1 = dynamicKb;
+    this.h30_1 = operators;
+    this.i30_1 = inputChannels;
+    this.j30_1 = outputChannels;
+    this.k30_1 = customData;
+    this.l30_1 = substitution;
+    this.m30_1 = query;
+    this.n30_1 = goals;
+    this.o30_1 = rules;
+    this.p30_1 = primitives;
+    this.q30_1 = startTime;
+    this.r30_1 = maxDuration;
+    this.s30_1 = choicePoints;
+    this.t30_1 = parent;
+    this.u30_1 = depth;
+    this.v30_1 = step;
+    this.w30_1 = relevantVariables;
     // Inline function 'kotlin.require' call
-    var tmp0_require = (this.v2v_1 === 0 ? this.u2v_1 == null : false) ? true : this.v2v_1 > 0 ? !(this.u2v_1 == null) : false;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!tmp0_require) {
-      var tmp$ret$0;
+    if (!((this.u30_1 === 0 ? this.t30_1 == null : false) ? true : this.u30_1 > 0 ? !(this.t30_1 == null) : false)) {
       // Inline function 'kotlin.require.<anonymous>' call
-      tmp$ret$0 = 'Failed requirement.';
-      var message = tmp$ret$0;
+      var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     // Inline function 'kotlin.require' call
-    var tmp1_require = this.r2v_1.f1(new Long(0, 0)) >= 0;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!tmp1_require) {
-      var tmp$ret$1;
+    if (!(this.q30_1.m6(new Long(0, 0)) >= 0)) {
       // Inline function 'kotlin.require.<anonymous>' call
-      tmp$ret$1 = 'Failed requirement.';
-      var message_0 = tmp$ret$1;
+      var message_0 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_0));
     }
     // Inline function 'kotlin.require' call
-    var tmp2_require = this.s2v_1.f1(new Long(0, 0)) >= 0;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!tmp2_require) {
-      var tmp$ret$2;
+    if (!(this.r30_1.m6(new Long(0, 0)) >= 0)) {
       // Inline function 'kotlin.require.<anonymous>' call
-      tmp$ret$2 = 'Failed requirement.';
-      var message_1 = tmp$ret$2;
+      var message_1 = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message_1));
     }
     var tmp_0 = this;
-    tmp_0.y2v_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
+    tmp_0.x30_1 = sequence(ClassicExecutionContext$pathToRoot$slambda_0(this, null));
     var tmp_1 = this;
-    tmp_1.z2v_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
+    tmp_1.y30_1 = lazy(ClassicExecutionContext$currentGoal$delegate$lambda(this));
     var tmp_2 = this;
-    tmp_2.a2w_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
+    tmp_2.z30_1 = lazy(ClassicExecutionContext$interestingVariables$delegate$lambda(this));
     var tmp_3 = this;
-    tmp_3.b2w_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
+    tmp_3.a31_1 = lazy(ClassicExecutionContext$logicStackTrace$delegate$lambda(this));
   }
-  protoOf(ClassicExecutionContext).l1r = function () {
-    return this.c2v_1;
+  protoOf(ClassicExecutionContext).f1v = function () {
+    return this.b30_1;
   };
-  protoOf(ClassicExecutionContext).f1i = function () {
-    return this.d2v_1;
+  protoOf(ClassicExecutionContext).e1l = function () {
+    return this.c30_1;
   };
-  protoOf(ClassicExecutionContext).q1r = function () {
-    return this.e2v_1;
+  protoOf(ClassicExecutionContext).k1v = function () {
+    return this.d30_1;
   };
-  protoOf(ClassicExecutionContext).r1r = function () {
-    return this.f2v_1;
+  protoOf(ClassicExecutionContext).l1v = function () {
+    return this.e30_1;
   };
-  protoOf(ClassicExecutionContext).s1r = function () {
-    return this.g2v_1;
+  protoOf(ClassicExecutionContext).m1v = function () {
+    return this.f30_1;
   };
-  protoOf(ClassicExecutionContext).t1r = function () {
-    return this.h2v_1;
+  protoOf(ClassicExecutionContext).n1v = function () {
+    return this.g30_1;
   };
-  protoOf(ClassicExecutionContext).y1r = function () {
-    return this.i2v_1;
+  protoOf(ClassicExecutionContext).t1v = function () {
+    return this.h30_1;
   };
-  protoOf(ClassicExecutionContext).u1r = function () {
-    return this.j2v_1;
+  protoOf(ClassicExecutionContext).o1v = function () {
+    return this.i30_1;
   };
-  protoOf(ClassicExecutionContext).v1r = function () {
-    return this.k2v_1;
+  protoOf(ClassicExecutionContext).p1v = function () {
+    return this.j30_1;
   };
-  protoOf(ClassicExecutionContext).o1r = function () {
-    return this.l2v_1;
+  protoOf(ClassicExecutionContext).i1v = function () {
+    return this.k30_1;
   };
-  protoOf(ClassicExecutionContext).m1r = function () {
-    return this.m2v_1;
+  protoOf(ClassicExecutionContext).g1v = function () {
+    return this.l30_1;
   };
-  protoOf(ClassicExecutionContext).g1r = function () {
-    return this.r2v_1;
+  protoOf(ClassicExecutionContext).a1v = function () {
+    return this.q30_1;
   };
-  protoOf(ClassicExecutionContext).i1r = function () {
-    return this.s2v_1;
+  protoOf(ClassicExecutionContext).c1v = function () {
+    return this.r30_1;
   };
-  protoOf(ClassicExecutionContext).p2y = function () {
-    return this.v2v_1 === 0;
+  protoOf(ClassicExecutionContext).o33 = function () {
+    return this.u30_1 === 0;
   };
-  protoOf(ClassicExecutionContext).a2x = function () {
-    var tmp0_safe_receiver = this.t2v_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a2x();
+  protoOf(ClassicExecutionContext).z31 = function () {
+    var tmp0_safe_receiver = this.s30_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z31();
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(ClassicExecutionContext).o2y = function () {
-    return this.u2v_1 == null ? true : (this.v2v_1 - this.u2v_1.v2v_1 | 0) >= 1;
+  protoOf(ClassicExecutionContext).n33 = function () {
+    return this.t30_1 == null ? true : (this.u30_1 - this.t30_1.u30_1 | 0) >= 1;
   };
-  protoOf(ClassicExecutionContext).q2y = function () {
-    var tmp$ret$0;
+  protoOf(ClassicExecutionContext).p33 = function () {
     // Inline function 'kotlin.getValue' call
-    var tmp0_getValue = currentGoal$factory();
-    tmp$ret$0 = this.z2v_1.p2();
-    return tmp$ret$0;
+    var this_0 = this.y30_1;
+    currentGoal$factory();
+    return this_0.r2();
   };
-  protoOf(ClassicExecutionContext).r2y = function (variable) {
+  protoOf(ClassicExecutionContext).q33 = function (variable) {
     return contains(_get_interestingVariables__k6uw5o(this), variable);
   };
-  protoOf(ClassicExecutionContext).n1r = function () {
-    var tmp$ret$0;
+  protoOf(ClassicExecutionContext).h1v = function () {
     // Inline function 'kotlin.getValue' call
-    var tmp0_getValue = logicStackTrace$factory();
-    tmp$ret$0 = this.b2w_1.p2();
-    return tmp$ret$0;
+    var this_0 = this.a31_1;
+    logicStackTrace$factory();
+    return this_0.r2();
   };
-  protoOf(ClassicExecutionContext).p1r = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+  protoOf(ClassicExecutionContext).j1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
   };
-  protoOf(ClassicExecutionContext).x1r = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
-    return this.t2w(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
+  protoOf(ClassicExecutionContext).q1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels) {
+    return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, true);
+  };
+  protoOf(ClassicExecutionContext).s1v = function (unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData) {
+    return this.s31(VOID, unificator, libraries, flags, staticKb, dynamicKb.toMutableTheory(), operators, inputChannels, outputChannels, customData);
   };
-  protoOf(ClassicExecutionContext).s2y = function (sideEffect) {
+  protoOf(ClassicExecutionContext).r33 = function (sideEffect) {
     var tmp = apply.call(this, sideEffect);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).apply = function (sideEffect) {
-    return this.s2y(sideEffect);
+    return this.r33(sideEffect);
   };
-  protoOf(ClassicExecutionContext).t2y = function (sideEffects) {
+  protoOf(ClassicExecutionContext).s33 = function (sideEffects) {
     var tmp = applyIterable.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applyIterable = function (sideEffects) {
-    return this.t2y(sideEffects);
+    return this.s33(sideEffects);
   };
-  protoOf(ClassicExecutionContext).u2y = function (sideEffects) {
+  protoOf(ClassicExecutionContext).t33 = function (sideEffects) {
     var tmp = applySequence.call(this, sideEffects);
     return tmp instanceof ClassicExecutionContext ? tmp : THROW_CCE();
   };
   protoOf(ClassicExecutionContext).applySequence = function (sideEffects) {
-    return this.u2y(sideEffects);
+    return this.t33(sideEffects);
   };
   protoOf(ClassicExecutionContext).toString = function () {
-    return 'ClassicExecutionContext(' + ('step=' + toString(this.w2v_1) + ', ') + ('depth=' + this.v2v_1 + ', ') + ('substitution=' + this.m2v_1 + ', ') + ('logicStackTrace=' + this.n1r() + ', ') + ('goals=' + this.o2v_1 + ', ') + ('rules=' + this.p2v_1 + ', ') + ('primitives=' + this.q2v_1 + ', ') + ('startTime=' + toString(this.r2v_1) + ', ') + ('endTime=' + toString(this.h1r()) + ', ') + ('maxDuration=' + toString(this.s2v_1) + ', ') + ('unificator=' + this.d2v_1 + ', ') + ('choicePoints=' + this.t2v_1) + ')';
+    return 'ClassicExecutionContext(' + ('step=' + this.v30_1.toString() + ', ') + ('depth=' + this.u30_1 + ', ') + ('substitution=' + this.l30_1 + ', ') + ('logicStackTrace=' + this.h1v() + ', ') + ('goals=' + this.n30_1 + ', ') + ('rules=' + this.o30_1 + ', ') + ('primitives=' + this.p30_1 + ', ') + ('startTime=' + this.q30_1.toString() + ', ') + ('endTime=' + this.b1v().toString() + ', ') + ('maxDuration=' + this.r30_1.toString() + ', ') + ('unificator=' + this.c30_1 + ', ') + ('choicePoints=' + this.s30_1) + ')';
   };
-  protoOf(ClassicExecutionContext).v2y = 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).u33 = 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).t2w = 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.c2v_1 : procedure;
-    unificator = unificator === VOID ? this.d2v_1 : unificator;
-    libraries = libraries === VOID ? this.e2v_1 : libraries;
-    flags = flags === VOID ? this.f2v_1 : flags;
-    staticKb = staticKb === VOID ? this.g2v_1 : staticKb;
-    dynamicKb = dynamicKb === VOID ? this.h2v_1 : dynamicKb;
-    operators = operators === VOID ? this.i2v_1 : operators;
-    inputChannels = inputChannels === VOID ? this.j2v_1 : inputChannels;
-    outputChannels = outputChannels === VOID ? this.k2v_1 : outputChannels;
-    customData = customData === VOID ? this.l2v_1 : customData;
-    substitution = substitution === VOID ? this.m2v_1 : substitution;
-    query = query === VOID ? this.n2v_1 : query;
-    goals = goals === VOID ? this.o2v_1 : goals;
-    rules = rules === VOID ? this.p2v_1 : rules;
-    primitives = primitives === VOID ? this.q2v_1 : primitives;
-    startTime = startTime === VOID ? this.r2v_1 : startTime;
-    maxDuration = maxDuration === VOID ? this.s2v_1 : maxDuration;
-    choicePoints = choicePoints === VOID ? this.t2v_1 : choicePoints;
-    parent = parent === VOID ? this.u2v_1 : parent;
-    depth = depth === VOID ? this.v2v_1 : depth;
-    step = step === VOID ? this.w2v_1 : step;
-    relevantVariables = relevantVariables === VOID ? this.x2v_1 : relevantVariables;
-    return $super === VOID ? this.v2y(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.v2y.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).s31 = 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.b30_1 : procedure;
+    unificator = unificator === VOID ? this.c30_1 : unificator;
+    libraries = libraries === VOID ? this.d30_1 : libraries;
+    flags = flags === VOID ? this.e30_1 : flags;
+    staticKb = staticKb === VOID ? this.f30_1 : staticKb;
+    dynamicKb = dynamicKb === VOID ? this.g30_1 : dynamicKb;
+    operators = operators === VOID ? this.h30_1 : operators;
+    inputChannels = inputChannels === VOID ? this.i30_1 : inputChannels;
+    outputChannels = outputChannels === VOID ? this.j30_1 : outputChannels;
+    customData = customData === VOID ? this.k30_1 : customData;
+    substitution = substitution === VOID ? this.l30_1 : substitution;
+    query = query === VOID ? this.m30_1 : query;
+    goals = goals === VOID ? this.n30_1 : goals;
+    rules = rules === VOID ? this.o30_1 : rules;
+    primitives = primitives === VOID ? this.p30_1 : primitives;
+    startTime = startTime === VOID ? this.q30_1 : startTime;
+    maxDuration = maxDuration === VOID ? this.r30_1 : maxDuration;
+    choicePoints = choicePoints === VOID ? this.s30_1 : choicePoints;
+    parent = parent === VOID ? this.t30_1 : parent;
+    depth = depth === VOID ? this.u30_1 : depth;
+    step = step === VOID ? this.v30_1 : step;
+    relevantVariables = relevantVariables === VOID ? this.w30_1 : relevantVariables;
+    return $super === VOID ? this.u33(procedure, unificator, libraries, flags, staticKb, dynamicKb, operators, inputChannels, outputChannels, customData, substitution, query, goals, rules, primitives, startTime, maxDuration, choicePoints, parent, depth, step, relevantVariables) : $super.u33.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.c2v_1 == null ? 0 : this.c2v_1.hashCode();
-    result = imul(result, 31) + hashCode(this.d2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.e2v_1) | 0;
-    result = imul(result, 31) + this.f2v_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.g2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.h2v_1) | 0;
-    result = imul(result, 31) + this.i2v_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.j2v_1) | 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) + this.n2v_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.o2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.p2v_1) | 0;
-    result = imul(result, 31) + hashCode(this.q2v_1) | 0;
-    result = imul(result, 31) + this.r2v_1.hashCode() | 0;
-    result = imul(result, 31) + this.s2v_1.hashCode() | 0;
-    result = imul(result, 31) + (this.t2v_1 == null ? 0 : hashCode(this.t2v_1)) | 0;
-    result = imul(result, 31) + (this.u2v_1 == null ? 0 : this.u2v_1.hashCode()) | 0;
-    result = imul(result, 31) + this.v2v_1 | 0;
-    result = imul(result, 31) + this.w2v_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.x2v_1) | 0;
+    var result = this.b30_1 == null ? 0 : this.b30_1.hashCode();
+    result = imul(result, 31) + hashCode(this.c30_1) | 0;
+    result = imul(result, 31) + hashCode(this.d30_1) | 0;
+    result = imul(result, 31) + this.e30_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.f30_1) | 0;
+    result = imul(result, 31) + hashCode(this.g30_1) | 0;
+    result = imul(result, 31) + this.h30_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.i30_1) | 0;
+    result = imul(result, 31) + hashCode(this.j30_1) | 0;
+    result = imul(result, 31) + this.k30_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.l30_1) | 0;
+    result = imul(result, 31) + this.m30_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.n30_1) | 0;
+    result = imul(result, 31) + hashCode(this.o30_1) | 0;
+    result = imul(result, 31) + hashCode(this.p30_1) | 0;
+    result = imul(result, 31) + this.q30_1.hashCode() | 0;
+    result = imul(result, 31) + this.r30_1.hashCode() | 0;
+    result = imul(result, 31) + (this.s30_1 == null ? 0 : hashCode(this.s30_1)) | 0;
+    result = imul(result, 31) + (this.t30_1 == null ? 0 : this.t30_1.hashCode()) | 0;
+    result = imul(result, 31) + this.u30_1 | 0;
+    result = imul(result, 31) + this.v30_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.w30_1) | 0;
     return result;
   };
   protoOf(ClassicExecutionContext).equals = function (other) {
@@ -1015,55 +984,55 @@
     if (!(other instanceof ClassicExecutionContext))
       return false;
     var tmp0_other_with_cast = other instanceof ClassicExecutionContext ? other : THROW_CCE();
-    if (!equals(this.c2v_1, tmp0_other_with_cast.c2v_1))
+    if (!equals(this.b30_1, tmp0_other_with_cast.b30_1))
       return false;
-    if (!equals(this.d2v_1, tmp0_other_with_cast.d2v_1))
+    if (!equals(this.c30_1, tmp0_other_with_cast.c30_1))
       return false;
-    if (!equals(this.e2v_1, tmp0_other_with_cast.e2v_1))
+    if (!equals(this.d30_1, tmp0_other_with_cast.d30_1))
       return false;
-    if (!this.f2v_1.equals(tmp0_other_with_cast.f2v_1))
+    if (!this.e30_1.equals(tmp0_other_with_cast.e30_1))
       return false;
-    if (!equals(this.g2v_1, tmp0_other_with_cast.g2v_1))
+    if (!equals(this.f30_1, tmp0_other_with_cast.f30_1))
       return false;
-    if (!equals(this.h2v_1, tmp0_other_with_cast.h2v_1))
+    if (!equals(this.g30_1, tmp0_other_with_cast.g30_1))
       return false;
-    if (!this.i2v_1.equals(tmp0_other_with_cast.i2v_1))
+    if (!this.h30_1.equals(tmp0_other_with_cast.h30_1))
       return false;
-    if (!equals(this.j2v_1, tmp0_other_with_cast.j2v_1))
+    if (!equals(this.i30_1, tmp0_other_with_cast.i30_1))
       return false;
-    if (!equals(this.k2v_1, tmp0_other_with_cast.k2v_1))
+    if (!equals(this.j30_1, tmp0_other_with_cast.j30_1))
       return false;
-    if (!this.l2v_1.equals(tmp0_other_with_cast.l2v_1))
+    if (!this.k30_1.equals(tmp0_other_with_cast.k30_1))
       return false;
-    if (!equals(this.m2v_1, tmp0_other_with_cast.m2v_1))
+    if (!equals(this.l30_1, tmp0_other_with_cast.l30_1))
       return false;
-    if (!this.n2v_1.equals(tmp0_other_with_cast.n2v_1))
+    if (!this.m30_1.equals(tmp0_other_with_cast.m30_1))
       return false;
-    if (!equals(this.o2v_1, tmp0_other_with_cast.o2v_1))
+    if (!equals(this.n30_1, tmp0_other_with_cast.n30_1))
       return false;
-    if (!equals(this.p2v_1, tmp0_other_with_cast.p2v_1))
+    if (!equals(this.o30_1, tmp0_other_with_cast.o30_1))
       return false;
-    if (!equals(this.q2v_1, tmp0_other_with_cast.q2v_1))
+    if (!equals(this.p30_1, tmp0_other_with_cast.p30_1))
       return false;
-    if (!this.r2v_1.equals(tmp0_other_with_cast.r2v_1))
+    if (!this.q30_1.equals(tmp0_other_with_cast.q30_1))
       return false;
-    if (!this.s2v_1.equals(tmp0_other_with_cast.s2v_1))
+    if (!this.r30_1.equals(tmp0_other_with_cast.r30_1))
       return false;
-    if (!equals(this.t2v_1, tmp0_other_with_cast.t2v_1))
+    if (!equals(this.s30_1, tmp0_other_with_cast.s30_1))
       return false;
-    if (!equals(this.u2v_1, tmp0_other_with_cast.u2v_1))
+    if (!equals(this.t30_1, tmp0_other_with_cast.t30_1))
       return false;
-    if (!(this.v2v_1 === tmp0_other_with_cast.v2v_1))
+    if (!(this.u30_1 === tmp0_other_with_cast.u30_1))
       return false;
-    if (!this.w2v_1.equals(tmp0_other_with_cast.w2v_1))
+    if (!this.v30_1.equals(tmp0_other_with_cast.v30_1))
       return false;
-    if (!equals(this.x2v_1, tmp0_other_with_cast.x2v_1))
+    if (!equals(this.w30_1, tmp0_other_with_cast.w30_1))
       return false;
     return true;
   };
   function currentGoal$factory() {
     return getPropertyCallableRef('currentGoal', 1, KProperty1, function (receiver) {
-      return receiver.q2y();
+      return receiver.p33();
     }, null);
   }
   function interestingVariables$factory() {
@@ -1073,17 +1042,17 @@
   }
   function logicStackTrace$factory() {
     return getPropertyCallableRef('logicStackTrace', 1, KProperty1, function (receiver) {
-      return receiver.n1r();
+      return receiver.h1v();
     }, null);
   }
   function ClassicSolver_init_$Init$(unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    initialStaticKb = initialStaticKb === VOID ? Companion_getInstance_2().empty(unificator) : initialStaticKb;
-    initialDynamicKb = initialDynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : initialDynamicKb;
-    inputChannels = inputChannels === VOID ? Companion_getInstance_6().fromStandard() : inputChannels;
-    outputChannels = outputChannels === VOID ? Companion_getInstance_7().fromStandard() : outputChannels;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    initialDynamicKb = initialDynamicKb === VOID ? Companion_instance_1.empty(unificator) : initialDynamicKb;
+    inputChannels = inputChannels === VOID ? Companion_instance_4.fromStandard() : inputChannels;
+    outputChannels = outputChannels === VOID ? Companion_instance_5.fromStandard() : outputChannels;
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractClassicSolver.call($this, unificator, libraries, flags, initialStaticKb, initialDynamicKb, inputChannels, outputChannels, trustKb);
     ClassicSolver.call($this);
@@ -1093,15 +1062,15 @@
     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().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    staticKb = staticKb === VOID ? Companion_getInstance_2().empty(unificator) : staticKb;
-    dynamicKb = dynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : dynamicKb;
-    stdIn = stdIn === VOID ? Companion_getInstance_4().stdIn() : stdIn;
-    stdOut = stdOut === VOID ? Companion_getInstance_5().stdOut() : stdOut;
-    stdErr = stdErr === VOID ? Companion_getInstance_5().stdErr() : stdErr;
-    warnings = warnings === VOID ? Companion_getInstance_5().warning() : warnings;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    dynamicKb = dynamicKb === VOID ? Companion_instance_1.empty(unificator) : dynamicKb;
+    stdIn = stdIn === VOID ? Companion_instance_2.stdIn() : stdIn;
+    stdOut = stdOut === VOID ? Companion_instance_3.stdOut() : stdOut;
+    stdErr = stdErr === VOID ? Companion_instance_3.stdErr() : stdErr;
+    warnings = warnings === VOID ? Companion_instance_3.warning() : warnings;
     trustKb = trustKb === VOID ? false : trustKb;
     AbstractClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this);
     ClassicSolver.call($this);
@@ -1110,52 +1079,49 @@
   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).e2w = function (initialState, onStateTransition) {
-    return Companion_getInstance_22().x2y(initialState, onStateTransition);
+  protoOf(ClassicSolver).d31 = function (initialState, onStateTransition) {
+    return Companion_instance_15.w33(initialState, onStateTransition);
   };
-  protoOf(ClassicSolver).h1u = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolver).b1w = 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).u1p = function () {
+  protoOf(ClassicSolver).u1s = function () {
     return this.copy();
   };
   protoOf(ClassicSolver).clone = function () {
-    return this.u1p();
+    return this.u1s();
   };
   function ClassicSolver() {
   }
   function ClassicSolverFactory() {
-    ClassicSolverFactory_instance = this;
   }
-  protoOf(ClassicSolverFactory).n1u = function () {
+  protoOf(ClassicSolverFactory).k1y = function () {
     return DefaultBuiltins_getInstance();
   };
-  protoOf(ClassicSolverFactory).y1u = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).v1y = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return ClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
-  protoOf(ClassicSolverFactory).e1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).b1z = 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).g1v = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(ClassicSolverFactory).d1z = 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).i1v = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+  protoOf(ClassicSolverFactory).f1z = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
     return MutableClassicSolver_init_$Create$(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs);
   };
   var ClassicSolverFactory_instance;
   function ClassicSolverFactory_getInstance() {
-    if (ClassicSolverFactory_instance == null)
-      new ClassicSolverFactory();
     return ClassicSolverFactory_instance;
   }
   function MutableClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $this) {
-    unificator = unificator === VOID ? Companion_getInstance().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    staticKb = staticKb === VOID ? Companion_getInstance_2().empty(unificator) : staticKb;
-    dynamicKb = dynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : dynamicKb;
-    inputChannels = inputChannels === VOID ? Companion_getInstance_6().fromStandard() : inputChannels;
-    outputChannels = outputChannels === VOID ? Companion_getInstance_7().fromStandard() : outputChannels;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    dynamicKb = dynamicKb === VOID ? Companion_instance_1.empty(unificator) : dynamicKb;
+    inputChannels = inputChannels === VOID ? Companion_instance_4.fromStandard() : inputChannels;
+    outputChannels = outputChannels === VOID ? Companion_instance_5.fromStandard() : outputChannels;
     trustKb = trustKb === VOID ? false : trustKb;
     ClassicSolver_init_$Init$(unificator, libraries, flags, staticKb, dynamicKb, inputChannels, outputChannels, trustKb, $this);
     MutableClassicSolver.call($this);
@@ -1165,15 +1131,15 @@
     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().c1i() : unificator;
-    libraries = libraries === VOID ? Companion_getInstance_0().empty() : libraries;
-    flags = flags === VOID ? Companion_getInstance_1().empty() : flags;
-    staticKb = staticKb === VOID ? Companion_getInstance_2().empty(unificator) : staticKb;
-    dynamicKb = dynamicKb === VOID ? Companion_getInstance_3().empty(unificator) : dynamicKb;
-    stdIn = stdIn === VOID ? Companion_getInstance_4().stdIn() : stdIn;
-    stdOut = stdOut === VOID ? Companion_getInstance_5().stdOut() : stdOut;
-    stdErr = stdErr === VOID ? Companion_getInstance_5().stdErr() : stdErr;
-    warnings = warnings === VOID ? Companion_getInstance_5().warning() : warnings;
+    unificator = unificator === VOID ? Companion_getInstance().y1k() : 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;
+    dynamicKb = dynamicKb === VOID ? Companion_instance_1.empty(unificator) : dynamicKb;
+    stdIn = stdIn === VOID ? Companion_instance_2.stdIn() : stdIn;
+    stdOut = stdOut === VOID ? Companion_instance_3.stdOut() : stdOut;
+    stdErr = stdErr === VOID ? Companion_instance_3.stdErr() : stdErr;
+    warnings = warnings === VOID ? Companion_instance_3.warning() : warnings;
     trustKb = trustKb === VOID ? false : trustKb;
     ClassicSolver_init_$Init$_0(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, trustKb, $this);
     MutableClassicSolver.call($this);
@@ -1184,275 +1150,271 @@
   }
   function MutableClassicSolver$loadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.e2v_1.plusLibrary($library);
-      return $this$updateContext.t2w(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.i2v_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
+      var newRuntime = $this$updateContext.d30_1.plusLibrary($library);
+      return $this$updateContext.s31(VOID, VOID, newRuntime, VOID, VOID, VOID, $this$updateContext.h30_1.plusOperatorSet(toOperatorSet(getAllOperators(newRuntime, []))));
     };
   }
   function MutableClassicSolver$unloadLibrary$lambda($library) {
     return function ($this$updateContext) {
-      var newRuntime = $this$updateContext.e2v_1.plusLibrary($library);
-      return $this$updateContext.t2w(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.g2v_1, $this$updateContext.h2v_1])));
+      var newRuntime = $this$updateContext.d30_1.plusLibrary($library);
+      return $this$updateContext.s31(VOID, VOID, newRuntime, VOID, VOID, VOID, toOperatorSet(getAllOperators(newRuntime, [$this$updateContext.f30_1, $this$updateContext.g30_1])));
     };
   }
   function MutableClassicSolver$setRuntime$lambda($libraries) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.g2v_1, $this$updateContext.h2v_1])));
+      return $this$updateContext.s31(VOID, VOID, $libraries, VOID, VOID, VOID, toOperatorSet(getAllOperators($libraries, [$this$updateContext.f30_1, $this$updateContext.g30_1])));
     };
   }
   function MutableClassicSolver$resetStaticKb$lambda($this$updateContext) {
-    return $this$updateContext.t2w(VOID, VOID, VOID, VOID, Companion_getInstance_2().empty($this$updateContext.d2v_1), VOID, toOperatorSet(getAllOperators($this$updateContext.e2v_1, [$this$updateContext.h2v_1])));
+    return $this$updateContext.s31(VOID, VOID, VOID, VOID, Companion_instance_0.empty($this$updateContext.c30_1), VOID, toOperatorSet(getAllOperators($this$updateContext.d30_1, [$this$updateContext.g30_1])));
   }
   function MutableClassicSolver$resetDynamicKb$lambda($this$updateContext) {
-    return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, Companion_getInstance_3().empty($this$updateContext.d2v_1), toOperatorSet(getAllOperators($this$updateContext.e2v_1, [$this$updateContext.g2v_1])));
+    return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, Companion_instance_1.empty($this$updateContext.c30_1), toOperatorSet(getAllOperators($this$updateContext.d30_1, [$this$updateContext.f30_1])));
   }
   function MutableClassicSolver$assertA$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.h2v_1.k1p($clause), $this$updateContext.i2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g30_1.k1s($clause), $this$updateContext.h30_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertA$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.h2v_1.x1p($fact));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g30_1.j1t($fact));
     };
   }
   function MutableClassicSolver$assertZ$lambda($clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.h2v_1.o1p($clause), $this$updateContext.i2v_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g30_1.o1s($clause), $this$updateContext.h30_1.plusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$assertZ$lambda_0($fact) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $this$updateContext.h2v_1.y1p($fact));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $this$updateContext.g30_1.k1t($fact));
     };
   }
   function MutableClassicSolver$retract$lambda($result, $clause) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $result.c1p().toMutableTheory(), $this$updateContext.i2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory(), $this$updateContext.h30_1.minusOperatorSet(toOperatorSet(getAllOperators_0(listOf($clause)))));
     };
   }
   function MutableClassicSolver$retract$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $result.c1p().toMutableTheory());
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory());
     };
   }
   function MutableClassicSolver$retractAll$lambda($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $result.c1p().toMutableTheory(), $this$updateContext.i2v_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.c1p()))));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory(), $this$updateContext.h30_1.minusOperatorSet(toOperatorSet(getAllOperators_0($result.c1s()))));
     };
   }
   function MutableClassicSolver$retractAll$lambda_0($result) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, $result.c1p().toMutableTheory());
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, $result.c1s().toMutableTheory());
     };
   }
   function MutableClassicSolver$setFlag$lambda($name, $value) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, $this$updateContext.f2v_1.set($name, $value));
+      return $this$updateContext.s31(VOID, VOID, VOID, $this$updateContext.e30_1.set($name, $value));
     };
   }
   function MutableClassicSolver$setFlag$lambda_0($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, $this$updateContext.f2v_1.plusPair($flag));
+      return $this$updateContext.s31(VOID, VOID, VOID, $this$updateContext.e30_1.plusPair($flag));
     };
   }
   function MutableClassicSolver$setFlag$lambda_1($flag) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, $this$updateContext.f2v_1.plusNotable($flag));
+      return $this$updateContext.s31(VOID, VOID, VOID, $this$updateContext.e30_1.plusNotable($flag));
     };
   }
   function MutableClassicSolver$setStandardInput$lambda($stdIn) {
     return function ($this$updateContext) {
-      Companion_getInstance_6();
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.j2v_1.plus(to('stdin', $stdIn)));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.i30_1.plus(to('stdin', $stdIn)));
     };
   }
   function MutableClassicSolver$setStandardError$lambda($stdErr) {
     return function ($this$updateContext) {
-      Companion_getInstance_7();
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2v_1.plus(to('stderr', $stdErr)));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.j30_1.plus(to('stderr', $stdErr)));
     };
   }
   function MutableClassicSolver$setStandardOutput$lambda($stdOut) {
     return function ($this$updateContext) {
-      Companion_getInstance_7();
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.k2v_1.plus(to('stdout', $stdOut)));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this$updateContext.j30_1.plus(to('stdout', $stdOut)));
     };
   }
   function MutableClassicSolver$setWarnings$lambda($warnings) {
     return function ($this$updateContext) {
-      return $this$updateContext.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_getInstance_7().w1v($this$updateContext.k2v_1, $warnings));
+      return $this$updateContext.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_5.u1z($this$updateContext.j30_1, $warnings));
     };
   }
-  protoOf(MutableClassicSolver).z2y = function (library) {
-    this.q27(MutableClassicSolver$loadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).y33 = function (library) {
+    this.p2b(MutableClassicSolver$loadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).loadLibrary = function (library) {
-    return this.z2y(library);
+    return this.y33(library);
   };
-  protoOf(MutableClassicSolver).a2z = function (library) {
-    this.q27(MutableClassicSolver$unloadLibrary$lambda(library));
+  protoOf(MutableClassicSolver).z33 = function (library) {
+    this.p2b(MutableClassicSolver$unloadLibrary$lambda(library));
   };
   protoOf(MutableClassicSolver).unloadLibrary = function (library) {
-    return this.a2z(library);
+    return this.z33(library);
   };
-  protoOf(MutableClassicSolver).b2z = function (libraries) {
-    this.q27(MutableClassicSolver$setRuntime$lambda(libraries));
+  protoOf(MutableClassicSolver).a34 = function (libraries) {
+    this.p2b(MutableClassicSolver$setRuntime$lambda(libraries));
   };
   protoOf(MutableClassicSolver).setLibraries = function (libraries) {
-    return this.b2z(libraries);
+    return this.a34(libraries);
   };
-  protoOf(MutableClassicSolver).c2z = function (theory) {
-    this.u27(theory, VOID, false);
+  protoOf(MutableClassicSolver).b34 = function (theory) {
+    this.t2b(theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadStaticKb = function (theory) {
-    return this.c2z(theory);
+    return this.b34(theory);
   };
-  protoOf(MutableClassicSolver).d2z = function (theory) {
-    this.u27(theory);
+  protoOf(MutableClassicSolver).c34 = function (theory) {
+    this.t2b(theory);
   };
   protoOf(MutableClassicSolver).appendStaticKb = function (theory) {
-    return this.d2z(theory);
+    return this.c34(theory);
   };
-  protoOf(MutableClassicSolver).e2z = function () {
-    this.q27(MutableClassicSolver$resetStaticKb$lambda);
+  protoOf(MutableClassicSolver).d34 = function () {
+    this.p2b(MutableClassicSolver$resetStaticKb$lambda);
   };
   protoOf(MutableClassicSolver).resetStaticKb = function () {
-    return this.e2z();
+    return this.d34();
   };
-  protoOf(MutableClassicSolver).f2z = function (theory) {
-    this.u27(VOID, theory, VOID, false);
+  protoOf(MutableClassicSolver).e34 = function (theory) {
+    this.t2b(VOID, theory, VOID, false);
   };
   protoOf(MutableClassicSolver).loadDynamicKb = function (theory) {
-    return this.f2z(theory);
+    return this.e34(theory);
   };
-  protoOf(MutableClassicSolver).g2z = function (theory) {
-    this.u27(VOID, theory);
+  protoOf(MutableClassicSolver).f34 = function (theory) {
+    this.t2b(VOID, theory);
   };
   protoOf(MutableClassicSolver).appendDynamicKb = function (theory) {
-    return this.g2z(theory);
+    return this.f34(theory);
   };
-  protoOf(MutableClassicSolver).h2z = function () {
-    this.q27(MutableClassicSolver$resetDynamicKb$lambda);
+  protoOf(MutableClassicSolver).g34 = function () {
+    this.p2b(MutableClassicSolver$resetDynamicKb$lambda);
   };
   protoOf(MutableClassicSolver).resetDynamicKb = function () {
-    return this.h2z();
+    return this.g34();
   };
-  protoOf(MutableClassicSolver).r1j = function (clause) {
-    this.q27(MutableClassicSolver$assertA$lambda(clause));
+  protoOf(MutableClassicSolver).r1m = function (clause) {
+    this.p2b(MutableClassicSolver$assertA$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertA = function (clause) {
-    return this.r1j(clause);
+    return this.r1m(clause);
   };
-  protoOf(MutableClassicSolver).i2z = function (fact) {
-    this.q27(MutableClassicSolver$assertA$lambda_0(fact));
+  protoOf(MutableClassicSolver).h34 = function (fact) {
+    this.p2b(MutableClassicSolver$assertA$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertAFact = function (fact) {
-    return this.i2z(fact);
+    return this.h34(fact);
   };
-  protoOf(MutableClassicSolver).r1i = function (clause) {
-    this.q27(MutableClassicSolver$assertZ$lambda(clause));
+  protoOf(MutableClassicSolver).s1l = function (clause) {
+    this.p2b(MutableClassicSolver$assertZ$lambda(clause));
   };
   protoOf(MutableClassicSolver).assertZ = function (clause) {
-    return this.r1i(clause);
+    return this.s1l(clause);
   };
-  protoOf(MutableClassicSolver).j2z = function (fact) {
-    this.q27(MutableClassicSolver$assertZ$lambda_0(fact));
+  protoOf(MutableClassicSolver).i34 = function (fact) {
+    this.p2b(MutableClassicSolver$assertZ$lambda_0(fact));
   };
   protoOf(MutableClassicSolver).assertZFact = function (fact) {
-    return this.j2z(fact);
+    return this.i34(fact);
   };
-  protoOf(MutableClassicSolver).z1p = function (clause) {
-    var result = this.t1r().retract(clause);
-    this.q27(MutableClassicSolver$retract$lambda(result, clause));
+  protoOf(MutableClassicSolver).l1t = function (clause) {
+    var result = this.n1v().retract(clause);
+    this.p2b(MutableClassicSolver$retract$lambda(result, clause));
     return result;
   };
   protoOf(MutableClassicSolver).retract = function (clause) {
-    return this.z1p(clause);
+    return this.l1t(clause);
   };
-  protoOf(MutableClassicSolver).a1q = function (fact) {
-    var result = this.t1r().retractByHead(fact);
-    this.q27(MutableClassicSolver$retract$lambda_0(result));
+  protoOf(MutableClassicSolver).m1t = function (fact) {
+    var result = this.n1v().retractByHead(fact);
+    this.p2b(MutableClassicSolver$retract$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractByHead = function (fact) {
-    return this.a1q(fact);
+    return this.m1t(fact);
   };
-  protoOf(MutableClassicSolver).x1i = function (clause) {
-    var result = this.t1r().retractAll(clause);
-    this.q27(MutableClassicSolver$retractAll$lambda(result));
+  protoOf(MutableClassicSolver).x1l = function (clause) {
+    var result = this.n1v().retractAll(clause);
+    this.p2b(MutableClassicSolver$retractAll$lambda(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAll = function (clause) {
-    return this.x1i(clause);
+    return this.x1l(clause);
   };
-  protoOf(MutableClassicSolver).k2z = function (fact) {
-    var result = this.t1r().retractAllByHead(fact);
-    this.q27(MutableClassicSolver$retractAll$lambda_0(result));
+  protoOf(MutableClassicSolver).j34 = function (fact) {
+    var result = this.n1v().retractAllByHead(fact);
+    this.p2b(MutableClassicSolver$retractAll$lambda_0(result));
     return result;
   };
   protoOf(MutableClassicSolver).retractAllBeHead = function (fact) {
-    return this.k2z(fact);
+    return this.j34(fact);
   };
-  protoOf(MutableClassicSolver).l2z = function (name, value) {
-    this.q27(MutableClassicSolver$setFlag$lambda(name, value));
+  protoOf(MutableClassicSolver).k34 = function (name, value) {
+    this.p2b(MutableClassicSolver$setFlag$lambda(name, value));
   };
   protoOf(MutableClassicSolver).setFlag = function (name, value) {
-    return this.l2z(name, value);
+    return this.k34(name, value);
   };
-  protoOf(MutableClassicSolver).m2z = function (flag) {
-    this.q27(MutableClassicSolver$setFlag$lambda_0(flag));
+  protoOf(MutableClassicSolver).l34 = function (flag) {
+    this.p2b(MutableClassicSolver$setFlag$lambda_0(flag));
   };
   protoOf(MutableClassicSolver).setFlagPair = function (flag) {
-    return this.m2z(flag);
+    return this.l34(flag);
   };
-  protoOf(MutableClassicSolver).n2z = function (flag) {
-    this.q27(MutableClassicSolver$setFlag$lambda_1(flag));
+  protoOf(MutableClassicSolver).m34 = function (flag) {
+    this.p2b(MutableClassicSolver$setFlag$lambda_1(flag));
   };
   protoOf(MutableClassicSolver).setFlagNotable = function (flag) {
-    return this.n2z(flag);
+    return this.m34(flag);
   };
-  protoOf(MutableClassicSolver).o2z = function (stdIn) {
-    this.q27(MutableClassicSolver$setStandardInput$lambda(stdIn));
+  protoOf(MutableClassicSolver).n34 = function (stdIn) {
+    this.p2b(MutableClassicSolver$setStandardInput$lambda(stdIn));
   };
   protoOf(MutableClassicSolver).setStandardInput = function (stdIn) {
-    return this.o2z(stdIn);
+    return this.n34(stdIn);
   };
-  protoOf(MutableClassicSolver).p2z = function (stdErr) {
-    this.q27(MutableClassicSolver$setStandardError$lambda(stdErr));
+  protoOf(MutableClassicSolver).o34 = function (stdErr) {
+    this.p2b(MutableClassicSolver$setStandardError$lambda(stdErr));
   };
   protoOf(MutableClassicSolver).setStandardError = function (stdErr) {
-    return this.p2z(stdErr);
+    return this.o34(stdErr);
   };
-  protoOf(MutableClassicSolver).q2z = function (stdOut) {
-    this.q27(MutableClassicSolver$setStandardOutput$lambda(stdOut));
+  protoOf(MutableClassicSolver).p34 = function (stdOut) {
+    this.p2b(MutableClassicSolver$setStandardOutput$lambda(stdOut));
   };
   protoOf(MutableClassicSolver).setStandardOutput = function (stdOut) {
-    return this.q2z(stdOut);
+    return this.p34(stdOut);
   };
-  protoOf(MutableClassicSolver).r2z = function (warnings) {
-    this.q27(MutableClassicSolver$setWarnings$lambda(warnings));
+  protoOf(MutableClassicSolver).q34 = function (warnings) {
+    this.p2b(MutableClassicSolver$setWarnings$lambda(warnings));
   };
   protoOf(MutableClassicSolver).setWarnings = function (warnings) {
-    return this.r2z(warnings);
+    return this.q34(warnings);
   };
-  protoOf(MutableClassicSolver).h1u = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+  protoOf(MutableClassicSolver).b1w = 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).u1p = function () {
+  protoOf(MutableClassicSolver).u1s = function () {
     return this.copy();
   };
   protoOf(MutableClassicSolver).clone = function () {
-    return this.u1p();
+    return this.u1s();
   };
   function MutableClassicSolver() {
   }
   function SolutionIterator$Companion$of$lambda(_anonymous_parameter_0__qggqh8, _anonymous_parameter_1__qggqgd, _anonymous_parameter_2__qggqfi) {
-    return Unit_getInstance();
+    return Unit_instance;
   }
   function Companion() {
-    Companion_instance = this;
   }
-  protoOf(Companion).x2y = function (initialState, onStateTransition) {
+  protoOf(Companion).w33 = function (initialState, onStateTransition) {
     return new SimpleSolutionIterator(initialState, onStateTransition);
   };
   protoOf(Companion).of = function (initialState, onStateTransition, $super) {
@@ -1463,96 +1425,84 @@
       tmp = onStateTransition;
     }
     onStateTransition = tmp;
-    return $super === VOID ? this.x2y(initialState, onStateTransition) : $super.x2y.call(this, initialState, onStateTransition);
+    return $super === VOID ? this.w33(initialState, onStateTransition) : $super.w33.call(this, initialState, onStateTransition);
   };
-  var Companion_instance;
-  function Companion_getInstance_22() {
-    if (Companion_instance == null)
-      new Companion();
-    return Companion_instance;
+  var Companion_instance_15;
+  function Companion_getInstance_6() {
+    return Companion_instance_15;
   }
   function AbstractEndState(solution, context) {
     AbstractState.call(this, context);
-    this.u2z_1 = solution;
-    this.v2z_1 = context;
+    this.t34_1 = solution;
+    this.u34_1 = context;
   }
-  protoOf(AbstractEndState).g2e = function () {
-    return this.u2z_1;
+  protoOf(AbstractEndState).q2i = function () {
+    return this.t34_1;
   };
-  protoOf(AbstractEndState).j5 = function () {
-    return this.v2z_1;
+  protoOf(AbstractEndState).mb = function () {
+    return this.u34_1;
   };
-  protoOf(AbstractEndState).w2z = function () {
+  protoOf(AbstractEndState).v34 = function () {
     throw NoSuchElementException_init_$Create$();
   };
   protoOf(AbstractEndState).asEndState = function () {
-    return this.y2z();
+    return this.x34();
   };
   function AbstractState$executionTime$delegate$lambda(this$0) {
     return function () {
-      return this$0.e30();
+      return this$0.d35();
     };
   }
   function AbstractState(context) {
-    this.z2z_1 = context;
+    this.y34_1 = context;
     var tmp = this;
-    tmp.a30_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
+    tmp.z34_1 = lazy(AbstractState$executionTime$delegate$lambda(this));
   }
-  protoOf(AbstractState).j5 = function () {
-    return this.z2z_1;
+  protoOf(AbstractState).mb = function () {
+    return this.y34_1;
   };
-  protoOf(AbstractState).c30 = function () {
-    var tmp$ret$0;
+  protoOf(AbstractState).b35 = function () {
     // Inline function 'kotlin.getValue' call
-    var tmp0_getValue = executionTime$factory();
-    tmp$ret$0 = this.a30_1.p2();
-    return tmp$ret$0;
+    var this_0 = this.z34_1;
+    executionTime$factory();
+    return this_0.r2();
   };
-  protoOf(AbstractState).d30 = function () {
-    return this.c30().tf(this.j5().r2v_1).f1(this.j5().s2v_1) > 0;
+  protoOf(AbstractState).c35 = function () {
+    return this.b35().ma(this.mb().q30_1).m6(this.mb().r30_1) > 0;
   };
-  protoOf(AbstractState).n = function () {
+  protoOf(AbstractState).u = function () {
     var tmp;
-    if (this.d30()) {
-      var tmp0_exceededDuration = this.j5().s2v_1;
-      var tmp1_context = this.j5();
-      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.j5().t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+    if (this.c35()) {
+      var tmp0_exceededDuration = this.mb().r30_1;
+      var tmp1_context = this.mb();
+      tmp = new StateHalt(TimeOutException_init_$Create$(VOID, VOID, tmp1_context, tmp0_exceededDuration), this.mb().s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
     } else {
-      tmp = this.w2z();
+      tmp = this.v34();
     }
     return tmp;
   };
   protoOf(AbstractState).next = function () {
-    return this.n();
+    return this.u();
   };
-  protoOf(AbstractState).e30 = function () {
+  protoOf(AbstractState).d35 = function () {
     return currentTimeInstant();
   };
-  protoOf(AbstractState).f30 = function () {
-    var tmp$ret$0;
+  protoOf(AbstractState).e35 = function () {
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = this.j5().w2v_1;
-    tmp$ret$0 = tmp0_plus.sf(new Long(1, 0));
-    return tmp$ret$0;
+    return this.mb().v30_1.la(toLong(1));
   };
-  protoOf(AbstractState).g30 = function (_this__u8e3s4) {
+  protoOf(AbstractState).f35 = function (_this__u8e3s4) {
     var tmp$ret$2;
     $l$block: {
       // Inline function 'kotlin.sequences.first' call
-      var tmp0_first = _this__u8e3s4.y2v_1;
-      var tmp0_iterator = tmp0_first.j();
-      while (tmp0_iterator.m()) {
-        var element = tmp0_iterator.n();
-        var tmp$ret$1;
+      var tmp0_iterator = _this__u8e3s4.x30_1.r();
+      while (tmp0_iterator.s()) {
+        var element = tmp0_iterator.u();
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.AbstractState.skipThrow.<anonymous>' call
-        var tmp0_safe_receiver = element.c2v_1;
-        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.rt();
-        var tmp$ret$0;
+        var tmp0_safe_receiver = element.b30_1;
+        var tmp = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zu();
         // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-        var tmp0__get_functor__thl4dk = Throw_getInstance();
-        tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-        tmp$ret$1 = !(tmp === tmp$ret$0);
-        if (tmp$ret$1) {
+        if (!(tmp === Throw_getInstance().signature.name)) {
           tmp$ret$2 = element;
           break $l$block;
         }
@@ -1563,7 +1513,7 @@
   };
   function executionTime$factory() {
     return getPropertyCallableRef('executionTime', 1, KProperty1, function (receiver) {
-      return receiver.c30();
+      return receiver.b35();
     }, null);
   }
   function EndState() {
@@ -1572,35 +1522,28 @@
   }
   function StateBacktracking(context) {
     AbstractState.call(this, context);
-    this.j30_1 = context;
+    this.i35_1 = context;
   }
-  protoOf(StateBacktracking).j5 = function () {
-    return this.j30_1;
+  protoOf(StateBacktracking).mb = function () {
+    return this.i35_1;
   };
-  protoOf(StateBacktracking).w2z = function () {
-    var choicePoints = this.j30_1.t2v_1;
+  protoOf(StateBacktracking).v34 = function () {
+    var choicePoints = this.i35_1.s30_1;
     var tmp;
-    var tmp$ret$1;
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-    tmp$ret$0 = choicePoints === null ? true : !choicePoints.a2x();
-    tmp$ret$1 = tmp$ret$0;
-    if (tmp$ret$1) {
-      tmp = new StateEnd(Companion_getInstance_14().no(this.j30_1.n2v_1), this.j30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+    if (choicePoints === null ? true : !choicePoints.z31()) {
+      tmp = new StateEnd(Companion_instance_8.no(this.i35_1.m30_1), this.i35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
     } else {
       var tmp$ret$3;
       $l$block: {
         // Inline function 'kotlin.sequences.first' call
-        var tmp0_first = ensureNotNull(choicePoints).b2x();
-        var tmp0_iterator = tmp0_first.j();
-        while (tmp0_iterator.m()) {
-          var element = tmp0_iterator.n();
-          var tmp$ret$2;
+        var tmp0_iterator = ensureNotNull(choicePoints).a32().r();
+        while (tmp0_iterator.s()) {
+          var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateBacktracking.computeNext.<anonymous>' call
-          tmp$ret$2 = element.n2w().yo();
-          if (tmp$ret$2) {
+          if (element.m31().yp()) {
             tmp$ret$3 = element;
             break $l$block;
           }
@@ -1608,9 +1551,9 @@
         throw NoSuchElementException_init_$Create$_0('Sequence contains no element matching the predicate.');
       }
       var choicePointContext = tmp$ret$3;
-      var nextContext = choicePointContext.s2w(this.j30_1);
+      var nextContext = choicePointContext.r31(this.i35_1);
       var tmp_0;
-      if (nextContext.q2v_1.yo()) {
+      if (nextContext.p30_1.yp()) {
         tmp_0 = new StatePrimitiveExecution(nextContext);
       } else {
         tmp_0 = new StateRuleExecution(nextContext);
@@ -1619,17 +1562,17 @@
     }
     return tmp;
   };
-  protoOf(StateBacktracking).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StateBacktracking).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StateBacktracking).k30 = function (context) {
+  protoOf(StateBacktracking).j35 = function (context) {
     return new StateBacktracking(context);
   };
   protoOf(StateBacktracking).toString = function () {
-    return 'StateBacktracking(context=' + this.j30_1 + ')';
+    return 'StateBacktracking(context=' + this.i35_1 + ')';
   };
   protoOf(StateBacktracking).hashCode = function () {
-    return this.j30_1.hashCode();
+    return this.i35_1.hashCode();
   };
   protoOf(StateBacktracking).equals = function (other) {
     if (this === other)
@@ -1637,48 +1580,48 @@
     if (!(other instanceof StateBacktracking))
       return false;
     var tmp0_other_with_cast = other instanceof StateBacktracking ? other : THROW_CCE();
-    if (!this.j30_1.equals(tmp0_other_with_cast.j30_1))
+    if (!this.i35_1.equals(tmp0_other_with_cast.i35_1))
       return false;
     return true;
   };
   function StateEnd(solution, context) {
     AbstractEndState.call(this, solution, context);
-    this.p30_1 = solution;
-    this.q30_1 = context;
+    this.o35_1 = solution;
+    this.p35_1 = context;
   }
-  protoOf(StateEnd).g2e = function () {
-    return this.p30_1;
+  protoOf(StateEnd).q2i = function () {
+    return this.o35_1;
   };
-  protoOf(StateEnd).j5 = function () {
-    return this.q30_1;
+  protoOf(StateEnd).mb = function () {
+    return this.p35_1;
   };
-  protoOf(StateEnd).d30 = function () {
+  protoOf(StateEnd).c35 = function () {
     return false;
   };
-  protoOf(StateEnd).w2z = function () {
+  protoOf(StateEnd).v34 = function () {
     var tmp;
-    if (this.q30_1.a2x()) {
-      var tmp0_$this = this.q30_1;
-      var tmp1_step = this.f30();
-      var tmp2_startTime = this.e30();
-      tmp = new StateBacktracking(tmp0_$this.t2w(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.p35_1.z31()) {
+      var tmp0_$this = this.p35_1;
+      var tmp1_step = this.e35();
+      var tmp2_startTime = this.d35();
+      tmp = new StateBacktracking(tmp0_$this.s31(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).w2z.call(this);
+      tmp = protoOf(AbstractEndState).v34.call(this);
     }
     return tmp;
   };
-  protoOf(StateEnd).b30 = function (context) {
-    return this.r30(this.p30_1, context);
+  protoOf(StateEnd).a35 = function (context) {
+    return this.q35(this.o35_1, context);
   };
-  protoOf(StateEnd).r30 = function (solution, context) {
+  protoOf(StateEnd).q35 = function (solution, context) {
     return new StateEnd(solution, context);
   };
   protoOf(StateEnd).toString = function () {
-    return 'StateEnd(solution=' + this.p30_1 + ', context=' + this.q30_1 + ')';
+    return 'StateEnd(solution=' + this.o35_1 + ', context=' + this.p35_1 + ')';
   };
   protoOf(StateEnd).hashCode = function () {
-    var result = hashCode(this.p30_1);
-    result = imul(result, 31) + this.q30_1.hashCode() | 0;
+    var result = hashCode(this.o35_1);
+    result = imul(result, 31) + this.p35_1.hashCode() | 0;
     return result;
   };
   protoOf(StateEnd).equals = function (other) {
@@ -1687,61 +1630,56 @@
     if (!(other instanceof StateEnd))
       return false;
     var tmp0_other_with_cast = other instanceof StateEnd ? other : THROW_CCE();
-    if (!equals(this.p30_1, tmp0_other_with_cast.p30_1))
+    if (!equals(this.o35_1, tmp0_other_with_cast.o35_1))
       return false;
-    if (!this.q30_1.equals(tmp0_other_with_cast.q30_1))
+    if (!this.p35_1.equals(tmp0_other_with_cast.p35_1))
       return false;
     return true;
   };
   protoOf(StateEnd).asEndState = function () {
-    return this.y2z();
+    return this.x34();
   };
   function isCatch(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.lt() === 3) {
-      var tmp_0 = _this__u8e3s4.rt();
-      var tmp$ret$0;
+    if (_this__u8e3s4.tu() === 3) {
+      var tmp_0 = _this__u8e3s4.zu();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-      var tmp0__get_functor__thl4dk = Catch_getInstance();
-      tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
-      tmp = tmp_0 === tmp$ret$0;
+      tmp = tmp_0 === Catch_getInstance().signature.name;
     } else {
       tmp = false;
     }
     return tmp;
   }
   function getExceptionContent(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4;
     var tmp;
-    if (tmp0_subject instanceof MessageError) {
-      tmp = _this__u8e3s4.k23();
+    if (_this__u8e3s4 instanceof MessageError) {
+      tmp = _this__u8e3s4.i27();
     } else {
-      tmp = _this__u8e3s4.m21();
+      tmp = _this__u8e3s4.k25();
     }
     return tmp;
   }
   function toPublicException(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4;
     var tmp;
-    if (tmp0_subject instanceof MessageError) {
-      tmp = Companion_getInstance_15().forUncaughtError(_this__u8e3s4);
+    if (_this__u8e3s4 instanceof MessageError) {
+      tmp = Companion_instance_9.forUncaughtError(_this__u8e3s4);
     } else {
       tmp = _this__u8e3s4;
     }
     return tmp;
   }
   function _get_finalState__3aigq8($this) {
-    return new StateHalt(toPublicException($this.u30_1, $this), $this.v30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateHalt(toPublicException($this.t35_1, $this), $this.u35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function _get_handleExceptionInParentContext__yj3v4e($this) {
-    return new StateException($this.u30_1, ensureNotNull($this.v30_1.u2v_1).t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateException($this.t35_1, ensureNotNull($this.u35_1.t30_1).s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function handleStruct($this, unificator, catchGoal, error) {
     var tmp;
     if (isCatch(catchGoal, $this)) {
       var catcher = unificator.mgu(catchGoal.get(1), getExceptionContent(error, $this));
       tmp = handleCatch($this, catchGoal, catcher);
-    } else if ($this.v30_1.p2y()) {
+    } else if ($this.u35_1.o33()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1750,18 +1688,18 @@
   }
   function handleCatch($this, catchGoal, catcher) {
     var tmp;
-    if (catcher.az()) {
-      var tmp_0 = $this.v30_1.m2v_1.plus(catcher);
+    if (catcher.d11()) {
+      var tmp_0 = $this.u35_1.l30_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.v30_1.o2v_1.wo());
-      var tmp0_$this = $this.v30_1;
-      var tmp1_rules = Companion_getInstance_12().empty();
-      var tmp2_primitives = Companion_getInstance_12().empty();
+      var newGoals = plus_0(toGoals(subGoals), $this.u35_1.n30_1.wp());
+      var tmp0_$this = $this.u35_1;
+      var tmp1_rules = Companion_instance_7.empty();
+      var tmp2_primitives = Companion_instance_7.empty();
       var tmp3_substitution = newSubstitution.castToUnifier();
-      var tmp4_step = $this.f30();
-      tmp = new StateGoalSelection(tmp0_$this.t2w(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.v30_1.p2y()) {
+      var tmp4_step = $this.e35();
+      tmp = new StateGoalSelection(tmp0_$this.s31(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.u35_1.o33()) {
       tmp = _get_finalState__3aigq8($this);
     } else {
       tmp = _get_handleExceptionInParentContext__yj3v4e($this);
@@ -1770,44 +1708,41 @@
   }
   function StateException$handleCatch$lambda(this$0) {
     return function (_name_for_destructuring_parameter_0__wldtmu) {
-      var tmp$ret$0;
       // Inline function 'kotlin.collections.component1' call
-      tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.n2();
-      var it = tmp$ret$0;
-      return this$0.v30_1.r2y(it);
+      var it = _name_for_destructuring_parameter_0__wldtmu.q2();
+      return this$0.u35_1.q33(it);
     };
   }
   function StateException(exception, context) {
     AbstractState.call(this, context);
-    this.u30_1 = exception;
-    this.v30_1 = context;
+    this.t35_1 = exception;
+    this.u35_1 = context;
   }
-  protoOf(StateException).j5 = function () {
-    return this.v30_1;
+  protoOf(StateException).mb = function () {
+    return this.u35_1;
   };
-  protoOf(StateException).w2z = function () {
-    var tmp0_subject = this.u30_1;
+  protoOf(StateException).v34 = function () {
     var tmp;
-    if (tmp0_subject instanceof LogicError) {
-      var catchGoal = ensureNotNull(this.v30_1.q2y());
-      tmp = catchGoal.oy() ? handleStruct(this, this.v30_1.d2v_1, catchGoal.castToStruct(), this.u30_1) : this.v30_1.p2y() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
+    if (this.t35_1 instanceof LogicError) {
+      var catchGoal = ensureNotNull(this.u35_1.p33());
+      tmp = catchGoal.fv() ? handleStruct(this, this.u35_1.c30_1, catchGoal.castToStruct(), this.t35_1) : this.u35_1.o33() ? _get_finalState__3aigq8(this) : _get_handleExceptionInParentContext__yj3v4e(this);
     } else {
       tmp = _get_finalState__3aigq8(this);
     }
     return tmp;
   };
-  protoOf(StateException).b30 = function (context) {
-    return this.w30(this.u30_1, context);
+  protoOf(StateException).a35 = function (context) {
+    return this.v35(this.t35_1, context);
   };
-  protoOf(StateException).w30 = function (exception, context) {
+  protoOf(StateException).v35 = function (exception, context) {
     return new StateException(exception, context);
   };
   protoOf(StateException).toString = function () {
-    return 'StateException(exception=' + this.u30_1 + ', context=' + this.v30_1 + ')';
+    return 'StateException(exception=' + this.t35_1 + ', context=' + this.u35_1 + ')';
   };
   protoOf(StateException).hashCode = function () {
-    var result = hashCode(this.u30_1);
-    result = imul(result, 31) + this.v30_1.hashCode() | 0;
+    var result = hashCode(this.t35_1);
+    result = imul(result, 31) + this.u35_1.hashCode() | 0;
     return result;
   };
   protoOf(StateException).equals = function (other) {
@@ -1816,78 +1751,73 @@
     if (!(other instanceof StateException))
       return false;
     var tmp0_other_with_cast = other instanceof StateException ? other : THROW_CCE();
-    if (!equals(this.u30_1, tmp0_other_with_cast.u30_1))
+    if (!equals(this.t35_1, tmp0_other_with_cast.t35_1))
       return false;
-    if (!this.v30_1.equals(tmp0_other_with_cast.v30_1))
+    if (!this.u35_1.equals(tmp0_other_with_cast.u35_1))
       return false;
     return true;
   };
   function StateGoalSelection$computeNext$lambda(this$0) {
     return function (_name_for_destructuring_parameter_0__wldtmu) {
-      var tmp$ret$0;
       // Inline function 'kotlin.collections.component1' call
-      tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.n2();
-      var it = tmp$ret$0;
-      return this$0.z30_1.r2y(it);
+      var it = _name_for_destructuring_parameter_0__wldtmu.q2();
+      return this$0.y35_1.q33(it);
     };
   }
   function StateGoalSelection(context) {
     AbstractState.call(this, context);
-    this.z30_1 = context;
+    this.y35_1 = context;
   }
-  protoOf(StateGoalSelection).j5 = function () {
-    return this.z30_1;
+  protoOf(StateGoalSelection).mb = function () {
+    return this.y35_1;
   };
-  protoOf(StateGoalSelection).w2z = function () {
+  protoOf(StateGoalSelection).v34 = function () {
     var tmp;
-    if (this.z30_1.o2v_1.zo()) {
+    if (this.y35_1.n30_1.zp()) {
       var tmp_0;
-      if (this.z30_1.p2y()) {
-        tmp_0 = new StateEnd(Companion_getInstance_14().s1s(this.z30_1.n2v_1, this.z30_1.m2v_1), this.z30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+      if (this.y35_1.o33()) {
+        tmp_0 = new StateEnd(Companion_instance_8.w1w(this.y35_1.m30_1, this.y35_1.l30_1), this.y35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
       } else {
-        var tmp$ret$1;
         // Inline function 'kotlin.let' call
-        var tmp0_let = ensureNotNull(this.z30_1.u2v_1);
         // Inline function 'kotlin.contracts.contract' call
-        var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateGoalSelection.computeNext.<anonymous>' call
-        var tmp0_choicePoints = this.z30_1.t2v_1;
-        var tmp1_flags = this.z30_1.f2v_1;
-        var tmp2_dynamicKb = this.z30_1.h2v_1;
-        var tmp3_staticKb = this.z30_1.g2v_1;
-        var tmp4_substitution = this.z30_1.m2v_1.qy(StateGoalSelection$computeNext$lambda(this));
-        var tmp5_goals = tmp0_let.o2v_1.wo();
-        var tmp6_procedure = tmp0_let.c2v_1;
-        var tmp7_step = this.f30();
-        var tmp8_startTime = this.z30_1.r2v_1;
-        var tmp9_operators = this.z30_1.i2v_1;
-        var tmp10_inputChannels = this.z30_1.j2v_1;
-        var tmp11_outputChannels = this.z30_1.k2v_1;
-        var tmp12_libraries = this.z30_1.e2v_1;
-        var tmp13_customData = this.z30_1.l2v_1;
-        tmp$ret$0 = tmp0_let.t2w(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$ret$1 = tmp$ret$0;
+        var it = ensureNotNull(this.y35_1.t30_1);
+        var tmp0_choicePoints = this.y35_1.s30_1;
+        var tmp1_flags = this.y35_1.e30_1;
+        var tmp2_dynamicKb = this.y35_1.g30_1;
+        var tmp3_staticKb = this.y35_1.f30_1;
+        var tmp4_substitution = this.y35_1.l30_1.x10(StateGoalSelection$computeNext$lambda(this));
+        var tmp5_goals = it.n30_1.wp();
+        var tmp6_procedure = it.b30_1;
+        var tmp7_step = this.e35();
+        var tmp8_startTime = this.y35_1.q30_1;
+        var tmp9_operators = this.y35_1.h30_1;
+        var tmp10_inputChannels = this.y35_1.i30_1;
+        var tmp11_outputChannels = this.y35_1.j30_1;
+        var tmp12_libraries = this.y35_1.d30_1;
+        var tmp13_customData = this.y35_1.k30_1;
+        var tmp$ret$1 = it.s31(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);
       }
       tmp = tmp_0;
-    } else if (equals(this.z30_1.f2v_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().q25_1)) {
-      tmp = new StatePrimitiveSelection(this.z30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30(), plus_1(this.z30_1.x2v_1, toSet(ensureNotNull(this.z30_1.o2v_1.xo()).tt()))));
+    } else if (equals(this.y35_1.e30_1.get(TrackVariables_getInstance()), TrackVariables_getInstance().p29_1)) {
+      tmp = new StatePrimitiveSelection(this.y35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35(), plus_1(this.y35_1.w30_1, toSet(ensureNotNull(this.y35_1.n30_1.xp()).bv()))));
     } else {
-      tmp = new StatePrimitiveSelection(this.z30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+      tmp = new StatePrimitiveSelection(this.y35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
     }
     return tmp;
   };
-  protoOf(StateGoalSelection).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StateGoalSelection).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StateGoalSelection).k30 = function (context) {
+  protoOf(StateGoalSelection).j35 = function (context) {
     return new StateGoalSelection(context);
   };
   protoOf(StateGoalSelection).toString = function () {
-    return 'StateGoalSelection(context=' + this.z30_1 + ')';
+    return 'StateGoalSelection(context=' + this.y35_1 + ')';
   };
   protoOf(StateGoalSelection).hashCode = function () {
-    return this.z30_1.hashCode();
+    return this.y35_1.hashCode();
   };
   protoOf(StateGoalSelection).equals = function (other) {
     if (this === other)
@@ -1895,30 +1825,30 @@
     if (!(other instanceof StateGoalSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateGoalSelection ? other : THROW_CCE();
-    if (!this.z30_1.equals(tmp0_other_with_cast.z30_1))
+    if (!this.y35_1.equals(tmp0_other_with_cast.y35_1))
       return false;
     return true;
   };
   function StateHalt(exception, context) {
-    AbstractEndState.call(this, Companion_getInstance_14().halt(context.n2v_1, exception), context);
-    this.e31_1 = exception;
-    this.f31_1 = context;
+    AbstractEndState.call(this, Companion_instance_8.halt(context.m30_1, exception), context);
+    this.d36_1 = exception;
+    this.e36_1 = context;
   }
-  protoOf(StateHalt).j5 = function () {
-    return this.f31_1;
+  protoOf(StateHalt).mb = function () {
+    return this.e36_1;
   };
-  protoOf(StateHalt).b30 = function (context) {
-    return this.w30(this.e31_1, context);
+  protoOf(StateHalt).a35 = function (context) {
+    return this.v35(this.d36_1, context);
   };
-  protoOf(StateHalt).w30 = function (exception, context) {
+  protoOf(StateHalt).v35 = function (exception, context) {
     return new StateHalt(exception, context);
   };
   protoOf(StateHalt).toString = function () {
-    return 'StateHalt(exception=' + this.e31_1 + ', context=' + this.f31_1 + ')';
+    return 'StateHalt(exception=' + this.d36_1 + ', context=' + this.e36_1 + ')';
   };
   protoOf(StateHalt).hashCode = function () {
-    var result = hashCode(this.e31_1);
-    result = imul(result, 31) + this.f31_1.hashCode() | 0;
+    var result = hashCode(this.d36_1);
+    result = imul(result, 31) + this.e36_1.hashCode() | 0;
     return result;
   };
   protoOf(StateHalt).equals = function (other) {
@@ -1927,43 +1857,43 @@
     if (!(other instanceof StateHalt))
       return false;
     var tmp0_other_with_cast = other instanceof StateHalt ? other : THROW_CCE();
-    if (!equals(this.e31_1, tmp0_other_with_cast.e31_1))
+    if (!equals(this.d36_1, tmp0_other_with_cast.d36_1))
       return false;
-    if (!this.f31_1.equals(tmp0_other_with_cast.f31_1))
+    if (!this.e36_1.equals(tmp0_other_with_cast.e36_1))
       return false;
     return true;
   };
   protoOf(StateHalt).asEndState = function () {
-    return this.y2z();
+    return this.x34();
   };
   function StateInit(context) {
     AbstractState.call(this, context);
-    this.i31_1 = context;
-  }
-  protoOf(StateInit).j5 = function () {
-    return this.i31_1;
-  };
-  protoOf(StateInit).w2z = function () {
-    var tmp0_$this = this.i31_1;
-    var tmp1_goals = toGoals(this.i31_1.n2v_1);
-    var tmp2_rules = Companion_getInstance_12().empty();
-    var tmp3_primitives = Companion_getInstance_12().empty();
-    var tmp4_substitution = Companion_getInstance_10().empty();
-    var tmp5_customData = this.i31_1.l2v_1.preservePersistent();
+    this.h36_1 = context;
+  }
+  protoOf(StateInit).mb = function () {
+    return this.h36_1;
+  };
+  protoOf(StateInit).v34 = function () {
+    var tmp0_$this = this.h36_1;
+    var tmp1_goals = toGoals(this.h36_1.m30_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.h36_1.k30_1.preservePersistent();
     var tmp6_relevantVariables = emptySet();
-    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.t2w(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, new Long(1, 0), tmp6_relevantVariables), Companion_getInstance_12().empty()));
+    return new StateGoalSelection(appendRulesAndChoicePoints(tmp0_$this.s31(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, new Long(1, 0), tmp6_relevantVariables), Companion_instance_7.empty()));
   };
-  protoOf(StateInit).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StateInit).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StateInit).k30 = function (context) {
+  protoOf(StateInit).j35 = function (context) {
     return new StateInit(context);
   };
   protoOf(StateInit).toString = function () {
-    return 'StateInit(context=' + this.i31_1 + ')';
+    return 'StateInit(context=' + this.h36_1 + ')';
   };
   protoOf(StateInit).hashCode = function () {
-    return this.i31_1.hashCode();
+    return this.h36_1.hashCode();
   };
   protoOf(StateInit).equals = function (other) {
     if (this === other)
@@ -1971,37 +1901,31 @@
     if (!(other instanceof StateInit))
       return false;
     var tmp0_other_with_cast = other instanceof StateInit ? other : THROW_CCE();
-    if (!this.i31_1.equals(tmp0_other_with_cast.i31_1))
+    if (!this.h36_1.equals(tmp0_other_with_cast.h36_1))
       return false;
     return true;
   };
   function copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution) {
-    var tmp0_safe_receiver = _this__u8e3s4.q2v_1.xo();
+    var tmp0_safe_receiver = _this__u8e3s4.p30_1.xp();
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
-      var tmp$ret$1;
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$0;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveExecution.copyFromCurrentPrimitive.<anonymous>' call
-      tmp$ret$0 = _this__u8e3s4.t2y(tmp0_safe_receiver.sideEffects);
-      tmp$ret$1 = tmp$ret$0;
-      tmp = tmp$ret$1;
+      tmp = _this__u8e3s4.s33(tmp0_safe_receiver.sideEffects);
     }
     var tmp1_elvis_lhs = tmp;
     var ctx = tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs;
-    var tmp3_elvis_lhs = goals;
-    var tmp4_goals = tmp3_elvis_lhs == null ? _this__u8e3s4.o2v_1 : tmp3_elvis_lhs;
-    var tmp_0 = drop(_this__u8e3s4.y2v_1, procedureFromAncestor);
+    var tmp4_goals = goals == null ? _this__u8e3s4.n30_1 : goals;
+    var tmp_0 = drop(_this__u8e3s4.x30_1, procedureFromAncestor);
     var tmp5_procedure = first(map(tmp_0, StatePrimitiveExecution$copyFromCurrentPrimitive$lambda));
-    var tmp6_primitives = Companion_getInstance_12().empty();
-    var tmp2_elvis_lhs = substitution;
-    var tmp_1 = tmp2_elvis_lhs == null ? _this__u8e3s4.m2v_1 : tmp2_elvis_lhs;
+    var tmp6_primitives = Companion_instance_7.empty();
+    var tmp_1 = substitution == null ? _this__u8e3s4.l30_1 : substitution;
     var tmp7_substitution = isInterface(tmp_1, Unifier) ? tmp_1 : THROW_CCE();
-    var tmp8_step = $this.f30();
-    return ctx.t2w(tmp5_procedure, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp7_substitution, VOID, tmp4_goals, VOID, tmp6_primitives, VOID, VOID, VOID, VOID, VOID, tmp8_step);
+    var tmp8_step = $this.e35();
+    return ctx.s31(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__u8e3s4, $this, goals, procedureFromAncestor, substitution, $super) {
     goals = goals === VOID ? null : goals;
@@ -2010,21 +1934,21 @@
     return copyFromCurrentPrimitive(_this__u8e3s4, $this, goals, procedureFromAncestor, substitution);
   }
   function StatePrimitiveExecution$copyFromCurrentPrimitive$lambda(it) {
-    return it.c2v_1;
+    return it.b30_1;
   }
   function StatePrimitiveExecution$computeNext$lambda(this$0) {
     return function (it) {
-      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.l31_1, this$0, this$0.l31_1.o2v_1.wo(), 1, this$0.l31_1.d2v_1.mergeWithOccurCheck(this$0.l31_1.m2v_1, it.m1r(), false)));
+      return new StateGoalSelection(copyFromCurrentPrimitive(this$0.k36_1, this$0, this$0.k36_1.n30_1.wp(), 1, this$0.k36_1.c30_1.mergeWithOccurCheck(this$0.k36_1.l30_1, it.g1v(), false)));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_0(this$0) {
     return function (it) {
-      return new StateBacktracking(copyFromCurrentPrimitive$default(ensureNotNull(this$0.l31_1.u2v_1), this$0));
+      return new StateBacktracking(copyFromCurrentPrimitive$default(ensureNotNull(this$0.k36_1.t30_1), this$0));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_1(this$0) {
     return function (it) {
-      return new StateException(it.q1s().updateLastContext(this$0.g30(this$0.l31_1)), copyFromCurrentPrimitive$default(this$0.l31_1, this$0));
+      return new StateException(it.n1w().updateLastContext(this$0.f35(this$0.k36_1)), copyFromCurrentPrimitive$default(this$0.k36_1, this$0));
     };
   }
   function StatePrimitiveExecution$computeNext$lambda_2(it) {
@@ -2032,15 +1956,15 @@
   }
   function StatePrimitiveExecution(context) {
     AbstractState.call(this, context);
-    this.l31_1 = context;
+    this.k36_1 = context;
   }
-  protoOf(StatePrimitiveExecution).j5 = function () {
-    return this.l31_1;
+  protoOf(StatePrimitiveExecution).mb = function () {
+    return this.k36_1;
   };
-  protoOf(StatePrimitiveExecution).w2z = function () {
+  protoOf(StatePrimitiveExecution).v34 = function () {
     var tmp;
     try {
-      var tmp0_safe_receiver = this.l31_1.q2v_1.xo();
+      var tmp0_safe_receiver = this.k36_1.p30_1.xp();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.solution;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
@@ -2049,15 +1973,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.x1s(tmp_1, tmp_2, tmp_3, StatePrimitiveExecution$computeNext$lambda_2);
+        tmp_0 = tmp1_safe_receiver.r1w(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.l31_1, this)) : tmp2_elvis_lhs;
+      tmp = tmp2_elvis_lhs == null ? new StateBacktracking(copyFromCurrentPrimitive$default(this.k36_1, this)) : tmp2_elvis_lhs;
     } catch ($p) {
       var tmp_4;
       if ($p instanceof ResolutionException) {
         var exception = $p;
-        tmp_4 = new StateException(exception.updateLastContext(this.g30(this.l31_1)), this.l31_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+        tmp_4 = new StateException(exception.updateLastContext(this.f35(this.k36_1)), this.k36_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
       } else {
         throw $p;
       }
@@ -2065,17 +1989,17 @@
     }
     return tmp;
   };
-  protoOf(StatePrimitiveExecution).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StatePrimitiveExecution).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StatePrimitiveExecution).k30 = function (context) {
+  protoOf(StatePrimitiveExecution).j35 = function (context) {
     return new StatePrimitiveExecution(context);
   };
   protoOf(StatePrimitiveExecution).toString = function () {
-    return 'StatePrimitiveExecution(context=' + this.l31_1 + ')';
+    return 'StatePrimitiveExecution(context=' + this.k36_1 + ')';
   };
   protoOf(StatePrimitiveExecution).hashCode = function () {
-    return this.l31_1.hashCode();
+    return this.k36_1.hashCode();
   };
   protoOf(StatePrimitiveExecution).equals = function (other) {
     if (this === other)
@@ -2083,44 +2007,43 @@
     if (!(other instanceof StatePrimitiveExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveExecution ? other : THROW_CCE();
-    if (!this.l31_1.equals(tmp0_other_with_cast.l31_1))
+    if (!this.k36_1.equals(tmp0_other_with_cast.k36_1))
       return false;
     return true;
   };
   function exceptionalState($this, exception) {
-    return new StateException(exception, $this.o31_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateException(exception, $this.n36_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function StatePrimitiveSelection(context) {
     AbstractState.call(this, context);
-    this.o31_1 = context;
+    this.n36_1 = context;
   }
-  protoOf(StatePrimitiveSelection).j5 = function () {
-    return this.o31_1;
+  protoOf(StatePrimitiveSelection).mb = function () {
+    return this.n36_1;
   };
-  protoOf(StatePrimitiveSelection).w2z = function () {
-    var tmp$ret$1;
+  protoOf(StatePrimitiveSelection).v34 = function () {
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.o31_1;
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StatePrimitiveSelection.computeNext.<anonymous>' call
-    var goal = ensureNotNull(tmp0_with.q2y());
+    var $this$with = this.n36_1;
+    var goal = ensureNotNull($this$with.p33());
     var tmp;
-    if (goal.fu()) {
-      tmp = exceptionalState(this, Companion_getInstance_17().forGoal(this.o31_1, extractSignature(ensureNotNull(this.o31_1.c2v_1)), goal.castToVar()));
-    } else if (goal.oy()) {
+    if (goal.vv()) {
+      tmp = exceptionalState(this, Companion_instance_11.forGoal(this.n36_1, extractSignature(ensureNotNull(this.n36_1.b30_1)), goal.castToVar()));
+    } else if (goal.fv()) {
       var goalStruct = goal.castToStruct();
       var signature = extractSignature(goalStruct);
       var tmp_0;
-      if (tmp0_with.e2v_1.hasPrimitive(signature)) {
-        var childContext = createChild(tmp0_with);
+      if ($this$with.d30_1.hasPrimitive(signature)) {
+        var childContext = createChild($this$with);
         var tmp_1;
         try {
-          var request = toRequest(childContext, goalStruct, signature, this.c30());
-          var tmp0_elvis_lhs = tmp0_with.e2v_1.e2a().d3(signature);
+          var request = toRequest(childContext, goalStruct, signature, this.b35());
+          var tmp0_elvis_lhs = $this$with.d30_1.m2e().x2(signature);
           var tmp_2;
           if (tmp0_elvis_lhs == null) {
-            throw IllegalStateException_init_$Create$('Inconsistent behaviour of Library.contains and Library.get');
+            var message = 'Inconsistent behaviour of Library.contains and Library.get';
+            throw IllegalStateException_init_$Create$(toString(message));
           } else {
             tmp_2 = tmp0_elvis_lhs;
           }
@@ -2131,7 +2054,7 @@
           var tmp_3;
           if ($p instanceof ResolutionException) {
             var exception = $p;
-            tmp_3 = exceptionalState(this, exception.updateLastContext(this.g30(childContext)));
+            tmp_3 = exceptionalState(this, exception.updateLastContext(this.f35(childContext)));
           } else {
             throw $p;
           }
@@ -2139,30 +2062,28 @@
         }
         tmp_0 = tmp_1;
       } else {
-        tmp_0 = new StateRuleSelection(this.o31_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.f30()));
+        tmp_0 = new StateRuleSelection(this.n36_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, this.e35()));
       }
       tmp = tmp_0;
     } else {
-      var tmp_4 = Companion_getInstance_16();
-      var tmp1_safe_receiver = this.o31_1.c2v_1;
+      var tmp_4 = Companion_instance_10;
+      var tmp1_safe_receiver = this.n36_1.b30_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : extractSignature(tmp1_safe_receiver);
-      tmp = exceptionalState(this, tmp_4.forGoal(this.o31_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
+      tmp = exceptionalState(this, tmp_4.forGoal(this.n36_1, tmp2_elvis_lhs == null ? new Signature('?-', 1) : tmp2_elvis_lhs, Expected_CALLABLE_getInstance(), goal));
     }
-    tmp$ret$0 = tmp;
-    tmp$ret$1 = tmp$ret$0;
-    return tmp$ret$1;
+    return tmp;
   };
-  protoOf(StatePrimitiveSelection).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StatePrimitiveSelection).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StatePrimitiveSelection).k30 = function (context) {
+  protoOf(StatePrimitiveSelection).j35 = function (context) {
     return new StatePrimitiveSelection(context);
   };
   protoOf(StatePrimitiveSelection).toString = function () {
-    return 'StatePrimitiveSelection(context=' + this.o31_1 + ')';
+    return 'StatePrimitiveSelection(context=' + this.n36_1 + ')';
   };
   protoOf(StatePrimitiveSelection).hashCode = function () {
-    return this.o31_1.hashCode();
+    return this.n36_1.hashCode();
   };
   protoOf(StatePrimitiveSelection).equals = function (other) {
     if (this === other)
@@ -2170,55 +2091,51 @@
     if (!(other instanceof StatePrimitiveSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StatePrimitiveSelection ? other : THROW_CCE();
-    if (!this.o31_1.equals(tmp0_other_with_cast.o31_1))
+    if (!this.n36_1.equals(tmp0_other_with_cast.n36_1))
       return false;
     return true;
   };
   function _get_failureState__yid9tw($this) {
-    return new StateBacktracking($this.r31_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_getInstance_12().empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateBacktracking($this.q36_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, Companion_instance_7.empty(), VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function StateRuleExecution(context) {
     AbstractState.call(this, context);
-    this.r31_1 = context;
+    this.q36_1 = context;
   }
-  protoOf(StateRuleExecution).j5 = function () {
-    return this.r31_1;
+  protoOf(StateRuleExecution).mb = function () {
+    return this.q36_1;
   };
-  protoOf(StateRuleExecution).w2z = function () {
-    var tmp$ret$1;
+  protoOf(StateRuleExecution).v34 = function () {
     // Inline function 'kotlin.with' call
-    var tmp0_with = this.r31_1;
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleExecution.computeNext.<anonymous>' call
-    tmp$ret$0 = tmp0_with.d2v_1.mgu(ensureNotNull(tmp0_with.q2y()), ensureNotNull(tmp0_with.p2v_1.xo()).lv());
-    tmp$ret$1 = tmp$ret$0;
-    var substitution = tmp$ret$1;
+    var $this$with = this.q36_1;
+    var substitution = $this$with.c30_1.mgu(ensureNotNull($this$with.p33()), ensureNotNull($this$with.o30_1.xp()).fx());
     var tmp;
-    if (substitution.az()) {
-      var newSubstitution = this.r31_1.m2v_1.plus(substitution).castToUnifier();
-      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.r31_1.p2v_1.xo()), newSubstitution).mv().getSubstituted(newSubstitution, []);
-      var tmp0_$this = this.r31_1;
+    if (substitution.d11()) {
+      var newSubstitution = this.q36_1.l30_1.plus(substitution).castToUnifier();
+      var subGoals = prepareForExecutionWithUnifier(ensureNotNull(this.q36_1.o30_1.xp()), newSubstitution).gx().getSubstituted(newSubstitution, []);
+      var tmp0_$this = this.q36_1;
       var tmp1_goals = toGoals(subGoals);
-      var tmp2_rules = Companion_getInstance_12().empty();
-      var tmp3_step = this.f30();
-      tmp = new StateGoalSelection(tmp0_$this.t2w(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 tmp2_rules = Companion_instance_7.empty();
+      var tmp3_step = this.e35();
+      tmp = new StateGoalSelection(tmp0_$this.s31(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).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StateRuleExecution).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StateRuleExecution).k30 = function (context) {
+  protoOf(StateRuleExecution).j35 = function (context) {
     return new StateRuleExecution(context);
   };
   protoOf(StateRuleExecution).toString = function () {
-    return 'StateRuleExecution(context=' + this.r31_1 + ')';
+    return 'StateRuleExecution(context=' + this.q36_1 + ')';
   };
   protoOf(StateRuleExecution).hashCode = function () {
-    return this.r31_1.hashCode();
+    return this.q36_1.hashCode();
   };
   protoOf(StateRuleExecution).equals = function (other) {
     if (this === other)
@@ -2226,23 +2143,23 @@
     if (!(other instanceof StateRuleExecution))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleExecution ? other : THROW_CCE();
-    if (!this.r31_1.equals(tmp0_other_with_cast.r31_1))
+    if (!this.q36_1.equals(tmp0_other_with_cast.q36_1))
       return false;
     return true;
   };
   function None() {
     None_instance = this;
     CutLimit.call(this);
-    this.s31_1 = -1;
-    this.t31_1 = null;
+    this.r36_1 = -1;
+    this.s36_1 = null;
   }
-  protoOf(None).u31 = function () {
-    return this.s31_1;
+  protoOf(None).t36 = function () {
+    return this.r36_1;
   };
-  protoOf(None).l1r = function () {
-    return this.t31_1;
+  protoOf(None).f1v = function () {
+    return this.s36_1;
   };
-  protoOf(None).v31 = function () {
+  protoOf(None).u36 = function () {
     return true;
   };
   var None_instance;
@@ -2253,54 +2170,52 @@
   }
   function Actual(depthToCut, procedure) {
     CutLimit.call(this);
-    this.w31_1 = depthToCut;
-    this.x31_1 = procedure;
+    this.v36_1 = depthToCut;
+    this.w36_1 = procedure;
   }
-  protoOf(Actual).u31 = function () {
-    return this.w31_1;
+  protoOf(Actual).t36 = function () {
+    return this.v36_1;
   };
-  protoOf(Actual).l1r = function () {
-    return this.x31_1;
+  protoOf(Actual).f1v = function () {
+    return this.w36_1;
   };
   function CutLimit() {
   }
-  protoOf(CutLimit).v31 = function () {
+  protoOf(CutLimit).u36 = function () {
     return false;
   };
   function Companion_0() {
-    Companion_instance_0 = this;
-    this.y31_1 = Catch_getInstance().signature;
-    this.z31_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
+    Companion_instance_16 = this;
+    this.x36_1 = Catch_getInstance().signature;
+    this.y36_1 = setOf([new Signature(',', 2), new Signature(';', 2), new Signature('->', 2)]);
   }
-  var Companion_instance_0;
-  function Companion_getInstance_23() {
-    if (Companion_instance_0 == null)
+  var Companion_instance_16;
+  function Companion_getInstance_7() {
+    if (Companion_instance_16 == null)
       new Companion_0();
-    return Companion_instance_0;
+    return Companion_instance_16;
   }
   function _get_failureState__yid9tw_0($this) {
-    return new StateBacktracking($this.c32_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateBacktracking($this.b37_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function exceptionalState_0($this, exception) {
-    return new StateException(exception, $this.c32_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateException(exception, $this.b37_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function missingProcedure($this, ruleSources, missing) {
-    var unknown = $this.c32_1.f2v_1.get(Unknown_getInstance());
+    var unknown = $this.b37_1.e30_1.get(Unknown_getInstance());
     var tmp;
-    if (equals(unknown, Unknown_getInstance().w25_1)) {
+    if (equals(unknown, Unknown_getInstance().v29_1)) {
       tmp = _get_failureState__yid9tw_0($this);
     } else {
       var tmp_0;
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.none' call
-        var tmp0_iterator = ruleSources.j();
-        while (tmp0_iterator.m()) {
-          var element = tmp0_iterator.n();
-          var tmp$ret$0;
+        var tmp0_iterator = ruleSources.r();
+        while (tmp0_iterator.s()) {
+          var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.missingProcedure.<anonymous>' call
-          tmp$ret$0 = element.containsIndicator(missing.toIndicator());
-          if (tmp$ret$0) {
+          if (element.containsIndicator(missing.toIndicator())) {
             tmp$ret$1 = false;
             break $l$block;
           }
@@ -2308,19 +2223,16 @@
         tmp$ret$1 = true;
       }
       if (tmp$ret$1) {
-        var tmp0_subject = unknown;
         var tmp_1;
-        if (equals(tmp0_subject, Unknown_getInstance().u25_1)) {
-          tmp_1 = exceptionalState_0($this, Companion_getInstance_18().forProcedure($this.c32_1, missing));
-        } else if (equals(tmp0_subject, Unknown_getInstance().v25_1)) {
-          var tmp$ret$2;
+        if (equals(unknown, Unknown_getInstance().t29_1)) {
+          tmp_1 = exceptionalState_0($this, Companion_instance_12.forProcedure($this.b37_1, missing));
+        } else if (equals(unknown, Unknown_getInstance().u29_1)) {
           // Inline function 'kotlin.also' call
-          var tmp0_also = _get_failureState__yid9tw_0($this);
+          var this_0 = _get_failureState__yid9tw_0($this);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.missingProcedure.<anonymous>' call
-          $this.c32_1.f1s().write(MissingPredicate_init_$Create$($this.c32_1, missing));
-          tmp$ret$2 = tmp0_also;
-          tmp_1 = tmp$ret$2;
+          $this.b37_1.x1v().write(MissingPredicate_init_$Create$($this.b37_1, missing));
+          tmp_1 = this_0;
         } else {
           tmp_1 = _get_failureState__yid9tw_0($this);
         }
@@ -2333,29 +2245,26 @@
     return tmp;
   }
   function _get_ignoreState__t4wl8y($this) {
-    return new StateGoalSelection($this.c32_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.c32_1.o2v_1.wo(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.f30()));
+    return new StateGoalSelection($this.b37_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.b37_1.n30_1.wp(), VOID, VOID, VOID, VOID, VOID, VOID, VOID, $this.e35()));
   }
   function isCut(_this__u8e3s4, $this) {
-    return _this__u8e3s4.mt() ? _this__u8e3s4.castToAtom().p2() === '!' : false;
+    return _this__u8e3s4.uu() ? _this__u8e3s4.castToAtom().r2() === '!' : false;
   }
   function computeCutLimit(_this__u8e3s4, $this, magicCut) {
     var tmp;
     if (magicCut) {
-      tmp = firstOrNull(_this__u8e3s4.y2v_1);
+      tmp = firstOrNull(_this__u8e3s4.x30_1);
     } else {
       var tmp$ret$1;
       $l$block: {
         // Inline function 'kotlin.sequences.firstOrNull' call
-        var tmp0_firstOrNull = _this__u8e3s4.y2v_1;
-        var tmp0_iterator = tmp0_firstOrNull.j();
-        while (tmp0_iterator.m()) {
-          var element = tmp0_iterator.n();
-          var tmp$ret$0;
+        var tmp0_iterator = _this__u8e3s4.x30_1.r();
+        while (tmp0_iterator.s()) {
+          var element = tmp0_iterator.u();
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeCutLimit.<anonymous>' call
-          var tmp_0 = Companion_getInstance_23().z31_1;
-          var tmp0_safe_receiver = element.c2v_1;
-          tmp$ret$0 = !contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver));
-          if (tmp$ret$0) {
+          var tmp_0 = Companion_getInstance_7().y36_1;
+          var tmp0_safe_receiver = element.b30_1;
+          if (!contains_0(tmp_0, tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver))) {
             tmp$ret$1 = element;
             break $l$block;
           }
@@ -2369,34 +2278,32 @@
     if (cutLimit == null) {
       tmp_1 = None_getInstance();
     } else {
-      tmp_1 = new Actual(cutLimit.v2v_1, cutLimit.c2v_1);
+      tmp_1 = new Actual(cutLimit.u30_1, cutLimit.b30_1);
     }
     return tmp_1;
   }
   function cutCanBeSkipped($this, cutLimit, executionContext) {
-    return (cutLimit.v31() ? true : cutLimit.u31() > executionContext.v2v_1) ? true : cutLimit.u31() === executionContext.v2v_1 ? !equals(cutLimit.l1r(), executionContext.c2v_1) : false;
+    return (cutLimit.u36() ? true : cutLimit.t36() > executionContext.u30_1) ? true : cutLimit.t36() === executionContext.u30_1 ? !equals(cutLimit.f1v(), executionContext.b30_1) : false;
   }
   function performCut(_this__u8e3s4, $this, cutLimit) {
     var tmp;
     if (_this__u8e3s4 === null) {
       tmp = null;
-    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.o2w()))) {
+    } else if (cutCanBeSkipped($this, cutLimit, ensureNotNull(_this__u8e3s4.n31()))) {
       tmp = _this__u8e3s4;
     } else {
-      var tmp_0 = _this__u8e3s4.b2x();
+      var tmp_0 = _this__u8e3s4.a32();
       var cutCandidates = filter(tmp_0, StateRuleSelection$performCut$lambda(cutLimit));
       var tmp_1;
       if (any(cutCandidates)) {
         var tmp$ret$1;
         $l$block: {
           // Inline function 'kotlin.sequences.firstOrNull' call
-          var tmp0_iterator = cutCandidates.j();
-          while (tmp0_iterator.m()) {
-            var element = tmp0_iterator.n();
-            var tmp$ret$0;
+          var tmp0_iterator = cutCandidates.r();
+          while (tmp0_iterator.s()) {
+            var element = tmp0_iterator.u();
             // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.performCut.<anonymous>' call
-            tmp$ret$0 = ensureNotNull(element.o2w()).v2v_1 <= cutLimit.u31();
-            if (tmp$ret$0) {
+            if (ensureNotNull(element.n31()).u30_1 <= cutLimit.t36()) {
               tmp$ret$1 = element;
               break $l$block;
             }
@@ -2404,7 +2311,7 @@
           tmp$ret$1 = null;
         }
         var tmp0_safe_receiver = tmp$ret$1;
-        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.p2w();
+        tmp_1 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o31();
       } else {
         tmp_1 = _this__u8e3s4;
       }
@@ -2414,65 +2321,52 @@
   }
   function _get_isTailRecursive__h5eso7(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.o2v_1.wo().zo() ? equals(_this__u8e3s4.f2v_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().j25_1) : false) {
-      var tmp$ret$3;
+    if (_this__u8e3s4.n30_1.wp().zp() ? equals(_this__u8e3s4.e30_1.get(LastCallOptimization_getInstance()), LastCallOptimization_getInstance().i29_1) : false) {
       // Inline function 'kotlin.let' call
-      var tmp0_let = ensureNotNull(_this__u8e3s4.q2y());
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$2;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>' call
-      var tmp0_safe_receiver = tmp0_let.asStruct();
+      var tmp0_safe_receiver = ensureNotNull(_this__u8e3s4.p33()).asStruct();
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : extractSignature(tmp0_safe_receiver);
       var tmp_0;
       if (tmp1_safe_receiver == null) {
         tmp_0 = null;
       } else {
-        var tmp$ret$1;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
-        var tmp$ret$0;
         // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.<get-isTailRecursive>.<anonymous>.<anonymous>' call
         var tmp_1;
-        var tmp0_safe_receiver_0 = _this__u8e3s4.c2v_1;
-        if (equals(tmp1_safe_receiver, tmp0_safe_receiver_0 == null ? null : extractSignature(tmp0_safe_receiver_0))) {
-          tmp_1 = !equals(tmp1_safe_receiver, Companion_getInstance_23().y31_1);
+        var tmp0_safe_receiver_0 = _this__u8e3s4.b30_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_7().x36_1);
         } else {
           tmp_1 = false;
         }
-        tmp$ret$0 = tmp_1;
-        tmp$ret$1 = tmp$ret$0;
-        tmp_0 = tmp$ret$1;
+        tmp_0 = tmp_1;
       }
       var tmp2_elvis_lhs = tmp_0;
-      tmp$ret$2 = tmp2_elvis_lhs == null ? false : tmp2_elvis_lhs;
-      tmp$ret$3 = tmp$ret$2;
-      tmp = tmp$ret$3;
+      tmp = tmp2_elvis_lhs == null ? false : tmp2_elvis_lhs;
     } else {
       tmp = false;
     }
     return tmp;
   }
   function selectClauses(_this__u8e3s4, $this, term) {
-    var tmp$ret$1;
     // Inline function 'kotlin.let' call
     var tmp = _this__u8e3s4.getByHead(term);
-    var tmp0_let = ensureRules(map(tmp, StateRuleSelection$selectClauses$lambda));
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.selectClauses.<anonymous>' call
+    var it = ensureRules(map(tmp, StateRuleSelection$selectClauses$lambda));
     var tmp_0;
-    if (_this__u8e3s4.v1p()) {
-      tmp_0 = buffered(tmp0_let);
+    if (_this__u8e3s4.v1s()) {
+      tmp_0 = buffered(it);
     } else {
-      tmp_0 = tmp0_let;
+      tmp_0 = it;
     }
-    tmp$ret$0 = tmp_0;
-    tmp$ret$1 = tmp$ret$0;
-    return tmp$ret$1;
+    return tmp_0;
   }
   function StateRuleSelection$performCut$lambda($cutLimit) {
     return function (it) {
-      return equals(ensureNotNull(it.o2w()).c2v_1, $cutLimit.l1r());
+      return equals(ensureNotNull(it.n31()).b30_1, $cutLimit.f1v());
     };
   }
   function StateRuleSelection$computeNext$lambda(this$0, $currentGoalStruct) {
@@ -2481,34 +2375,32 @@
     };
   }
   function StateRuleSelection$selectClauses$lambda(it) {
-    return it.cy();
+    return it.cv();
   }
   function StateRuleSelection(context) {
-    Companion_getInstance_23();
+    Companion_getInstance_7();
     AbstractState.call(this, context);
-    this.c32_1 = context;
+    this.b37_1 = context;
   }
-  protoOf(StateRuleSelection).j5 = function () {
-    return this.c32_1;
+  protoOf(StateRuleSelection).mb = function () {
+    return this.b37_1;
   };
-  protoOf(StateRuleSelection).w2z = function () {
-    var currentGoal = ensureNotNull(this.c32_1.q2y());
+  protoOf(StateRuleSelection).v34 = function () {
+    var currentGoal = ensureNotNull(this.b37_1.p33());
     var tmp;
-    if (currentGoal.fu()) {
-      tmp = exceptionalState_0(this, Companion_getInstance_17().forGoal(this.c32_1, extractSignature(ensureNotNull(this.c32_1.c2v_1)), currentGoal.castToVar()));
-    } else if (currentGoal.oy()) {
-      var tmp$ret$5;
+    if (currentGoal.vv()) {
+      tmp = exceptionalState_0(this, Companion_instance_11.forGoal(this.b37_1, extractSignature(ensureNotNull(this.b37_1.b30_1)), currentGoal.castToVar()));
+    } else if (currentGoal.fv()) {
       // Inline function 'kotlin.with' call
-      var tmp0_with = this.c32_1;
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$4;
       // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>' call
+      var $this$with = this.b37_1;
       var currentGoalStruct = currentGoal.castToStruct();
-      var ruleSources = sequenceOf([tmp0_with.e2v_1.asTheory(tmp0_with.d2v_1), tmp0_with.g2v_1, tmp0_with.h2v_1]);
+      var ruleSources = sequenceOf([$this$with.d30_1.asTheory($this$with.c30_1), $this$with.f30_1, $this$with.g30_1]);
       var tmp_0;
-      if (currentGoalStruct.gu()) {
+      if (currentGoalStruct.wv()) {
         var tmp_1;
-        if (currentGoalStruct.pt()) {
+        if (currentGoalStruct.xu()) {
           tmp_1 = _get_ignoreState__t4wl8y(this);
         } else {
           tmp_1 = _get_failureState__yid9tw_0(this);
@@ -2516,27 +2408,21 @@
         tmp_0 = tmp_1;
       } else {
         if (isCut(currentGoalStruct, this)) {
-          var cutLimit = computeCutLimit(tmp0_with, this, currentGoalStruct instanceof MagicCut);
-          var tmp$ret$1;
+          var cutLimit = computeCutLimit($this$with, this, currentGoalStruct instanceof MagicCut);
           // Inline function 'kotlin.let' call
-          var tmp0_let = _get_ignoreState__t4wl8y(this);
           // Inline function 'kotlin.contracts.contract' call
-          var tmp$ret$0;
           // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>.<anonymous>' call
-          tmp$ret$0 = tmp0_let.k30(tmp0_let.z30_1.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(tmp0_let.z30_1.t2v_1, this, cutLimit)));
-          tmp$ret$1 = tmp$ret$0;
-          tmp_0 = tmp$ret$1;
+          var it = _get_ignoreState__t4wl8y(this);
+          tmp_0 = it.j35(it.y35_1.s31(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, performCut(it.y35_1.s30_1, this, cutLimit)));
         } else {
           var tmp$ret$3;
           $l$block: {
             // Inline function 'kotlin.sequences.any' call
-            var tmp0_iterator = ruleSources.j();
-            while (tmp0_iterator.m()) {
-              var element = tmp0_iterator.n();
-              var tmp$ret$2;
+            var tmp0_iterator = ruleSources.r();
+            while (tmp0_iterator.s()) {
+              var element = tmp0_iterator.u();
               // Inline function 'it.unibo.tuprolog.solve.classic.fsm.StateRuleSelection.computeNext.<anonymous>.<anonymous>' call
-              tmp$ret$2 = element.containsHead(currentGoalStruct);
-              if (tmp$ret$2) {
+              if (element.containsHead(currentGoalStruct)) {
                 tmp$ret$3 = true;
                 break $l$block;
               }
@@ -2546,10 +2432,10 @@
           if (tmp$ret$3) {
             var rules = cursor(flatMap(ruleSources, StateRuleSelection$computeNext$lambda(this, currentGoalStruct)));
             var tmp_2;
-            if (_get_isTailRecursive__h5eso7(this.c32_1, this)) {
-              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.c32_1, rules));
+            if (_get_isTailRecursive__h5eso7(this.b37_1, this)) {
+              tmp_2 = new StateRuleExecution(replaceWithChildAppendingRulesAndChoicePoints(this.b37_1, rules));
             } else {
-              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.c32_1, rules));
+              tmp_2 = new StateRuleExecution(createChildAppendingRulesAndChoicePoints(this.b37_1, rules));
             }
             tmp_0 = tmp_2;
           } else {
@@ -2557,25 +2443,23 @@
           }
         }
       }
-      tmp$ret$4 = tmp_0;
-      tmp$ret$5 = tmp$ret$4;
-      tmp = tmp$ret$5;
+      tmp = tmp_0;
     } else {
-      tmp = exceptionalState_0(this, Companion_getInstance_16().forGoal(this.c32_1, extractSignature(ensureNotNull(this.c32_1.c2v_1)), Expected_CALLABLE_getInstance(), currentGoal));
+      tmp = exceptionalState_0(this, Companion_instance_10.forGoal(this.b37_1, extractSignature(ensureNotNull(this.b37_1.b30_1)), Expected_CALLABLE_getInstance(), currentGoal));
     }
     return tmp;
   };
-  protoOf(StateRuleSelection).b30 = function (context) {
-    return this.k30(context);
+  protoOf(StateRuleSelection).a35 = function (context) {
+    return this.j35(context);
   };
-  protoOf(StateRuleSelection).k30 = function (context) {
+  protoOf(StateRuleSelection).j35 = function (context) {
     return new StateRuleSelection(context);
   };
   protoOf(StateRuleSelection).toString = function () {
-    return 'StateRuleSelection(context=' + this.c32_1 + ')';
+    return 'StateRuleSelection(context=' + this.b37_1 + ')';
   };
   protoOf(StateRuleSelection).hashCode = function () {
-    return this.c32_1.hashCode();
+    return this.b37_1.hashCode();
   };
   protoOf(StateRuleSelection).equals = function (other) {
     if (this === other)
@@ -2583,19 +2467,19 @@
     if (!(other instanceof StateRuleSelection))
       return false;
     var tmp0_other_with_cast = other instanceof StateRuleSelection ? other : THROW_CCE();
-    if (!this.c32_1.equals(tmp0_other_with_cast.c32_1))
+    if (!this.b37_1.equals(tmp0_other_with_cast.b37_1))
       return false;
     return true;
   };
   function appendRulesAndChoicePoints(_this__u8e3s4, rules) {
     var tmp;
-    if (rules.yo()) {
-      tmp = appendRules(_this__u8e3s4.t2v_1, rules.wo(), _this__u8e3s4);
+    if (rules.yp()) {
+      tmp = appendRules(_this__u8e3s4.s30_1, rules.wp(), _this__u8e3s4);
     } else {
-      tmp = appendRules(_this__u8e3s4.t2v_1, Companion_getInstance_12().empty(), _this__u8e3s4);
+      tmp = appendRules(_this__u8e3s4.s30_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, rules, VOID, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.s31(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);
@@ -2603,8 +2487,8 @@
   }
   function unfoldGoals(_this__u8e3s4) {
     var tmp;
-    if (_this__u8e3s4.xt()) {
-      var tmp_0 = _this__u8e3s4.castToTuple().hs();
+    if (_this__u8e3s4.kv()) {
+      var tmp_0 = _this__u8e3s4.castToTuple().pt();
       tmp = flatMap(tmp_0, unfoldGoals$lambda);
     } else {
       tmp = sequenceOf([_this__u8e3s4]);
@@ -2613,30 +2497,27 @@
   }
   function createChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.q2y()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.p33()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.c2v_1;
-    var tmp2_depth = _this__u8e3s4.v2v_1 + 1 | 0;
-    var tmp$ret$0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.b30_1;
+    var tmp2_depth = _this__u8e3s4.u30_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = _this__u8e3s4.w2v_1;
-    tmp$ret$0 = tmp0_plus.sf(new Long(1, 0));
-    var tmp3_step = tmp$ret$0;
+    var tmp3_step = _this__u8e3s4.v30_1.la(toLong(1));
     var tmp4_relevantVariables = emptySet();
-    return _this__u8e3s4.t2w(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.s31(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.st(), _this__u8e3s4, startTime);
+    return new Request(signature, goal.av(), _this__u8e3s4, startTime);
   }
   function appendPrimitivesAndChoicePoints(_this__u8e3s4, primitiveExecutions) {
     var tmp;
-    if (primitiveExecutions.yo()) {
-      tmp = appendPrimitives(_this__u8e3s4.t2v_1, primitiveExecutions.wo(), _this__u8e3s4);
+    if (primitiveExecutions.yp()) {
+      tmp = appendPrimitives(_this__u8e3s4.s30_1, primitiveExecutions.wp(), _this__u8e3s4);
     } else {
-      tmp = appendPrimitives(_this__u8e3s4.t2v_1, Companion_getInstance_12().empty(), _this__u8e3s4);
+      tmp = appendPrimitives(_this__u8e3s4.s30_1, Companion_instance_7.empty(), _this__u8e3s4);
     }
     var newChoicePointContext = tmp;
-    return _this__u8e3s4.t2w(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, primitiveExecutions, VOID, VOID, newChoicePointContext);
+    return _this__u8e3s4.s31(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;
@@ -2653,87 +2534,76 @@
   }
   function replaceWithChild(_this__u8e3s4, inferProcedureFromGoals) {
     inferProcedureFromGoals = inferProcedureFromGoals === VOID ? true : inferProcedureFromGoals;
-    var currentGoal = ensureNotNull(_this__u8e3s4.q2y()).castToStruct();
+    var currentGoal = ensureNotNull(_this__u8e3s4.p33()).castToStruct();
     var tmp0_goals = toGoals(currentGoal);
-    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.c2v_1;
-    var tmp2_depth = _this__u8e3s4.v2v_1 + 1 | 0;
-    var tmp$ret$0;
+    var tmp1_procedure = inferProcedureFromGoals ? currentGoal : _this__u8e3s4.b30_1;
+    var tmp2_depth = _this__u8e3s4.u30_1 + 1 | 0;
     // Inline function 'kotlin.Long.plus' call
-    var tmp0_plus = _this__u8e3s4.w2v_1;
-    tmp$ret$0 = tmp0_plus.sf(new Long(1, 0));
-    var tmp3_step = tmp$ret$0;
-    return _this__u8e3s4.t2w(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);
+    var tmp3_step = _this__u8e3s4.v30_1.la(toLong(1));
+    return _this__u8e3s4.s31(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.fu() ? Companion_getInstance_8().of('call', [it]) : it;
+    return it.vv() ? Companion_getInstance_1().of('call', [it]) : it;
   }
   function unfoldGoals$lambda(it) {
     return unfoldGoals(it);
   }
   function ensureRules$lambda(it) {
     // Inline function 'kotlin.require' call
-    var tmp0_require = it.wt();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!tmp0_require) {
-      var tmp$ret$0;
+    if (!it.hv()) {
       // Inline function 'kotlin.require.<anonymous>' call
-      tmp$ret$0 = 'Failed requirement.';
-      var message = tmp$ret$0;
+      var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString(message));
     }
     return it.castToRule();
   }
   function AbstractSolutionIterator(state) {
-    this.d32_1 = state;
-    this.e32_1 = new Long(0, 0);
+    this.c37_1 = state;
+    this.d37_1 = new Long(0, 0);
   }
-  protoOf(AbstractSolutionIterator).m = function () {
-    var tmp$ret$1;
+  protoOf(AbstractSolutionIterator).s = function () {
     // Inline function 'kotlin.let' call
-    var tmp0_let = this.d32_1;
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'it.unibo.tuprolog.solve.classic.impl.AbstractSolutionIterator.hasNext.<anonymous>' call
-    tmp$ret$0 = !tmp0_let.x2z() ? true : tmp0_let.castToEndState().a2x();
-    tmp$ret$1 = tmp$ret$0;
-    return tmp$ret$1;
+    var it = this.c37_1;
+    return !it.w34() ? true : it.castToEndState().z31();
   };
-  protoOf(AbstractSolutionIterator).n = function () {
+  protoOf(AbstractSolutionIterator).u = function () {
     do {
-      var previousState = this.d32_1;
+      var previousState = this.c37_1;
       var tmp = this;
-      var tmp_0 = this.d32_1;
-      var tmp0_this = this;
-      tmp0_this.e32_1 = tmp0_this.e32_1.xf();
-      tmp.d32_1 = this.f32(tmp_0, tmp0_this.e32_1);
-      this.onStateTransition(previousState, this.d32_1, this.e32_1);
+      var tmp_0 = this.c37_1;
+      this.d37_1 = this.d37_1.qa();
+      tmp.c37_1 = this.e37(tmp_0, this.d37_1);
+      this.onStateTransition(previousState, this.c37_1, this.d37_1);
     }
-     while (!this.d32_1.x2z());
-    return this.d32_1.castToEndState().g2e().cleanUp();
+     while (!this.c37_1.w34());
+    return this.c37_1.castToEndState().q2i().cleanUp();
   };
   function SimpleSolutionIterator(state, onStateTransitionCallback) {
     AbstractSolutionIterator.call(this, state);
-    this.i32_1 = onStateTransitionCallback;
+    this.h37_1 = onStateTransitionCallback;
   }
-  protoOf(SimpleSolutionIterator).f32 = function (state, step) {
+  protoOf(SimpleSolutionIterator).e37 = function (state, step) {
     return state.next();
   };
-  protoOf(SimpleSolutionIterator).j32 = function (source, destination, index) {
-    return this.i32_1(source, destination, index);
+  protoOf(SimpleSolutionIterator).i37 = function (source, destination, index) {
+    return this.h37_1(source, destination, index);
   };
   protoOf(SimpleSolutionIterator).onStateTransition = function (source, destination, index) {
-    return this.j32(source, destination, index);
+    return this.i37(source, destination, index);
   };
   function DefaultBuiltins() {
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, CommonBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).s2a = function () {
+  protoOf(DefaultBuiltins).a2f = function () {
     return listOf(Throw_getInstance());
   };
-  protoOf(DefaultBuiltins).r2a = function () {
+  protoOf(DefaultBuiltins).z2e = function () {
     return listOf_0([Catch_getInstance(), Call_getInstance(), Comma_getInstance(), Cut_getInstance(), Fail_getInstance(), Success_getInstance()]);
   };
   var DefaultBuiltins_instance;
@@ -2747,22 +2617,22 @@
     var tmp_0;
     var tmp_1;
     if (isInterface(error, Struct)) {
-      tmp_1 = error.rt() === 'error';
+      tmp_1 = error.zu() === 'error';
     } else {
       tmp_1 = false;
     }
     if (tmp_1) {
-      var containsArg = error.lt();
+      var containsArg = error.tu();
       tmp_0 = 1 <= containsArg ? containsArg <= 2 : false;
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      var tmp_2 = Companion_getInstance_20();
+      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.lt() > 1 ? error.get(1) : null);
+      tmp = tmp_2.of(VOID, VOID, context, isInterface(tmp_3, Struct) ? tmp_3 : THROW_CCE(), error.tu() > 1 ? error.get(1) : null);
     } else {
-      tmp = Companion_getInstance_19().f23(error, context);
+      tmp = Companion_instance_13.d27(error, context);
     }
     return tmp;
   }
@@ -2770,11 +2640,11 @@
     Throw_instance = this;
     UnaryPredicate.call(this, 'throw');
   }
-  protoOf(Throw).x2k = function (_this__u8e3s4, first) {
-    return sequenceOf([Companion_getInstance_21().s2b(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.o(0)), VOID, [])]);
+  protoOf(Throw).j2p = function (_this__u8e3s4, first) {
+    return sequenceOf([Companion_getInstance_5().b2g(_this__u8e3s4).replyException(handleError(this, _this__u8e3s4.context, _this__u8e3s4.arguments.d1(0)), VOID, [])]);
   };
-  protoOf(Throw).x2e = function (_this__u8e3s4, first) {
-    return this.x2k(_this__u8e3s4, first);
+  protoOf(Throw).h2j = function (_this__u8e3s4, first) {
+    return this.j2p(_this__u8e3s4, first);
   };
   var Throw_instance;
   function Throw_getInstance() {
@@ -2786,14 +2656,12 @@
     Call_instance = this;
     RuleWrapper_init_$Init$('call', 1, VOID, this);
   }
-  protoOf(Call).b2f = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G')]);
+  protoOf(Call).n2j = function (_this__u8e3s4) {
+    return listOf(_this__u8e3s4.varOf('G'));
   };
-  protoOf(Call).c2f = function (_this__u8e3s4) {
-    var tmp$ret$0;
+  protoOf(Call).o2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    var tmp0__get_functor__thl4dk = EnsureExecutable_getInstance();
-    tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
+    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')]);
   };
   var Call_instance;
@@ -2806,10 +2674,10 @@
     Catch_instance = this;
     RuleWrapper_init_$Init$('catch', 3, VOID, this);
   }
-  protoOf(Catch).b2f = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
+  protoOf(Catch).n2j = function (_this__u8e3s4) {
+    return listOf_0([_this__u8e3s4.varOf('G'), _this__u8e3s4.varOf('E'), _this__u8e3s4.varOf('C')]);
   };
-  protoOf(Catch).c2f = function (_this__u8e3s4) {
+  protoOf(Catch).o2j = function (_this__u8e3s4) {
     return _this__u8e3s4.varOf('G');
   };
   var Catch_instance;
@@ -2822,10 +2690,10 @@
     Comma_instance = this;
     RuleWrapper_init_$Init$(',', 2, VOID, this);
   }
-  protoOf(Comma).b2f = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
+  protoOf(Comma).n2j = function (_this__u8e3s4) {
+    return listOf_0([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
-  protoOf(Comma).c2f = function (_this__u8e3s4) {
+  protoOf(Comma).o2j = function (_this__u8e3s4) {
     return _this__u8e3s4.tupleOf([_this__u8e3s4.varOf('A'), _this__u8e3s4.varOf('B')]);
   };
   var Comma_instance;
@@ -2848,16 +2716,12 @@
     Fail_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Fail).c2f = function (_this__u8e3s4) {
-    var tmp$ret$0;
+  protoOf(Fail).o2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    var tmp0__get_functor__thl4dk = EnsureExecutable_getInstance();
-    tmp$ret$0 = tmp0__get_functor__thl4dk.signature.name;
+    var tmp$ret$0 = EnsureExecutable_getInstance().signature.name;
     var tmp = _this__u8e3s4.structOf(tmp$ret$0, [_this__u8e3s4.varOf('X')]);
-    var tmp$ret$1;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    var tmp1__get_functor__4k11yf = Call_getInstance();
-    tmp$ret$1 = tmp1__get_functor__4k11yf.signature.name;
+    var tmp$ret$1 = Call_getInstance().signature.name;
     return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$1, [_this__u8e3s4.varOf('X')]), MagicCut_getInstance(), _this__u8e3s4.truthOf(false)]);
   };
   var Fail_instance;
@@ -2870,7 +2734,7 @@
     Success_instance = this;
     NegationAsFailure.call(this);
   }
-  protoOf(Success).c2f = function (_this__u8e3s4) {
+  protoOf(Success).o2j = function (_this__u8e3s4) {
     return _this__u8e3s4.truthOf(true);
   };
   var Success_instance;
@@ -2880,155 +2744,66 @@
     return Success_instance;
   }
   function Companion_1() {
-    Companion_instance_1 = this;
-    this.j33_1 = '\\+';
-    this.k33_1 = 1;
+    this.i38_1 = '\\+';
+    this.j38_1 = 1;
   }
-  var Companion_instance_1;
-  function Companion_getInstance_24() {
-    if (Companion_instance_1 == null)
-      new Companion_1();
-    return Companion_instance_1;
+  var Companion_instance_17;
+  function Companion_getInstance_8() {
+    return Companion_instance_17;
   }
   function NegationAsFailure() {
-    Companion_getInstance_24();
-    Companion_getInstance_24();
-    Companion_getInstance_24();
     RuleWrapper_init_$Init$('\\+', 1, VOID, this);
   }
-  protoOf(NegationAsFailure).b2f = function (_this__u8e3s4) {
-    return _this__u8e3s4.ktListOf([_this__u8e3s4.varOf('X')]);
+  protoOf(NegationAsFailure).n2j = function (_this__u8e3s4) {
+    return listOf(_this__u8e3s4.varOf('X'));
   };
   //region block: post-declaration
-  protoOf(AbstractClassicSolver).copy = copy;
-  protoOf(AbstractClassicSolver).solveWithTimeout = solveWithTimeout;
-  protoOf(AbstractClassicSolver).solve = solve;
-  protoOf(AbstractClassicSolver).solveListWithTimeout = solveListWithTimeout;
-  protoOf(AbstractClassicSolver).solveList = solveList;
-  protoOf(AbstractClassicSolver).solveListWithOptions = solveListWithOptions;
-  protoOf(AbstractClassicSolver).solveOnceWithTimeout = solveOnceWithTimeout;
-  protoOf(AbstractClassicSolver).solveOnce = solveOnce;
-  protoOf(AbstractClassicSolver).solveOnceWithOptions = solveOnceWithOptions;
-  protoOf(AbstractClassicSolver).z1r = get_standardInput;
-  protoOf(AbstractClassicSolver).b1s = get_standardOutput;
-  protoOf(AbstractClassicSolver).d1s = get_standardError;
-  protoOf(AbstractClassicSolver).f1s = get_warnings;
   protoOf(ClassicExecutionContext).createSolver = createSolver;
+  protoOf(ClassicExecutionContext).createMutableSolver = createMutableSolver;
   protoOf(ClassicExecutionContext).update = update;
-  protoOf(ClassicExecutionContext).z1r = get_standardInput;
-  protoOf(ClassicExecutionContext).b1s = get_standardOutput;
-  protoOf(ClassicExecutionContext).d1s = get_standardError;
-  protoOf(ClassicExecutionContext).f1s = get_warnings;
-  protoOf(ClassicExecutionContext).h1r = get_endTime;
-  protoOf(ClassicExecutionContext).j1r = get_remainingTime;
-  protoOf(ClassicExecutionContext).k1r = get_elapsedTime;
-  protoOf(ClassicSolver).copy = copy;
-  protoOf(ClassicSolver).solveWithTimeout = solveWithTimeout;
-  protoOf(ClassicSolver).solve = solve;
-  protoOf(ClassicSolver).solveListWithTimeout = solveListWithTimeout;
-  protoOf(ClassicSolver).solveList = solveList;
-  protoOf(ClassicSolver).solveListWithOptions = solveListWithOptions;
-  protoOf(ClassicSolver).solveOnceWithTimeout = solveOnceWithTimeout;
-  protoOf(ClassicSolver).solveOnce = solveOnce;
-  protoOf(ClassicSolver).solveOnceWithOptions = solveOnceWithOptions;
-  protoOf(ClassicSolver).z1r = get_standardInput;
-  protoOf(ClassicSolver).b1s = get_standardOutput;
-  protoOf(ClassicSolver).d1s = get_standardError;
-  protoOf(ClassicSolver).f1s = get_warnings;
+  protoOf(ClassicExecutionContext).u1v = get_standardInput;
+  protoOf(ClassicExecutionContext).v1v = get_standardOutput;
+  protoOf(ClassicExecutionContext).w1v = get_standardError;
+  protoOf(ClassicExecutionContext).x1v = get_warnings;
+  protoOf(ClassicExecutionContext).b1v = get_endTime;
+  protoOf(ClassicExecutionContext).d1v = get_remainingTime;
+  protoOf(ClassicExecutionContext).e1v = get_elapsedTime;
   protoOf(ClassicSolverFactory).rawSolverOf = rawSolverOf;
   protoOf(ClassicSolverFactory).solverOf = solverOf;
   protoOf(ClassicSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ClassicSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ClassicSolverFactory).newBuilder = newBuilder;
-  protoOf(ClassicSolverFactory).m1u = get_defaultRuntime;
-  protoOf(ClassicSolverFactory).o1u = get_defaultUnificator;
-  protoOf(ClassicSolverFactory).p1u = get_defaultFlags;
-  protoOf(ClassicSolverFactory).s1u = get_defaultStaticKb;
-  protoOf(ClassicSolverFactory).t1u = get_defaultDynamicKb;
-  protoOf(ClassicSolverFactory).u1u = get_defaultInputChannel;
-  protoOf(ClassicSolverFactory).v1u = get_defaultOutputChannel;
-  protoOf(ClassicSolverFactory).w1u = get_defaultErrorChannel;
-  protoOf(ClassicSolverFactory).x1u = get_defaultWarningsChannel;
-  protoOf(ClassicSolverFactory).f1v = solverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).j1y = get_defaultRuntime;
+  protoOf(ClassicSolverFactory).l1y = get_defaultUnificator;
+  protoOf(ClassicSolverFactory).m1y = get_defaultFlags;
+  protoOf(ClassicSolverFactory).p1y = get_defaultStaticKb;
+  protoOf(ClassicSolverFactory).q1y = get_defaultDynamicKb;
+  protoOf(ClassicSolverFactory).r1y = get_defaultInputChannel;
+  protoOf(ClassicSolverFactory).s1y = get_defaultOutputChannel;
+  protoOf(ClassicSolverFactory).t1y = get_defaultErrorChannel;
+  protoOf(ClassicSolverFactory).u1y = get_defaultWarningsChannel;
+  protoOf(ClassicSolverFactory).c1z = solverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ClassicSolverFactory).h1v = mutableSolverWithDefaultBuiltins;
+  protoOf(ClassicSolverFactory).e1z = mutableSolverWithDefaultBuiltins;
   protoOf(ClassicSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
-  protoOf(MutableClassicSolver).copy = copy;
-  protoOf(MutableClassicSolver).solveWithTimeout = solveWithTimeout;
-  protoOf(MutableClassicSolver).solve = solve;
-  protoOf(MutableClassicSolver).solveListWithTimeout = solveListWithTimeout;
-  protoOf(MutableClassicSolver).solveList = solveList;
-  protoOf(MutableClassicSolver).solveListWithOptions = solveListWithOptions;
-  protoOf(MutableClassicSolver).solveOnceWithTimeout = solveOnceWithTimeout;
-  protoOf(MutableClassicSolver).solveOnce = solveOnce;
-  protoOf(MutableClassicSolver).solveOnceWithOptions = solveOnceWithOptions;
-  protoOf(MutableClassicSolver).z1r = get_standardInput;
-  protoOf(MutableClassicSolver).b1s = get_standardOutput;
-  protoOf(MutableClassicSolver).d1s = get_standardError;
-  protoOf(MutableClassicSolver).f1s = get_warnings;
   protoOf(MutableClassicSolver).loadStaticClauses = loadStaticClauses;
   protoOf(MutableClassicSolver).loadStaticClausesIterable = loadStaticClausesIterable;
   protoOf(MutableClassicSolver).loadStaticClausesSequence = loadStaticClausesSequence;
   protoOf(MutableClassicSolver).loadDynamicClauses = loadDynamicClauses;
   protoOf(MutableClassicSolver).loadDynamicClausesIterable = loadDynamicClausesIterable;
   protoOf(MutableClassicSolver).loadDynamicClausesSequence = loadDynamicClausesSequence;
-  protoOf(AbstractState).x2z = get_isEndState;
+  protoOf(AbstractState).w34 = get_isEndState;
   protoOf(AbstractState).asEndState = asEndState;
   protoOf(AbstractState).castToEndState = castToEndState;
   protoOf(AbstractState).clone = clone;
-  protoOf(AbstractEndState).a2x = get_hasOpenAlternatives;
-  protoOf(AbstractEndState).x2z = get_isEndState_0;
-  protoOf(AbstractEndState).y2z = asEndState_0;
-  protoOf(AbstractEndState).castToEndState = castToEndState;
-  protoOf(AbstractEndState).clone = clone;
-  protoOf(StateBacktracking).clone = clone;
-  protoOf(StateBacktracking).x2z = get_isEndState;
-  protoOf(StateBacktracking).asEndState = asEndState;
-  protoOf(StateBacktracking).castToEndState = castToEndState;
-  protoOf(StateEnd).clone = clone;
-  protoOf(StateEnd).a2x = get_hasOpenAlternatives;
-  protoOf(StateEnd).x2z = get_isEndState_0;
-  protoOf(StateEnd).y2z = asEndState_0;
-  protoOf(StateEnd).castToEndState = castToEndState;
-  protoOf(StateException).clone = clone;
-  protoOf(StateException).x2z = get_isEndState;
-  protoOf(StateException).asEndState = asEndState;
-  protoOf(StateException).castToEndState = castToEndState;
-  protoOf(StateGoalSelection).clone = clone;
-  protoOf(StateGoalSelection).x2z = get_isEndState;
-  protoOf(StateGoalSelection).asEndState = asEndState;
-  protoOf(StateGoalSelection).castToEndState = castToEndState;
-  protoOf(StateHalt).clone = clone;
-  protoOf(StateHalt).x2z = get_isEndState_0;
-  protoOf(StateHalt).y2z = asEndState_0;
-  protoOf(StateHalt).castToEndState = castToEndState;
-  protoOf(StateHalt).a2x = get_hasOpenAlternatives;
-  protoOf(StateInit).clone = clone;
-  protoOf(StateInit).x2z = get_isEndState;
-  protoOf(StateInit).asEndState = asEndState;
-  protoOf(StateInit).castToEndState = castToEndState;
-  protoOf(StatePrimitiveExecution).clone = clone;
-  protoOf(StatePrimitiveExecution).x2z = get_isEndState;
-  protoOf(StatePrimitiveExecution).asEndState = asEndState;
-  protoOf(StatePrimitiveExecution).castToEndState = castToEndState;
-  protoOf(StatePrimitiveSelection).clone = clone;
-  protoOf(StatePrimitiveSelection).x2z = get_isEndState;
-  protoOf(StatePrimitiveSelection).asEndState = asEndState;
-  protoOf(StatePrimitiveSelection).castToEndState = castToEndState;
-  protoOf(StateRuleExecution).clone = clone;
-  protoOf(StateRuleExecution).x2z = get_isEndState;
-  protoOf(StateRuleExecution).asEndState = asEndState;
-  protoOf(StateRuleExecution).castToEndState = castToEndState;
-  protoOf(StateRuleSelection).clone = clone;
-  protoOf(StateRuleSelection).x2z = get_isEndState;
-  protoOf(StateRuleSelection).asEndState = asEndState;
-  protoOf(StateRuleSelection).castToEndState = castToEndState;
-  protoOf(DefaultBuiltins).containsSignature = containsSignature;
-  protoOf(DefaultBuiltins).containsOperator = containsOperator;
-  protoOf(DefaultBuiltins).hasPrimitive = hasPrimitive;
-  protoOf(DefaultBuiltins).hasFunction = hasFunction;
-  protoOf(DefaultBuiltins).g2a = get_ruleSignatures;
-  protoOf(DefaultBuiltins).hasProtected = hasProtected;
+  protoOf(AbstractEndState).z31 = get_hasOpenAlternatives;
+  protoOf(AbstractEndState).w34 = get_isEndState_0;
+  protoOf(AbstractEndState).x34 = asEndState_0;
+  //endregion
+  //region block: init
+  ClassicSolverFactory_instance = new ClassicSolverFactory();
+  Companion_instance_15 = new Companion();
+  Companion_instance_17 = new Companion_1();
   //endregion
   //region block: exports
   function $jsExportAll$(_) {
@@ -3041,6 +2816,8 @@
   }
   $jsExportAll$(_);
   _.$jsExportAll$ = $jsExportAll$;
+  _.$_$ = _.$_$ || {};
+  _.$_$.a = ClassicSolverFactory_instance;
   //endregion
   return _;
 }));