@tuprolog/2p-full 3.0.5 → 3.0.7

package/2p-solve-problog.js

@@ -37,10 +37,12 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.s8;
-  var first = kotlin_kotlin.$_$.p3;
+  var toList = kotlin_kotlin.$_$.v5;
+  var protoOf = kotlin_kotlin.$_$.u8;
+  var asReversed = kotlin_kotlin.$_$.o2;
+  var Unit_instance = kotlin_kotlin.$_$.r;
   var Companion_instance = kotlin_it_unibo_tuprolog_core.$_$.p;
-  var THROW_CCE = kotlin_kotlin.$_$.fe;
+  var first = kotlin_kotlin.$_$.q3;
   var loadStaticClauses = kotlin_it_unibo_tuprolog_solve.$_$.h4;
   var loadStaticClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.i4;
   var loadStaticClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.j4;
@@ -48,7 +50,7 @@
   var loadDynamicClausesIterable = kotlin_it_unibo_tuprolog_solve.$_$.e4;
   var loadDynamicClausesSequence = kotlin_it_unibo_tuprolog_solve.$_$.f4;
   var MutableSolver = kotlin_it_unibo_tuprolog_solve.$_$.k4;
-  var initMetadataForClass = kotlin_kotlin.$_$.b8;
+  var initMetadataForClass = kotlin_kotlin.$_$.d8;
   var VOID = kotlin_kotlin.$_$.b;
   var Specifier_XFY_getInstance = kotlin_it_unibo_tuprolog_core.$_$.c;
   var Operator = kotlin_it_unibo_tuprolog_core.$_$.n1;
@@ -57,23 +59,23 @@
   var Companion_getInstance_0 = kotlin_it_unibo_tuprolog_core.$_$.c1;
   var Companion_instance_0 = kotlin_it_unibo_tuprolog_core.$_$.b1;
   var Companion_getInstance_1 = kotlin_it_unibo_tuprolog_core.$_$.x;
-  var map = kotlin_kotlin.$_$.ta;
+  var map = kotlin_kotlin.$_$.wa;
   var Companion_instance_1 = kotlin_it_unibo_tuprolog_solve.$_$.s1;
   var Halt = kotlin_it_unibo_tuprolog_solve.$_$.m4;
-  var isInterface = kotlin_kotlin.$_$.k8;
+  var isInterface = kotlin_kotlin.$_$.m8;
   var Yes = kotlin_it_unibo_tuprolog_solve.$_$.o4;
-  var Unit_instance = kotlin_kotlin.$_$.r;
   var setProbability = kotlin_it_unibo_tuprolog_solve_plp.$_$.d;
   var Numeric = kotlin_it_unibo_tuprolog_core.$_$.w1;
   var setBinaryDecisionDiagram = kotlin_it_unibo_tuprolog_solve_plp.$_$.b;
   var get_isProbabilistic = kotlin_it_unibo_tuprolog_solve_plp.$_$.a;
   var Companion_getInstance_2 = kotlin_it_unibo_tuprolog_solve.$_$.u1;
-  var toList = kotlin_kotlin.$_$.hb;
-  var first_0 = kotlin_kotlin.$_$.ia;
-  var copy = kotlin_it_unibo_tuprolog_solve.$_$.z1;
+  var toList_0 = kotlin_kotlin.$_$.kb;
+  var first_0 = kotlin_kotlin.$_$.ka;
+  var copy$default = kotlin_it_unibo_tuprolog_solve.$_$.z1;
   var Solver = kotlin_it_unibo_tuprolog_solve.$_$.c5;
   var TrackVariables_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.j1;
   var invoke = kotlin_it_unibo_tuprolog_solve.$_$.u2;
+  var THROW_CCE = kotlin_kotlin.$_$.he;
   var KtMap = kotlin_kotlin.$_$.f2;
   var get_defaultFlags = kotlin_it_unibo_tuprolog_solve.$_$.r4;
   var PrologSolverFactory_instance = kotlin_it_unibo_tuprolog_solve_prolog.$_$.c;
@@ -95,55 +97,54 @@
   var mutableSolverWithDefaultBuiltins = kotlin_it_unibo_tuprolog_solve.$_$.y4;
   var mutableSolverWithDefaultBuiltinsAnd = kotlin_it_unibo_tuprolog_solve.$_$.c2;
   var SolverFactory = kotlin_it_unibo_tuprolog_solve.$_$.b5;
-  var initMetadataForObject = kotlin_kotlin.$_$.g8;
-  var defineProp = kotlin_kotlin.$_$.s7;
+  var initMetadataForObject = kotlin_kotlin.$_$.i8;
+  var defineProp = kotlin_kotlin.$_$.u7;
   var ExtensionLibrary = kotlin_it_unibo_tuprolog_solve.$_$.x2;
   var DefaultBuiltins_getInstance = kotlin_it_unibo_tuprolog_solve_prolog.$_$.b;
   var EnsureExecutable_getInstance = kotlin_it_unibo_tuprolog_solve.$_$.p1;
-  var listOf = kotlin_kotlin.$_$.g4;
+  var listOf = kotlin_kotlin.$_$.h4;
   var Call_getInstance = kotlin_it_unibo_tuprolog_solve_prolog.$_$.a;
   var Companion_getInstance_3 = kotlin_it_unibo_tuprolog_solve.$_$.l1;
-  var listOf_0 = kotlin_kotlin.$_$.h4;
+  var listOf_0 = kotlin_kotlin.$_$.i4;
   var TuPrologException = kotlin_it_unibo_tuprolog_core.$_$.l1;
   var TuPrologException_init_$Init$ = kotlin_it_unibo_tuprolog_core.$_$.f1;
-  var captureStack = kotlin_kotlin.$_$.j7;
-  var emptyList = kotlin_kotlin.$_$.k3;
+  var captureStack = kotlin_kotlin.$_$.l7;
+  var emptyList = kotlin_kotlin.$_$.l3;
   var asIterable = kotlin_kotlin.$_$.l2;
-  var asIterable_0 = kotlin_kotlin.$_$.x9;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.t;
+  var asIterable_0 = kotlin_kotlin.$_$.z9;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.u;
   var Companion_instance_2 = kotlin_it_unibo_tuprolog_core.$_$.w;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.c8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.e8;
   var bddTerminalOf = kotlin_it_unibo_tuprolog_bdd.$_$.d;
   var bddOf = kotlin_it_unibo_tuprolog_bdd.$_$.c;
-  var initMetadataForInterface = kotlin_kotlin.$_$.e8;
+  var initMetadataForInterface = kotlin_kotlin.$_$.g8;
   var Companion_getInstance_4 = kotlin_it_unibo_tuprolog_core.$_$.m;
   var Companion_getInstance_5 = kotlin_it_unibo_tuprolog_core.$_$.y;
   var Term = kotlin_it_unibo_tuprolog_core.$_$.y2;
   var Atom = kotlin_it_unibo_tuprolog_core.$_$.o1;
-  var KProperty1 = kotlin_kotlin.$_$.t9;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.y7;
+  var KProperty1 = kotlin_kotlin.$_$.v9;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.a8;
   var Collection = kotlin_kotlin.$_$.b2;
-  var constructCallableReference = kotlin_kotlin.$_$.r7;
-  var getBigIntHashCode = kotlin_kotlin.$_$.v7;
-  var getNumberHashCode = kotlin_kotlin.$_$.x7;
-  var hashCode = kotlin_kotlin.$_$.a8;
-  var emptySet = kotlin_kotlin.$_$.m3;
+  var constructCallableReference = kotlin_kotlin.$_$.t7;
+  var getBigIntHashCode = kotlin_kotlin.$_$.x7;
+  var getNumberHashCode = kotlin_kotlin.$_$.z7;
+  var hashCode = kotlin_kotlin.$_$.c8;
+  var emptySet = kotlin_kotlin.$_$.n3;
   var Companion_getInstance_6 = kotlin_it_unibo_tuprolog_core.$_$.t;
-  var lazy = kotlin_kotlin.$_$.pe;
+  var lazy = kotlin_kotlin.$_$.re;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.w2;
-  var toSet = kotlin_kotlin.$_$.b6;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.u;
+  var toSet = kotlin_kotlin.$_$.d6;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.v;
   var compareTo = kotlin_it_unibo_tuprolog_core.$_$.b2;
-  var compareTo_0 = kotlin_kotlin.$_$.q7;
-  var equals = kotlin_kotlin.$_$.t7;
-  var round = kotlin_kotlin.$_$.a9;
+  var compareTo_0 = kotlin_kotlin.$_$.s7;
+  var equals = kotlin_kotlin.$_$.v7;
+  var round = kotlin_kotlin.$_$.c9;
   var MutableTheory = kotlin_it_unibo_tuprolog_theory.$_$.c;
   var Theory = kotlin_it_unibo_tuprolog_theory.$_$.f;
   var Struct = kotlin_it_unibo_tuprolog_core.$_$.z1;
   var TuPrologException_init_$Create$ = kotlin_it_unibo_tuprolog_core.$_$.h1;
   var Rule = kotlin_it_unibo_tuprolog_core.$_$.y1;
   var Companion_instance_3 = kotlin_it_unibo_tuprolog_core.$_$.v;
-  var toList_0 = kotlin_kotlin.$_$.t5;
   var UnsupportedOperationException_init_$Create$ = kotlin_kotlin.$_$.z1;
   var notThenExpansion = kotlin_it_unibo_tuprolog_bdd.$_$.g;
   var expansion = kotlin_it_unibo_tuprolog_bdd.$_$.e;
@@ -151,21 +152,22 @@
   var andThenExpansion = kotlin_it_unibo_tuprolog_bdd.$_$.a;
   var orThenExpansion = kotlin_it_unibo_tuprolog_bdd.$_$.h;
   var map_0 = kotlin_it_unibo_tuprolog_bdd.$_$.f;
-  var get_ONE = kotlin_kotlin.$_$.q6;
-  var add = kotlin_kotlin.$_$.r6;
+  var get_ONE = kotlin_kotlin.$_$.s6;
+  var add = kotlin_kotlin.$_$.t6;
   var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.s1;
   var Companion_instance_4 = kotlin_it_unibo_tuprolog_core.$_$.q;
-  var plus = kotlin_kotlin.$_$.b5;
+  var plus = kotlin_kotlin.$_$.c5;
   var setTag = kotlin_it_unibo_tuprolog_utils.$_$.l1;
-  var Regex_init_$Create$ = kotlin_kotlin.$_$.z;
-  var toDoubleOrNull = kotlin_kotlin.$_$.fd;
-  var toSet_0 = kotlin_kotlin.$_$.jb;
-  var plus_0 = kotlin_kotlin.$_$.y4;
+  var getValue = kotlin_kotlin.$_$.t3;
+  var toSet_0 = kotlin_kotlin.$_$.mb;
+  var plus_0 = kotlin_kotlin.$_$.z4;
   var checkIndexOverflow = kotlin_kotlin.$_$.v2;
-  var Pair = kotlin_kotlin.$_$.de;
+  var Pair = kotlin_kotlin.$_$.fe;
   var Fact = kotlin_it_unibo_tuprolog_core.$_$.s1;
-  var subtract = kotlin_kotlin.$_$.n5;
-  var setOf = kotlin_kotlin.$_$.g5;
+  var subtract = kotlin_kotlin.$_$.p5;
+  var setOf = kotlin_kotlin.$_$.h5;
+  var to = kotlin_kotlin.$_$.ye;
+  var mapOf = kotlin_kotlin.$_$.l4;
   var Directive = kotlin_it_unibo_tuprolog_core.$_$.r1;
   var Indicator = kotlin_it_unibo_tuprolog_core.$_$.t1;
   var Companion_instance_5 = kotlin_it_unibo_tuprolog_core.$_$.o;
@@ -179,30 +181,30 @@
   var Success = kotlin_it_unibo_tuprolog_theory.$_$.e;
   var NonBacktrackable = kotlin_it_unibo_tuprolog_solve.$_$.j3;
   var Companion_getInstance_9 = kotlin_it_unibo_tuprolog_solve.$_$.n1;
-  var Var = kotlin_it_unibo_tuprolog_core.$_$.b3;
+  var Var = kotlin_it_unibo_tuprolog_core.$_$.a3;
   var ResolutionException_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.i2;
-  var CoroutineImpl = kotlin_kotlin.$_$.j6;
-  var SequenceScope = kotlin_kotlin.$_$.u9;
-  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.i6;
+  var CoroutineImpl = kotlin_kotlin.$_$.l6;
+  var SequenceScope = kotlin_kotlin.$_$.w9;
+  var get_COROUTINE_SUSPENDED = kotlin_kotlin.$_$.k6;
   var extractSignature = kotlin_it_unibo_tuprolog_solve.$_$.e5;
-  var ensureNotNull = kotlin_kotlin.$_$.le;
+  var ensureNotNull = kotlin_kotlin.$_$.ne;
   var Clause = kotlin_it_unibo_tuprolog_core.$_$.p1;
   var copyToArray = kotlin_kotlin.$_$.g3;
-  var initMetadataForLambda = kotlin_kotlin.$_$.f8;
+  var initMetadataForLambda = kotlin_kotlin.$_$.h8;
   var WithoutSideEffects = kotlin_it_unibo_tuprolog_solve.$_$.l3;
-  var sequence = kotlin_kotlin.$_$.bb;
+  var sequence = kotlin_kotlin.$_$.eb;
   var NonBacktrackable_0 = kotlin_it_unibo_tuprolog_solve.$_$.b3;
   var setProbabilistic = kotlin_it_unibo_tuprolog_solve_plp.$_$.c;
-  var firstOrNull = kotlin_kotlin.$_$.ha;
+  var firstOrNull = kotlin_kotlin.$_$.ja;
   var WithoutSideEffects_0 = kotlin_it_unibo_tuprolog_solve.$_$.g3;
   var NonBacktrackable_1 = kotlin_it_unibo_tuprolog_solve.$_$.o3;
   var SetFlags_init_$Create$ = kotlin_it_unibo_tuprolog_solve.$_$.l2;
   var WithoutSideEffects_1 = kotlin_it_unibo_tuprolog_solve.$_$.c3;
   var asSequence = kotlin_kotlin.$_$.r2;
-  var filter = kotlin_kotlin.$_$.ga;
-  var Sequence = kotlin_kotlin.$_$.v9;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.w;
-  var sequenceOf = kotlin_kotlin.$_$.ab;
+  var filter = kotlin_kotlin.$_$.ia;
+  var Sequence = kotlin_kotlin.$_$.x9;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.x;
+  var sequenceOf = kotlin_kotlin.$_$.db;
   var RuleWrapper = kotlin_it_unibo_tuprolog_solve.$_$.r3;
   var RuleWrapper_init_$Init$ = kotlin_it_unibo_tuprolog_solve.$_$.k2;
   //endregion
@@ -219,7 +221,7 @@
   function get_probabilityOrNull() {
     var tmp;
     try {
-      tmp = this.l3n();
+      tmp = this.s3n();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof Error) {
@@ -263,162 +265,176 @@
   initMetadataForObject(ProbSolveWithEvidence, 'ProbSolveWithEvidence', VOID, WithoutSideEffects);
   initMetadataForObject(Prob, 'Prob', VOID, RuleWrapper);
   //endregion
+  function mapped($this, clause) {
+    return toList(Companion_instance_10.of($this.n3l_1.v1n(), [clause]).f1o());
+  }
   function MutableProblogSolver(solver) {
     ProblogSolver.call(this, solver);
-    this.g3l_1 = solver;
+    this.n3l_1 = solver;
   }
-  protoOf(MutableProblogSolver).z3d = function (library) {
-    this.g3l_1.loadLibrary(library);
+  protoOf(MutableProblogSolver).g3e = function (library) {
+    this.n3l_1.loadLibrary(library);
   };
   protoOf(MutableProblogSolver).loadLibrary = function (library) {
-    return this.z3d(library);
+    return this.g3e(library);
   };
-  protoOf(MutableProblogSolver).a3e = function (library) {
-    this.g3l_1.unloadLibrary(library);
+  protoOf(MutableProblogSolver).h3e = function (library) {
+    this.n3l_1.unloadLibrary(library);
   };
   protoOf(MutableProblogSolver).unloadLibrary = function (library) {
-    return this.a3e(library);
+    return this.h3e(library);
   };
-  protoOf(MutableProblogSolver).b3e = function (libraries) {
-    this.g3l_1.setLibraries(libraries);
+  protoOf(MutableProblogSolver).i3e = function (libraries) {
+    this.n3l_1.setLibraries(libraries);
   };
   protoOf(MutableProblogSolver).setLibraries = function (libraries) {
-    return this.b3e(libraries);
+    return this.i3e(libraries);
   };
-  protoOf(MutableProblogSolver).c3e = function (theory) {
-    this.g3l_1.loadStaticKb(Companion_instance_10.ofIterable(this.g3l_1.v1n(), theory));
+  protoOf(MutableProblogSolver).j3e = function (theory) {
+    this.n3l_1.loadStaticKb(Companion_instance_10.ofIterable(this.n3l_1.v1n(), theory));
   };
   protoOf(MutableProblogSolver).loadStaticKb = function (theory) {
-    return this.c3e(theory);
+    return this.j3e(theory);
   };
-  protoOf(MutableProblogSolver).d3e = function (theory) {
-    this.g3l_1.appendStaticKb(Companion_instance_10.ofIterable(this.g3l_1.v1n(), theory));
+  protoOf(MutableProblogSolver).k3e = function (theory) {
+    this.n3l_1.appendStaticKb(Companion_instance_10.ofIterable(this.n3l_1.v1n(), theory));
   };
   protoOf(MutableProblogSolver).appendStaticKb = function (theory) {
-    return this.d3e(theory);
+    return this.k3e(theory);
   };
-  protoOf(MutableProblogSolver).e3e = function () {
-    this.g3l_1.resetStaticKb();
+  protoOf(MutableProblogSolver).l3e = function () {
+    this.n3l_1.resetStaticKb();
   };
   protoOf(MutableProblogSolver).resetStaticKb = function () {
-    return this.e3e();
+    return this.l3e();
   };
-  protoOf(MutableProblogSolver).f3e = function (theory) {
-    this.g3l_1.loadDynamicKb(Companion_instance_10.ofIterable(this.g3l_1.v1n(), theory));
+  protoOf(MutableProblogSolver).m3e = function (theory) {
+    this.n3l_1.loadDynamicKb(Companion_instance_10.ofIterable(this.n3l_1.v1n(), theory));
   };
   protoOf(MutableProblogSolver).loadDynamicKb = function (theory) {
-    return this.f3e(theory);
+    return this.m3e(theory);
   };
-  protoOf(MutableProblogSolver).g3e = function (theory) {
-    this.g3l_1.appendDynamicKb(Companion_instance_10.ofIterable(this.g3l_1.v1n(), theory));
+  protoOf(MutableProblogSolver).n3e = function (theory) {
+    this.n3l_1.appendDynamicKb(Companion_instance_10.ofIterable(this.n3l_1.v1n(), theory));
   };
   protoOf(MutableProblogSolver).appendDynamicKb = function (theory) {
-    return this.g3e(theory);
+    return this.n3e(theory);
   };
-  protoOf(MutableProblogSolver).h3e = function () {
-    this.g3l_1.resetDynamicKb();
+  protoOf(MutableProblogSolver).o3e = function () {
+    this.n3l_1.resetDynamicKb();
   };
   protoOf(MutableProblogSolver).resetDynamicKb = function () {
-    return this.h3e();
+    return this.o3e();
   };
   protoOf(MutableProblogSolver).h1p = function (clause) {
-    this.g3l_1.assertA(first(Companion_instance_10.of(this.g3l_1.v1n(), [clause]).f1o()));
+    var tmp0 = asReversed(mapped(this, clause));
+    var tmp2_forEach_this = this.n3l_1;
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s = tmp0.n();
+    while (_iterator__ex2g4s.q()) {
+      var element = _iterator__ex2g4s.r();
+      tmp2_forEach_this.assertA(element);
+    }
   };
   protoOf(MutableProblogSolver).assertA = function (clause) {
     return this.h1p(clause);
   };
-  protoOf(MutableProblogSolver).i3e = function (fact) {
-    this.g3l_1.assertA(first(Companion_instance_10.of(this.g3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
+  protoOf(MutableProblogSolver).p3e = function (fact) {
+    this.h1p(Companion_instance.of(fact));
   };
   protoOf(MutableProblogSolver).assertAFact = function (fact) {
-    return this.i3e(fact);
+    return this.p3e(fact);
   };
   protoOf(MutableProblogSolver).i1o = function (clause) {
-    this.g3l_1.assertZ(first(Companion_instance_10.of(this.g3l_1.v1n(), [clause]).f1o()));
+    var tmp0 = mapped(this, clause);
+    var tmp2_forEach_this = this.n3l_1;
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s = tmp0.n();
+    while (_iterator__ex2g4s.q()) {
+      var element = _iterator__ex2g4s.r();
+      tmp2_forEach_this.assertZ(element);
+    }
   };
   protoOf(MutableProblogSolver).assertZ = function (clause) {
     return this.i1o(clause);
   };
-  protoOf(MutableProblogSolver).j3e = function (fact) {
-    this.g3l_1.assertA(first(Companion_instance_10.of(this.g3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
+  protoOf(MutableProblogSolver).q3e = function (fact) {
+    this.i1o(Companion_instance.of(fact));
   };
   protoOf(MutableProblogSolver).assertZFact = function (fact) {
-    return this.j3e(fact);
+    return this.q3e(fact);
   };
   protoOf(MutableProblogSolver).b1w = function (clause) {
-    return this.g3l_1.retract(first(Companion_instance_10.of(this.g3l_1.v1n(), [clause]).f1o()));
+    return this.n3l_1.retract(first(Companion_instance_10.of(this.n3l_1.v1n(), [clause]).f1o()));
   };
   protoOf(MutableProblogSolver).retract = function (clause) {
     return this.b1w(clause);
   };
   protoOf(MutableProblogSolver).c1w = function (fact) {
-    return this.g3l_1.retract(first(Companion_instance_10.of(this.g3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
+    return this.n3l_1.retract(first(Companion_instance_10.of(this.n3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
   };
   protoOf(MutableProblogSolver).retractByHead = function (fact) {
     return this.c1w(fact);
   };
   protoOf(MutableProblogSolver).n1o = function (clause) {
-    return this.g3l_1.retractAll(first(Companion_instance_10.of(this.g3l_1.v1n(), [clause]).f1o()));
+    return this.n3l_1.retractAll(first(Companion_instance_10.of(this.n3l_1.v1n(), [clause]).f1o()));
   };
   protoOf(MutableProblogSolver).retractAll = function (clause) {
     return this.n1o(clause);
   };
-  protoOf(MutableProblogSolver).k3e = function (fact) {
-    return this.g3l_1.retractAll(first(Companion_instance_10.of(this.g3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
+  protoOf(MutableProblogSolver).r3e = function (fact) {
+    return this.n3l_1.retractAll(first(Companion_instance_10.of(this.n3l_1.v1n(), [Companion_instance.of(fact)]).f1o()));
   };
   protoOf(MutableProblogSolver).retractAllBeHead = function (fact) {
-    return this.k3e(fact);
+    return this.r3e(fact);
   };
-  protoOf(MutableProblogSolver).l3e = function (name, value) {
-    this.g3l_1.setFlag(name, value);
+  protoOf(MutableProblogSolver).s3e = function (name, value) {
+    this.n3l_1.setFlag(name, value);
   };
   protoOf(MutableProblogSolver).setFlag = function (name, value) {
-    return this.l3e(name, value);
+    return this.s3e(name, value);
   };
-  protoOf(MutableProblogSolver).m3e = function (flag) {
-    this.g3l_1.setFlagPair(flag);
+  protoOf(MutableProblogSolver).t3e = function (flag) {
+    this.n3l_1.setFlagPair(flag);
   };
   protoOf(MutableProblogSolver).setFlagPair = function (flag) {
-    return this.m3e(flag);
+    return this.t3e(flag);
   };
-  protoOf(MutableProblogSolver).n3e = function (flag) {
-    this.g3l_1.setFlagNotable(flag);
+  protoOf(MutableProblogSolver).u3e = function (flag) {
+    this.n3l_1.setFlagNotable(flag);
   };
   protoOf(MutableProblogSolver).setFlagNotable = function (flag) {
-    return this.n3e(flag);
+    return this.u3e(flag);
   };
-  protoOf(MutableProblogSolver).o3e = function (stdIn) {
-    this.g3l_1.setStandardInput(stdIn);
+  protoOf(MutableProblogSolver).v3e = function (stdIn) {
+    this.n3l_1.setStandardInput(stdIn);
   };
   protoOf(MutableProblogSolver).setStandardInput = function (stdIn) {
-    return this.o3e(stdIn);
+    return this.v3e(stdIn);
   };
-  protoOf(MutableProblogSolver).p3e = function (stdErr) {
-    this.g3l_1.setStandardError(stdErr);
+  protoOf(MutableProblogSolver).w3e = function (stdErr) {
+    this.n3l_1.setStandardError(stdErr);
   };
   protoOf(MutableProblogSolver).setStandardError = function (stdErr) {
-    return this.p3e(stdErr);
+    return this.w3e(stdErr);
   };
-  protoOf(MutableProblogSolver).q3e = function (stdOut) {
-    this.g3l_1.setStandardOutput(stdOut);
+  protoOf(MutableProblogSolver).x3e = function (stdOut) {
+    this.n3l_1.setStandardOutput(stdOut);
   };
   protoOf(MutableProblogSolver).setStandardOutput = function (stdOut) {
-    return this.q3e(stdOut);
+    return this.x3e(stdOut);
   };
-  protoOf(MutableProblogSolver).r3e = function (warnings) {
-    this.g3l_1.setWarnings(warnings);
+  protoOf(MutableProblogSolver).y3e = function (warnings) {
+    this.n3l_1.setWarnings(warnings);
   };
   protoOf(MutableProblogSolver).setWarnings = function (warnings) {
-    return this.r3e(warnings);
+    return this.y3e(warnings);
   };
   protoOf(MutableProblogSolver).a1z = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new MutableProblogSolver(this.g3l_1.a1z(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings));
-  };
-  protoOf(MutableProblogSolver).copy = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
-    return this.copy(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof MutableProblogSolver) ? $super : THROW_CCE());
+    return new MutableProblogSolver(this.n3l_1.a1z(unificator, libraries, flags, Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
   protoOf(MutableProblogSolver).k1v = function () {
-    return new MutableProblogSolver(this.g3l_1.k1v());
+    return new MutableProblogSolver(this.n3l_1.k1v());
   };
   protoOf(MutableProblogSolver).clone = function () {
     return this.k1v();
@@ -449,11 +465,11 @@
     var tmp_0 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = ProbSetConfig_getInstance().signature.name;
-    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().u3l(options)]);
+    var tmp_1 = tmp_0.of(tmp$ret$0, [ProbSetConfig_getInstance().b3m(options)]);
     var tmp_2 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = Prob_getInstance().signature.name;
-    var tmp_3 = $this.h3l_1.solveWithOptions(tmp.of(tmp_1, tmp_2.of(tmp$ret$1, [anonVar, goal])), options);
+    var tmp_3 = $this.o3l_1.solveWithOptions(tmp.of(tmp_1, tmp_2.of(tmp$ret$1, [anonVar, goal])), options);
     return map(tmp_3, ProblogSolver$solveNonProbabilistically$lambda(goal, anonVar));
   }
   function solveProbabilistically($this, goal, options) {
@@ -462,7 +478,7 @@
     var tmp = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = ProbQuery_getInstance().signature.name;
-    var tmp_0 = $this.h3l_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().u3l(options), bddVar]), options);
+    var tmp_0 = $this.o3l_1.solveWithOptions(tmp.of(tmp$ret$0, [probabilityVar, goal, ProbSetConfig_getInstance().b3m(options), bddVar]), options);
     return map(tmp_0, ProblogSolver$solveProbabilistically$lambda(probabilityVar, bddVar, goal, options));
   }
   function ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar) {
@@ -476,10 +492,10 @@
       if (isInterface(it, Yes)) {
         var tmp_0 = Companion_instance_1;
         var tmp_1 = it.p1x();
-        tmp = tmp_0.t1z($goal, tmp_1.x12(ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar)));
+        tmp = tmp_0.u1z($goal, tmp_1.w12(ProblogSolver$solveNonProbabilistically$lambda$lambda($anonVar)));
       } else {
         if (isInterface(it, Halt)) {
-          tmp = Companion_instance_1.halt($goal, it.l1z());
+          tmp = Companion_instance_1.halt($goal, it.m1z());
         } else {
           tmp = Companion_instance_1.no($goal);
         }
@@ -500,10 +516,10 @@
       if (isInterface(it, Yes)) {
         var tmp_0 = Companion_instance_1;
         var tmp_1 = it.p1x();
-        tmp = tmp_0.t1z($goal, tmp_1.x12(ProblogSolver$solveProbabilistically$lambda$lambda($probabilityVar, $bddVar)));
+        tmp = tmp_0.u1z($goal, tmp_1.w12(ProblogSolver$solveProbabilistically$lambda$lambda($probabilityVar, $bddVar)));
       } else {
         if (isInterface(it, Halt)) {
-          tmp = Companion_instance_1.halt($goal, it.l1z());
+          tmp = Companion_instance_1.halt($goal, it.m1z());
         } else {
           tmp = Companion_instance_1.no($goal);
         }
@@ -515,7 +531,7 @@
       } else {
         var tmp_3;
         if (!(probabilityTerm == null) ? isInterface(probabilityTerm, Numeric) : false) {
-          tmp_3 = setProbability(newSolution, probabilityTerm.o11().toDouble());
+          tmp_3 = setProbability(newSolution, probabilityTerm.n11().toDouble());
         } else {
           tmp_3 = setProbability(newSolution, NaN);
         }
@@ -527,9 +543,9 @@
           tmp_4 = false;
         }
         if (tmp_4) {
-          var explanation = bddTerm.w3l_1;
+          var explanation = bddTerm.d3m_1;
           if (explanation instanceof BinaryDecisionDiagramExplanation) {
-            newSolution = setBinaryDecisionDiagram(newSolution, explanation.x3l_1);
+            newSolution = setBinaryDecisionDiagram(newSolution, explanation.e3m_1);
           }
         }
         tmp_2 = newSolution;
@@ -538,9 +554,9 @@
     };
   }
   function ProblogSolver(solver) {
-    this.h3l_1 = solver;
+    this.o3l_1 = solver;
   }
-  protoOf(ProblogSolver).x2f = function (goal, options) {
+  protoOf(ProblogSolver).e2g = function (goal, options) {
     var tmp;
     if (!get_isProbabilistic(options)) {
       tmp = solveNonProbabilistically(this, goal, options);
@@ -550,103 +566,100 @@
     return tmp;
   };
   protoOf(ProblogSolver).solveWithOptions = function (goal, options) {
-    return this.x2f(goal, options);
+    return this.e2g(goal, options);
   };
-  protoOf(ProblogSolver).i3l = function (goal, timeout) {
-    return this.x2f(goal, Companion_getInstance_2().allLazilyWithTimeout(timeout));
+  protoOf(ProblogSolver).p3l = function (goal, timeout) {
+    return this.e2g(goal, Companion_getInstance_2().allLazilyWithTimeout(timeout));
   };
   protoOf(ProblogSolver).solveWithTimeout = function (goal, timeout) {
-    return this.i3l(goal, timeout);
+    return this.p3l(goal, timeout);
   };
-  protoOf(ProblogSolver).j3l = function (goal) {
-    return this.x2f(goal, Companion_getInstance_2().DEFAULT);
+  protoOf(ProblogSolver).q3l = function (goal) {
+    return this.e2g(goal, Companion_getInstance_2().DEFAULT);
   };
   protoOf(ProblogSolver).solve = function (goal) {
-    return this.j3l(goal);
+    return this.q3l(goal);
   };
-  protoOf(ProblogSolver).k3l = function (goal, timeout) {
-    return toList(this.i3l(goal, timeout));
+  protoOf(ProblogSolver).r3l = function (goal, timeout) {
+    return toList_0(this.p3l(goal, timeout));
   };
   protoOf(ProblogSolver).solveListWithTimeout = function (goal, timeout) {
-    return this.k3l(goal, timeout);
+    return this.r3l(goal, timeout);
   };
-  protoOf(ProblogSolver).l3l = function (goal) {
-    return toList(this.j3l(goal));
+  protoOf(ProblogSolver).s3l = function (goal) {
+    return toList_0(this.q3l(goal));
   };
   protoOf(ProblogSolver).solveList = function (goal) {
-    return this.l3l(goal);
+    return this.s3l(goal);
   };
-  protoOf(ProblogSolver).m3l = function (goal, options) {
-    return toList(this.x2f(goal, options));
+  protoOf(ProblogSolver).t3l = function (goal, options) {
+    return toList_0(this.e2g(goal, options));
   };
   protoOf(ProblogSolver).solveListWithOptions = function (goal, options) {
-    return this.m3l(goal, options);
+    return this.t3l(goal, options);
   };
-  protoOf(ProblogSolver).n3l = function (goal, timeout) {
-    return first_0(this.x2f(goal, Companion_getInstance_2().someLazilyWithTimeout(1, timeout)));
+  protoOf(ProblogSolver).u3l = function (goal, timeout) {
+    return first_0(this.e2g(goal, Companion_getInstance_2().someLazilyWithTimeout(1, timeout)));
   };
   protoOf(ProblogSolver).solveOnceWithTimeout = function (goal, timeout) {
-    return this.n3l(goal, timeout);
+    return this.u3l(goal, timeout);
   };
-  protoOf(ProblogSolver).o3l = function (goal) {
-    return first_0(this.x2f(goal, Companion_getInstance_2().someLazily(1)));
+  protoOf(ProblogSolver).v3l = function (goal) {
+    return first_0(this.e2g(goal, Companion_getInstance_2().someLazily(1)));
   };
   protoOf(ProblogSolver).solveOnce = function (goal) {
-    return this.o3l(goal);
+    return this.v3l(goal);
   };
-  protoOf(ProblogSolver).p3l = function (goal, options) {
-    return first_0(this.x2f(goal, options.setLimit(1)));
+  protoOf(ProblogSolver).w3l = function (goal, options) {
+    return first_0(this.e2g(goal, options.setLimit(1)));
   };
   protoOf(ProblogSolver).solveOnceWithOptions = function (goal, options) {
-    return this.p3l(goal, options);
+    return this.w3l(goal, options);
   };
   protoOf(ProblogSolver).a1z = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new ProblogSolver(this.h3l_1.a1z(unificator, libraries, flags, Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
-  };
-  protoOf(ProblogSolver).copy = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
-    return this.copy(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ProblogSolver) ? $super : THROW_CCE());
+    return new ProblogSolver(this.o3l_1.a1z(unificator, libraries, flags, Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
   protoOf(ProblogSolver).k1v = function () {
-    return new ProblogSolver(this.h3l_1.clone());
+    return new ProblogSolver(this.o3l_1.clone());
   };
   protoOf(ProblogSolver).clone = function () {
     return this.k1v();
   };
   protoOf(ProblogSolver).t1x = function () {
-    return this.h3l_1.t1x();
+    return this.o3l_1.t1x();
   };
   protoOf(ProblogSolver).u1x = function () {
-    return this.h3l_1.u1x();
+    return this.o3l_1.u1x();
   };
   protoOf(ProblogSolver).v1x = function () {
-    return this.h3l_1.v1x();
+    return this.o3l_1.v1x();
   };
   protoOf(ProblogSolver).w1x = function () {
-    return this.h3l_1.w1x();
+    return this.o3l_1.w1x();
   };
   protoOf(ProblogSolver).c1y = function () {
-    return this.h3l_1.c1y();
+    return this.o3l_1.c1y();
   };
   protoOf(ProblogSolver).x1x = function () {
-    return this.h3l_1.x1x();
+    return this.o3l_1.x1x();
   };
   protoOf(ProblogSolver).y1x = function () {
-    return this.h3l_1.y1x();
+    return this.o3l_1.y1x();
   };
   protoOf(ProblogSolver).d1y = function () {
-    return this.h3l_1.d1y();
+    return this.o3l_1.d1y();
   };
   protoOf(ProblogSolver).e1y = function () {
-    return this.h3l_1.e1y();
+    return this.o3l_1.e1y();
   };
   protoOf(ProblogSolver).f1y = function () {
-    return this.h3l_1.f1y();
+    return this.o3l_1.f1y();
   };
   protoOf(ProblogSolver).g1y = function () {
-    return this.h3l_1.g1y();
+    return this.o3l_1.g1y();
   };
   protoOf(ProblogSolver).v1n = function () {
-    return this.h3l_1.v1n();
+    return this.o3l_1.v1n();
   };
   function ensureVariablesTracking($this, flags) {
     var tmp = TrackVariables_getInstance();
@@ -656,7 +669,7 @@
     var tmp;
     // Inline function 'kotlin.collections.contains' call
     // Inline function 'kotlin.collections.containsKey' call
-    var key = ProblogLib_getInstance().w2i();
+    var key = ProblogLib_getInstance().e2j();
     if (!(isInterface(libraries, KtMap) ? libraries : THROW_CCE()).h2(key)) {
       tmp = libraries.plusLibrary(MinimalBuiltins_getInstance());
     } else {
@@ -665,36 +678,36 @@
     return tmp;
   }
   function ProblogSolverFactory$ensureVariablesTracking$lambda($this$TrackVariables) {
-    return $this$TrackVariables.g2d_1;
+    return $this$TrackVariables.n2d_1;
   }
   function ProblogSolverFactory() {
   }
-  protoOf(ProblogSolverFactory).b21 = function () {
+  protoOf(ProblogSolverFactory).c21 = function () {
     return DefaultBuiltins_getInstance_0();
   };
-  protoOf(ProblogSolverFactory).d21 = function () {
+  protoOf(ProblogSolverFactory).e21 = function () {
     return ensureVariablesTracking(this, get_defaultFlags.call(this));
   };
-  protoOf(ProblogSolverFactory).m21 = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
-    return new ProblogSolver(PrologSolverFactory_instance.m21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), inputs, outputs));
+  protoOf(ProblogSolverFactory).n21 = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+    return new ProblogSolver(PrologSolverFactory_instance.n21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), inputs, outputs));
   };
   protoOf(ProblogSolverFactory).rawSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, $super) {
     return this.rawSolverOf(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, ($super == null ? true : $super instanceof ProblogSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ProblogSolverFactory).s21 = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new ProblogSolver(PrologSolverFactory_instance.s21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+  protoOf(ProblogSolverFactory).t21 = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new ProblogSolver(PrologSolverFactory_instance.t21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
   protoOf(ProblogSolverFactory).solverOf = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.solverOf(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ProblogSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ProblogSolverFactory).u21 = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
-    return new MutableProblogSolver(PrologSolverFactory_instance.u21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
+  protoOf(ProblogSolverFactory).v21 = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings) {
+    return new MutableProblogSolver(PrologSolverFactory_instance.v21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), stdIn, stdOut, stdErr, warnings));
   };
   protoOf(ProblogSolverFactory).mutableSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, $super) {
     return this.mutableSolverOf(unificator, libraries, flags, staticKb, dynamicKb, stdIn, stdOut, stdErr, warnings, ($super == null ? true : $super instanceof ProblogSolverFactory) ? $super : THROW_CCE());
   };
-  protoOf(ProblogSolverFactory).w21 = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
-    return new MutableProblogSolver(PrologSolverFactory_instance.w21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), inputs, outputs));
+  protoOf(ProblogSolverFactory).x21 = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs) {
+    return new MutableProblogSolver(PrologSolverFactory_instance.x21(unificator, fixLibraries(this, libraries), ensureVariablesTracking(this, flags), Companion_instance_10.ofIterable(unificator, staticKb), Companion_instance_10.ofIterable(unificator, dynamicKb), inputs, outputs));
   };
   protoOf(ProblogSolverFactory).rawMutableSolverOf = function (unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, $super) {
     return this.rawMutableSolverOf(unificator, libraries, flags, staticKb, dynamicKb, inputs, outputs, ($super == null ? true : $super instanceof ProblogSolverFactory) ? $super : THROW_CCE());
@@ -707,17 +720,17 @@
     DefaultBuiltins_instance = this;
     ExtensionLibrary.call(this, DefaultBuiltins_getInstance());
   }
-  protoOf(DefaultBuiltins).w2i = function () {
-    return ProblogLib_getInstance().w2i();
+  protoOf(DefaultBuiltins).e2j = function () {
+    return ProblogLib_getInstance().e2j();
   };
-  protoOf(DefaultBuiltins).h2j = function () {
-    return ProblogLib_getInstance().h2j();
+  protoOf(DefaultBuiltins).p2j = function () {
+    return ProblogLib_getInstance().p2j();
   };
-  protoOf(DefaultBuiltins).j2j = function () {
-    return ProblogLib_getInstance().j2j();
+  protoOf(DefaultBuiltins).r2j = function () {
+    return ProblogLib_getInstance().r2j();
   };
-  protoOf(DefaultBuiltins).i2j = function () {
-    return ProblogLib_getInstance().i2j();
+  protoOf(DefaultBuiltins).q2j = function () {
+    return ProblogLib_getInstance().q2j();
   };
   var DefaultBuiltins_instance;
   function DefaultBuiltins_getInstance_0() {
@@ -729,10 +742,10 @@
     MinimalBuiltins_instance = this;
     ExtensionLibrary.call(this, ProblogLib_getInstance());
   }
-  protoOf(MinimalBuiltins).j2j = function () {
+  protoOf(MinimalBuiltins).r2j = function () {
     return listOf(EnsureExecutable_getInstance());
   };
-  protoOf(MinimalBuiltins).i2j = function () {
+  protoOf(MinimalBuiltins).q2j = function () {
     return listOf(Call_getInstance());
   };
   var MinimalBuiltins_instance;
@@ -744,17 +757,17 @@
   function ProblogLib() {
     ProblogLib_instance = this;
     ExtensionLibrary.call(this, Companion_getInstance_3().of('problog.lang'));
-    this.o3m_1 = 'EXPL';
-    this.p3m_1 = 'evidence';
-    this.q3m_1 = 'prob';
+    this.v3m_1 = 'EXPL';
+    this.w3m_1 = 'evidence';
+    this.x3m_1 = 'prob';
   }
-  protoOf(ProblogLib).h2j = function () {
+  protoOf(ProblogLib).p2j = function () {
     return get_PROBLOG_SPECIFIC_OPERATORS();
   };
-  protoOf(ProblogLib).i2j = function () {
+  protoOf(ProblogLib).q2j = function () {
     return listOf(Prob_getInstance());
   };
-  protoOf(ProblogLib).j2j = function () {
+  protoOf(ProblogLib).r2j = function () {
     return listOf_0([ProbHelper_getInstance(), ProbSolve_getInstance(), ProbExplAnd_getInstance(), ProbQuery_getInstance(), ProbSolveEvidence_getInstance(), ProbSolveWithEvidence_getInstance(), ProbNegationAsFailure_getInstance(), ProbSetConfig_getInstance()]);
   };
   var ProblogLib_instance;
@@ -767,11 +780,11 @@
     cause = cause === VOID ? null : cause;
     TuPrologException_init_$Init$(cause, this);
     captureStack(this, ClauseMappingException);
-    this.x3m_1 = message;
+    this.e3n_1 = message;
     delete this.message;
   }
   protoOf(ClauseMappingException).p1 = function () {
-    return this.x3m_1;
+    return this.e3n_1;
   };
   function Companion() {
   }
@@ -807,11 +820,11 @@
   }
   function Companion_0() {
     Companion_instance_9 = this;
-    this.y3m_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_13().b3n_1);
-    this.z3m_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_13().c3n_1);
+    this.f3n_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(false), Companion_getInstance_13().i3n_1);
+    this.g3n_1 = new BinaryDecisionDiagramExplanation(bddTerminalOf(true), Companion_getInstance_13().j3n_1);
   }
-  protoOf(Companion_0).d3n = function (term) {
-    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.g3n_1));
+  protoOf(Companion_0).k3n = function (term) {
+    return new BinaryDecisionDiagramExplanation(bddOf(term), new ComputedValue(term.n3n_1));
   };
   var Companion_instance_9;
   function Companion_getInstance_11() {
@@ -822,348 +835,348 @@
   function ProbExplanation() {
   }
   function ProbExplanationTerm$freshCopy$lambda(it) {
-    return it.bx();
+    return it.ax();
   }
   function ProbExplanationTerm$freshCopy$lambda_0($scope) {
     return function (it) {
-      return it.cx($scope);
+      return it.bx($scope);
     };
   }
   function ProbExplanationTerm$apply$lambda($substitution) {
     return function (it) {
-      return it.r17($substitution);
+      return it.q17($substitution);
     };
   }
   function ProbExplanationTerm(explanation) {
-    this.v3l_1 = Companion_getInstance_4().of('<expl:' + explanation.toString() + '>');
-    this.w3l_1 = explanation;
+    this.c3m_1 = Companion_getInstance_4().of('<expl:' + explanation.toString() + '>');
+    this.d3m_1 = explanation;
   }
-  protoOf(ProbExplanationTerm).xx = function () {
+  protoOf(ProbExplanationTerm).wx = function () {
     return false;
   };
-  protoOf(ProbExplanationTerm).by = function () {
+  protoOf(ProbExplanationTerm).ay = function () {
     return this;
   };
   protoOf(ProbExplanationTerm).asConstant = function () {
-    return this.by();
+    return this.ay();
   };
-  protoOf(ProbExplanationTerm).bx = function () {
-    return new ProbExplanationTerm(this.w3l_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
+  protoOf(ProbExplanationTerm).ax = function () {
+    return new ProbExplanationTerm(this.d3m_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda));
   };
   protoOf(ProbExplanationTerm).freshCopy = function () {
-    return this.bx();
+    return this.ax();
   };
-  protoOf(ProbExplanationTerm).cx = function (scope) {
-    return new ProbExplanationTerm(this.w3l_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
+  protoOf(ProbExplanationTerm).bx = function (scope) {
+    return new ProbExplanationTerm(this.d3m_1.applyTransformation(ProbExplanationTerm$freshCopy$lambda_0(scope)));
   };
   protoOf(ProbExplanationTerm).freshCopyFromScope = function (scope) {
-    return this.cx(scope);
+    return this.bx(scope);
   };
-  protoOf(ProbExplanationTerm).f2u = function (substitution, substitutions) {
-    return this.g2u(substitution, substitutions.slice());
+  protoOf(ProbExplanationTerm).p2u = function (substitution, substitutions) {
+    return this.q2u(substitution, substitutions.slice());
   };
   protoOf(ProbExplanationTerm).getSubstituted = function (substitution, substitutions) {
-    return this.f2u(substitution, substitutions);
+    return this.p2u(substitution, substitutions);
   };
-  protoOf(ProbExplanationTerm).g2u = function (substitution, substitutions) {
-    return this.r17(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
+  protoOf(ProbExplanationTerm).q2u = function (substitution, substitutions) {
+    return this.q17(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
   };
   protoOf(ProbExplanationTerm).apply = function (substitution, substitutions) {
-    return this.g2u(substitution, substitutions);
+    return this.q2u(substitution, substitutions);
   };
-  protoOf(ProbExplanationTerm).r17 = function (substitution) {
+  protoOf(ProbExplanationTerm).q17 = function (substitution) {
     var tmp;
-    if (substitution.i() || this.cy()) {
+    if (substitution.i() || this.by()) {
       tmp = this;
     } else {
-      tmp = new ProbExplanationTerm(this.w3l_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
+      tmp = new ProbExplanationTerm(this.d3m_1.applyTransformation(ProbExplanationTerm$apply$lambda(substitution)));
     }
     return tmp;
   };
   protoOf(ProbExplanationTerm).applySubstitution = function (substitution) {
-    return this.r17(substitution);
+    return this.q17(substitution);
   };
-  protoOf(ProbExplanationTerm).cy = function () {
-    return !this.w3l_1.n3n();
+  protoOf(ProbExplanationTerm).by = function () {
+    return !this.d3m_1.u3n();
   };
-  protoOf(ProbExplanationTerm).dx = function () {
-    return this.v3l_1.dx();
+  protoOf(ProbExplanationTerm).cx = function () {
+    return this.c3m_1.cx();
   };
   protoOf(ProbExplanationTerm).asAtom = function () {
-    return this.dx();
+    return this.cx();
+  };
+  protoOf(ProbExplanationTerm).rw = function () {
+    return this.c3m_1.rw();
   };
   protoOf(ProbExplanationTerm).sw = function () {
-    return this.v3l_1.sw();
+    return this.c3m_1.sw();
   };
   protoOf(ProbExplanationTerm).tw = function () {
-    return this.v3l_1.tw();
+    return this.c3m_1.tw();
   };
   protoOf(ProbExplanationTerm).uw = function () {
-    return this.v3l_1.uw();
+    return this.c3m_1.uw();
   };
   protoOf(ProbExplanationTerm).vw = function () {
-    return this.v3l_1.vw();
-  };
-  protoOf(ProbExplanationTerm).ww = function () {
-    return this.v3l_1.ww();
+    return this.c3m_1.vw();
   };
   protoOf(ProbExplanationTerm).f1 = function () {
-    return this.v3l_1.f1();
+    return this.c3m_1.f1();
   };
-  protoOf(ProbExplanationTerm).zw = function () {
-    return this.v3l_1.zw();
+  protoOf(ProbExplanationTerm).yw = function () {
+    return this.c3m_1.yw();
   };
-  protoOf(ProbExplanationTerm).ax = function () {
-    return this.v3l_1.ax();
+  protoOf(ProbExplanationTerm).zw = function () {
+    return this.c3m_1.zw();
   };
-  protoOf(ProbExplanationTerm).ox = function () {
-    return this.v3l_1.ox();
+  protoOf(ProbExplanationTerm).nx = function () {
+    return this.c3m_1.nx();
   };
   protoOf(ProbExplanationTerm).asStruct = function () {
-    return this.ox();
+    return this.nx();
   };
   protoOf(ProbExplanationTerm).append = function (argument) {
-    return this.v3l_1.append(argument);
+    return this.c3m_1.append(argument);
   };
   protoOf(ProbExplanationTerm).addLast = function (argument) {
-    return this.v3l_1.addLast(argument);
+    return this.c3m_1.addLast(argument);
   };
   protoOf(ProbExplanationTerm).addFirst = function (argument) {
-    return this.v3l_1.addFirst(argument);
+    return this.c3m_1.addFirst(argument);
   };
   protoOf(ProbExplanationTerm).insertAt = function (index, argument) {
-    return this.v3l_1.insertAt(index, argument);
+    return this.c3m_1.insertAt(index, argument);
   };
   protoOf(ProbExplanationTerm).setFunctor = function (functor) {
-    return this.v3l_1.setFunctor(functor);
+    return this.c3m_1.setFunctor(functor);
   };
   protoOf(ProbExplanationTerm).getArgAt = function (index) {
-    return this.v3l_1.getArgAt(index);
+    return this.c3m_1.getArgAt(index);
   };
   protoOf(ProbExplanationTerm).setArgs = function (args) {
-    return this.v3l_1.setArgs(args);
+    return this.c3m_1.setArgs(args);
   };
   protoOf(ProbExplanationTerm).setArgsIterable = function (args) {
-    return this.v3l_1.setArgsIterable(args);
+    return this.c3m_1.setArgsIterable(args);
   };
   protoOf(ProbExplanationTerm).setArgsSequence = function (args) {
-    return this.v3l_1.setArgsSequence(args);
+    return this.c3m_1.setArgsSequence(args);
   };
   protoOf(ProbExplanationTerm).get = function (index) {
-    return this.v3l_1.get(index);
+    return this.c3m_1.get(index);
+  };
+  protoOf(ProbExplanationTerm).dx = function () {
+    return this.c3m_1.dx();
   };
   protoOf(ProbExplanationTerm).ex = function () {
-    return this.v3l_1.ex();
+    return this.c3m_1.ex();
   };
   protoOf(ProbExplanationTerm).fx = function () {
-    return this.v3l_1.fx();
+    return this.c3m_1.fx();
   };
-  protoOf(ProbExplanationTerm).gx = function () {
-    return this.v3l_1.gx();
+  protoOf(ProbExplanationTerm).ix = function () {
+    return this.c3m_1.ix();
   };
   protoOf(ProbExplanationTerm).jx = function () {
-    return this.v3l_1.jx();
+    return this.c3m_1.jx();
   };
   protoOf(ProbExplanationTerm).kx = function () {
-    return this.v3l_1.kx();
+    return this.c3m_1.kx();
   };
-  protoOf(ProbExplanationTerm).lx = function () {
-    return this.v3l_1.lx();
+  protoOf(ProbExplanationTerm).mx = function () {
+    return this.c3m_1.mx();
   };
-  protoOf(ProbExplanationTerm).nx = function () {
-    return this.v3l_1.nx();
+  protoOf(ProbExplanationTerm).xw = function () {
+    return this.c3m_1.xw();
   };
-  protoOf(ProbExplanationTerm).yw = function () {
-    return this.v3l_1.yw();
+  protoOf(ProbExplanationTerm).ox = function () {
+    return this.c3m_1.ox();
   };
   protoOf(ProbExplanationTerm).px = function () {
-    return this.v3l_1.px();
+    return this.c3m_1.px();
   };
   protoOf(ProbExplanationTerm).qx = function () {
-    return this.v3l_1.qx();
+    return this.c3m_1.qx();
   };
   protoOf(ProbExplanationTerm).rx = function () {
-    return this.v3l_1.rx();
+    return this.c3m_1.rx();
   };
-  protoOf(ProbExplanationTerm).sx = function () {
-    return this.v3l_1.sx();
+  protoOf(ProbExplanationTerm).mr = function () {
+    return this.rx();
   };
-  protoOf(ProbExplanationTerm).pr = function () {
-    return this.sx();
-  };
-  protoOf(ProbExplanationTerm).tx = function (other) {
-    return this.v3l_1.tx(other);
+  protoOf(ProbExplanationTerm).sx = function (other) {
+    return this.c3m_1.sx(other);
   };
   protoOf(ProbExplanationTerm).d = function (other) {
-    return this.tx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
+    return this.sx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(ProbExplanationTerm).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.v3l_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.c3m_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(ProbExplanationTerm).equals = function (other) {
-    return this.v3l_1.equals(other);
+    return this.c3m_1.equals(other);
   };
   protoOf(ProbExplanationTerm).structurallyEquals = function (other) {
-    return this.v3l_1.structurallyEquals(other);
+    return this.c3m_1.structurallyEquals(other);
   };
   protoOf(ProbExplanationTerm).accept = function (visitor) {
-    return this.v3l_1.accept(visitor);
+    return this.c3m_1.accept(visitor);
   };
   protoOf(ProbExplanationTerm).castToAtom = function () {
-    return this.v3l_1.castToAtom();
+    return this.c3m_1.castToAtom();
   };
   protoOf(ProbExplanationTerm).castToClause = function () {
-    return this.v3l_1.castToClause();
+    return this.c3m_1.castToClause();
   };
   protoOf(ProbExplanationTerm).castToCons = function () {
-    return this.v3l_1.castToCons();
+    return this.c3m_1.castToCons();
   };
   protoOf(ProbExplanationTerm).castToConstant = function () {
-    return this.v3l_1.castToConstant();
+    return this.c3m_1.castToConstant();
   };
   protoOf(ProbExplanationTerm).castToDirective = function () {
-    return this.v3l_1.castToDirective();
+    return this.c3m_1.castToDirective();
   };
   protoOf(ProbExplanationTerm).castToEmptyList = function () {
-    return this.v3l_1.castToEmptyList();
+    return this.c3m_1.castToEmptyList();
   };
   protoOf(ProbExplanationTerm).castToEmptyBlock = function () {
-    return this.v3l_1.castToEmptyBlock();
+    return this.c3m_1.castToEmptyBlock();
   };
   protoOf(ProbExplanationTerm).castToFact = function () {
-    return this.v3l_1.castToFact();
+    return this.c3m_1.castToFact();
   };
   protoOf(ProbExplanationTerm).castToIndicator = function () {
-    return this.v3l_1.castToIndicator();
+    return this.c3m_1.castToIndicator();
   };
   protoOf(ProbExplanationTerm).castToInteger = function () {
-    return this.v3l_1.castToInteger();
+    return this.c3m_1.castToInteger();
   };
   protoOf(ProbExplanationTerm).castToList = function () {
-    return this.v3l_1.castToList();
+    return this.c3m_1.castToList();
   };
   protoOf(ProbExplanationTerm).castToNumeric = function () {
-    return this.v3l_1.castToNumeric();
+    return this.c3m_1.castToNumeric();
   };
   protoOf(ProbExplanationTerm).castToReal = function () {
-    return this.v3l_1.castToReal();
+    return this.c3m_1.castToReal();
   };
   protoOf(ProbExplanationTerm).castToRule = function () {
-    return this.v3l_1.castToRule();
+    return this.c3m_1.castToRule();
   };
   protoOf(ProbExplanationTerm).castToBlock = function () {
-    return this.v3l_1.castToBlock();
+    return this.c3m_1.castToBlock();
   };
   protoOf(ProbExplanationTerm).castToStruct = function () {
-    return this.v3l_1.castToStruct();
+    return this.c3m_1.castToStruct();
   };
   protoOf(ProbExplanationTerm).castToRecursive = function () {
-    return this.v3l_1.castToRecursive();
+    return this.c3m_1.castToRecursive();
   };
   protoOf(ProbExplanationTerm).castToTerm = function () {
-    return this.v3l_1.castToTerm();
+    return this.c3m_1.castToTerm();
   };
   protoOf(ProbExplanationTerm).castToTruth = function () {
-    return this.v3l_1.castToTruth();
+    return this.c3m_1.castToTruth();
   };
   protoOf(ProbExplanationTerm).castToTuple = function () {
-    return this.v3l_1.castToTuple();
+    return this.c3m_1.castToTuple();
   };
   protoOf(ProbExplanationTerm).castToVar = function () {
-    return this.v3l_1.castToVar();
+    return this.c3m_1.castToVar();
   };
   protoOf(ProbExplanationTerm).asClause = function () {
-    return this.v3l_1.asClause();
+    return this.c3m_1.asClause();
   };
   protoOf(ProbExplanationTerm).asCons = function () {
-    return this.v3l_1.asCons();
+    return this.c3m_1.asCons();
   };
   protoOf(ProbExplanationTerm).asDirective = function () {
-    return this.v3l_1.asDirective();
+    return this.c3m_1.asDirective();
   };
   protoOf(ProbExplanationTerm).asEmptyList = function () {
-    return this.v3l_1.asEmptyList();
+    return this.c3m_1.asEmptyList();
   };
   protoOf(ProbExplanationTerm).asEmptyBlock = function () {
-    return this.v3l_1.asEmptyBlock();
+    return this.c3m_1.asEmptyBlock();
   };
   protoOf(ProbExplanationTerm).asFact = function () {
-    return this.v3l_1.asFact();
+    return this.c3m_1.asFact();
   };
   protoOf(ProbExplanationTerm).asIndicator = function () {
-    return this.v3l_1.asIndicator();
+    return this.c3m_1.asIndicator();
   };
   protoOf(ProbExplanationTerm).asInteger = function () {
-    return this.v3l_1.asInteger();
+    return this.c3m_1.asInteger();
   };
   protoOf(ProbExplanationTerm).asList = function () {
-    return this.v3l_1.asList();
+    return this.c3m_1.asList();
   };
   protoOf(ProbExplanationTerm).asNumeric = function () {
-    return this.v3l_1.asNumeric();
+    return this.c3m_1.asNumeric();
   };
   protoOf(ProbExplanationTerm).asReal = function () {
-    return this.v3l_1.asReal();
+    return this.c3m_1.asReal();
   };
   protoOf(ProbExplanationTerm).asRule = function () {
-    return this.v3l_1.asRule();
+    return this.c3m_1.asRule();
   };
   protoOf(ProbExplanationTerm).asBlock = function () {
-    return this.v3l_1.asBlock();
+    return this.c3m_1.asBlock();
   };
   protoOf(ProbExplanationTerm).asRecursive = function () {
-    return this.v3l_1.asRecursive();
+    return this.c3m_1.asRecursive();
   };
   protoOf(ProbExplanationTerm).asTerm = function () {
-    return this.v3l_1.asTerm();
+    return this.c3m_1.asTerm();
   };
   protoOf(ProbExplanationTerm).asTruth = function () {
-    return this.v3l_1.asTruth();
+    return this.c3m_1.asTruth();
   };
   protoOf(ProbExplanationTerm).asTuple = function () {
-    return this.v3l_1.asTuple();
+    return this.c3m_1.asTuple();
   };
   protoOf(ProbExplanationTerm).asVar = function () {
-    return this.v3l_1.asVar();
+    return this.c3m_1.asVar();
   };
   protoOf(ProbExplanationTerm).hashCode = function () {
-    return this.v3l_1.hashCode();
+    return this.c3m_1.hashCode();
   };
   protoOf(ProbExplanationTerm).toString = function () {
-    return this.v3l_1.toString();
+    return this.c3m_1.toString();
+  };
+  protoOf(ProbExplanationTerm).tx = function () {
+    return this.c3m_1.tx();
   };
   protoOf(ProbExplanationTerm).ux = function () {
-    return this.v3l_1.ux();
+    return this.c3m_1.ux();
   };
   protoOf(ProbExplanationTerm).vx = function () {
-    return this.v3l_1.vx();
+    return this.c3m_1.vx();
   };
-  protoOf(ProbExplanationTerm).wx = function () {
-    return this.v3l_1.wx();
+  protoOf(ProbExplanationTerm).xx = function () {
+    return this.c3m_1.xx();
   };
   protoOf(ProbExplanationTerm).yx = function () {
-    return this.v3l_1.yx();
+    return this.c3m_1.yx();
   };
   protoOf(ProbExplanationTerm).zx = function () {
-    return this.v3l_1.zx();
-  };
-  protoOf(ProbExplanationTerm).ay = function () {
-    return this.v3l_1.ay();
+    return this.c3m_1.zx();
   };
   protoOf(ProbExplanationTerm).getTag = function (name) {
-    return this.v3l_1.getTag(name);
+    return this.c3m_1.getTag(name);
   };
   protoOf(ProbExplanationTerm).resetTags = function (tags) {
-    return this.v3l_1.resetTags(tags);
+    return this.c3m_1.resetTags(tags);
   };
   protoOf(ProbExplanationTerm).containsTag = function (name) {
-    return this.v3l_1.containsTag(name);
+    return this.c3m_1.containsTag(name);
   };
-  protoOf(ProbExplanationTerm).du = function () {
-    return this.v3l_1.du();
+  protoOf(ProbExplanationTerm).cu = function () {
+    return this.c3m_1.cu();
   };
   function _get_cachedHashCode__d7x0zy($this) {
-    var tmp0 = $this.k3n_1;
+    var tmp0 = $this.r3n_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('cachedHashCode', 1, tmp, ProbTerm$_get_cachedHashCode_$ref_1qdqtc(), null);
@@ -1172,8 +1185,8 @@
   function ProbTerm$isGround$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (this$0.h3n_1.cy()) {
-        var tmp0 = this$0.i3n_1;
+      if (this$0.o3n_1.by()) {
+        var tmp0 = this$0.p3n_1;
         var tmp$ret$0;
         $l$block_0: {
           // Inline function 'kotlin.collections.any' call
@@ -1190,7 +1203,7 @@
           var _iterator__ex2g4s = tmp0.n();
           while (_iterator__ex2g4s.q()) {
             var element = _iterator__ex2g4s.r();
-            if (element.ux()) {
+            if (element.tx()) {
               tmp$ret$0 = true;
               break $l$block_0;
             }
@@ -1206,39 +1219,39 @@
   }
   function ProbTerm$_get_isGround_$ref_ue0rck() {
     return constructCallableReference(function (p0) {
-      return p0.cy();
-    }, 1, 0, 92);
+      return p0.by();
+    }, 1, 0, 93);
   }
   function ProbTerm$cachedHashCode$delegate$lambda(this$0) {
     return function () {
-      var result = getBigIntHashCode(this$0.f3n_1);
-      result = imul(31, result) + getNumberHashCode(this$0.g3n_1) | 0;
-      result = imul(31, result) + this$0.h3n_1.hashCode() | 0;
-      result = imul(31, result) + hashCode(this$0.i3n_1) | 0;
+      var result = getBigIntHashCode(this$0.m3n_1);
+      result = imul(31, result) + getNumberHashCode(this$0.n3n_1) | 0;
+      result = imul(31, result) + this$0.o3n_1.hashCode() | 0;
+      result = imul(31, result) + hashCode(this$0.p3n_1) | 0;
       return result;
     };
   }
   function ProbTerm$_get_cachedHashCode_$ref_1qdqtc() {
     return constructCallableReference(function (p0) {
       return _get_cachedHashCode__d7x0zy(p0);
-    }, 1, 0, 93);
+    }, 1, 0, 94);
   }
   function ProbTerm(id, probability, term, extraVariables) {
     extraVariables = extraVariables === VOID ? emptySet() : extraVariables;
-    this.e3n_1 = Companion_getInstance_1().of('::', [Companion_getInstance_6().ofDouble(probability), term]);
-    this.f3n_1 = id;
-    this.g3n_1 = probability;
-    this.h3n_1 = term;
-    this.i3n_1 = extraVariables;
+    this.l3n_1 = Companion_getInstance_1().of('::', [Companion_getInstance_6().ofDouble(probability), term]);
+    this.m3n_1 = id;
+    this.n3n_1 = probability;
+    this.o3n_1 = term;
+    this.p3n_1 = extraVariables;
     var tmp = this;
-    tmp.j3n_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
+    tmp.q3n_1 = lazy(ProbTerm$isGround$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.k3n_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
+    tmp_0.r3n_1 = lazy(ProbTerm$cachedHashCode$delegate$lambda(this));
   }
-  protoOf(ProbTerm).bx = function () {
-    var termCopy = this.h3n_1.freshCopy();
+  protoOf(ProbTerm).ax = function () {
+    var termCopy = this.o3n_1.freshCopy();
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.i3n_1;
+    var this_0 = this.p3n_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.n();
@@ -1247,15 +1260,15 @@
       var tmp$ret$2 = item.freshCopy();
       destination.l(tmp$ret$2);
     }
-    return new ProbTerm(this.f3n_1, this.g3n_1, termCopy, toSet(destination));
+    return new ProbTerm(this.m3n_1, this.n3n_1, termCopy, toSet(destination));
   };
   protoOf(ProbTerm).freshCopy = function () {
-    return this.bx();
+    return this.ax();
   };
-  protoOf(ProbTerm).cx = function (scope) {
-    var termCopy = this.h3n_1.freshCopyFromScope(scope);
+  protoOf(ProbTerm).bx = function (scope) {
+    var termCopy = this.o3n_1.freshCopyFromScope(scope);
     // Inline function 'kotlin.collections.map' call
-    var this_0 = this.i3n_1;
+    var this_0 = this.p3n_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.n();
@@ -1264,30 +1277,30 @@
       var tmp$ret$2 = item.freshCopyFromScope(scope);
       destination.l(tmp$ret$2);
     }
-    return new ProbTerm(this.f3n_1, this.g3n_1, termCopy, toSet(destination));
+    return new ProbTerm(this.m3n_1, this.n3n_1, termCopy, toSet(destination));
   };
   protoOf(ProbTerm).freshCopyFromScope = function (scope) {
-    return this.cx(scope);
+    return this.bx(scope);
   };
-  protoOf(ProbTerm).f2u = function (substitution, substitutions) {
-    return this.g2u(substitution, substitutions.slice());
+  protoOf(ProbTerm).p2u = function (substitution, substitutions) {
+    return this.q2u(substitution, substitutions.slice());
   };
   protoOf(ProbTerm).getSubstituted = function (substitution, substitutions) {
-    return this.f2u(substitution, substitutions);
+    return this.p2u(substitution, substitutions);
   };
-  protoOf(ProbTerm).g2u = function (substitution, substitutions) {
-    return this.r17(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
+  protoOf(ProbTerm).q2u = function (substitution, substitutions) {
+    return this.q17(Companion_getInstance_5().ofSubstitution(substitution, substitutions.slice()));
   };
   protoOf(ProbTerm).apply = function (substitution, substitutions) {
-    return this.g2u(substitution, substitutions);
+    return this.q2u(substitution, substitutions);
   };
-  protoOf(ProbTerm).r17 = function (substitution) {
+  protoOf(ProbTerm).q17 = function (substitution) {
     var tmp;
-    if (substitution.i() || this.cy()) {
+    if (substitution.i() || this.by()) {
       tmp = this;
     } else {
       var tmp_0;
-      var tmp0 = this.i3n_1;
+      var tmp0 = this.p3n_1;
       var tmp$ret$0;
       $l$block_0: {
         // Inline function 'kotlin.collections.any' call
@@ -1304,7 +1317,7 @@
         var _iterator__ex2g4s = tmp0.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          if (element.ux()) {
+          if (element.tx()) {
             tmp$ret$0 = true;
             break $l$block_0;
           }
@@ -1312,10 +1325,10 @@
         tmp$ret$0 = false;
       }
       if (!tmp$ret$0) {
-        tmp_0 = this.i3n_1;
+        tmp_0 = this.p3n_1;
       } else {
         // Inline function 'kotlin.collections.mapNotNull' call
-        var tmp0_0 = this.i3n_1;
+        var tmp0_0 = this.p3n_1;
         // Inline function 'kotlin.collections.mapNotNullTo' call
         var destination = ArrayList_init_$Create$_0();
         // Inline function 'kotlin.collections.forEach' call
@@ -1333,43 +1346,43 @@
         tmp_0 = toSet(destination);
       }
       var newExtraVars = tmp_0;
-      tmp = new ProbTerm(this.f3n_1, this.g3n_1, this.h3n_1.applySubstitution(substitution), newExtraVars);
+      tmp = new ProbTerm(this.m3n_1, this.n3n_1, this.o3n_1.applySubstitution(substitution), newExtraVars);
     }
     return tmp;
   };
   protoOf(ProbTerm).applySubstitution = function (substitution) {
-    return this.r17(substitution);
+    return this.q17(substitution);
   };
-  protoOf(ProbTerm).cy = function () {
-    var tmp0 = this.j3n_1;
+  protoOf(ProbTerm).by = function () {
+    var tmp0 = this.q3n_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('isGround', 1, tmp, ProbTerm$_get_isGround_$ref_ue0rck(), null);
     return tmp0.f1();
   };
-  protoOf(ProbTerm).tx = function (other) {
+  protoOf(ProbTerm).sx = function (other) {
     if (!(other instanceof ProbTerm)) {
       return compareTo.call(this, other);
     }
-    var res = compareTo_0(this.f3n_1, other.f3n_1);
+    var res = compareTo_0(this.m3n_1, other.m3n_1);
     if (!(res === 0))
       return res;
-    res = this.h3n_1.tx(other.h3n_1);
+    res = this.o3n_1.sx(other.o3n_1);
     if (!(res === 0))
       return res;
-    res = equals(this.i3n_1, other.i3n_1) ? 0 : -1;
+    res = equals(this.p3n_1, other.p3n_1) ? 0 : -1;
     if (!(res === 0))
       return res;
-    res = compareTo_0(this.g3n_1, other.g3n_1);
+    res = compareTo_0(this.n3n_1, other.n3n_1);
     return res;
   };
   protoOf(ProbTerm).d = function (other) {
-    return this.tx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
+    return this.sx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(ProbTerm).equals = function (other) {
     var tmp;
     if (other instanceof ProbTerm) {
-      tmp = this.tx(other) === 0;
+      tmp = this.sx(other) === 0;
     } else {
       tmp = false;
     }
@@ -1379,214 +1392,214 @@
     return _get_cachedHashCode__d7x0zy(this);
   };
   protoOf(ProbTerm).toString = function () {
-    return '' + round(this.g3n_1 * 100) / 100.0 + '::' + this.h3n_1.toString();
+    return '' + round(this.n3n_1 * 100) / 100.0 + '::' + this.o3n_1.toString();
   };
-  protoOf(ProbTerm).sx = function () {
-    return this.e3n_1.sx();
+  protoOf(ProbTerm).rx = function () {
+    return this.l3n_1.rx();
   };
-  protoOf(ProbTerm).pr = function () {
-    return this.sx();
+  protoOf(ProbTerm).mr = function () {
+    return this.rx();
   };
   protoOf(ProbTerm).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.e3n_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.l3n_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(ProbTerm).structurallyEquals = function (other) {
-    return this.e3n_1.structurallyEquals(other);
+    return this.l3n_1.structurallyEquals(other);
   };
   protoOf(ProbTerm).accept = function (visitor) {
-    return this.e3n_1.accept(visitor);
+    return this.l3n_1.accept(visitor);
   };
   protoOf(ProbTerm).castToAtom = function () {
-    return this.e3n_1.castToAtom();
+    return this.l3n_1.castToAtom();
   };
   protoOf(ProbTerm).castToClause = function () {
-    return this.e3n_1.castToClause();
+    return this.l3n_1.castToClause();
   };
   protoOf(ProbTerm).castToCons = function () {
-    return this.e3n_1.castToCons();
+    return this.l3n_1.castToCons();
   };
   protoOf(ProbTerm).castToConstant = function () {
-    return this.e3n_1.castToConstant();
+    return this.l3n_1.castToConstant();
   };
   protoOf(ProbTerm).castToDirective = function () {
-    return this.e3n_1.castToDirective();
+    return this.l3n_1.castToDirective();
   };
   protoOf(ProbTerm).castToEmptyList = function () {
-    return this.e3n_1.castToEmptyList();
+    return this.l3n_1.castToEmptyList();
   };
   protoOf(ProbTerm).castToEmptyBlock = function () {
-    return this.e3n_1.castToEmptyBlock();
+    return this.l3n_1.castToEmptyBlock();
   };
   protoOf(ProbTerm).castToFact = function () {
-    return this.e3n_1.castToFact();
+    return this.l3n_1.castToFact();
   };
   protoOf(ProbTerm).castToIndicator = function () {
-    return this.e3n_1.castToIndicator();
+    return this.l3n_1.castToIndicator();
   };
   protoOf(ProbTerm).castToInteger = function () {
-    return this.e3n_1.castToInteger();
+    return this.l3n_1.castToInteger();
   };
   protoOf(ProbTerm).castToList = function () {
-    return this.e3n_1.castToList();
+    return this.l3n_1.castToList();
   };
   protoOf(ProbTerm).castToNumeric = function () {
-    return this.e3n_1.castToNumeric();
+    return this.l3n_1.castToNumeric();
   };
   protoOf(ProbTerm).castToReal = function () {
-    return this.e3n_1.castToReal();
+    return this.l3n_1.castToReal();
   };
   protoOf(ProbTerm).castToRule = function () {
-    return this.e3n_1.castToRule();
+    return this.l3n_1.castToRule();
   };
   protoOf(ProbTerm).castToBlock = function () {
-    return this.e3n_1.castToBlock();
+    return this.l3n_1.castToBlock();
   };
   protoOf(ProbTerm).castToStruct = function () {
-    return this.e3n_1.castToStruct();
+    return this.l3n_1.castToStruct();
   };
   protoOf(ProbTerm).castToRecursive = function () {
-    return this.e3n_1.castToRecursive();
+    return this.l3n_1.castToRecursive();
   };
   protoOf(ProbTerm).castToTerm = function () {
-    return this.e3n_1.castToTerm();
+    return this.l3n_1.castToTerm();
   };
   protoOf(ProbTerm).castToTruth = function () {
-    return this.e3n_1.castToTruth();
+    return this.l3n_1.castToTruth();
   };
   protoOf(ProbTerm).castToTuple = function () {
-    return this.e3n_1.castToTuple();
+    return this.l3n_1.castToTuple();
   };
   protoOf(ProbTerm).castToVar = function () {
-    return this.e3n_1.castToVar();
+    return this.l3n_1.castToVar();
   };
   protoOf(ProbTerm).asAtom = function () {
-    return this.e3n_1.asAtom();
+    return this.l3n_1.asAtom();
   };
   protoOf(ProbTerm).asClause = function () {
-    return this.e3n_1.asClause();
+    return this.l3n_1.asClause();
   };
   protoOf(ProbTerm).asCons = function () {
-    return this.e3n_1.asCons();
+    return this.l3n_1.asCons();
   };
   protoOf(ProbTerm).asConstant = function () {
-    return this.e3n_1.asConstant();
+    return this.l3n_1.asConstant();
   };
   protoOf(ProbTerm).asDirective = function () {
-    return this.e3n_1.asDirective();
+    return this.l3n_1.asDirective();
   };
   protoOf(ProbTerm).asEmptyList = function () {
-    return this.e3n_1.asEmptyList();
+    return this.l3n_1.asEmptyList();
   };
   protoOf(ProbTerm).asEmptyBlock = function () {
-    return this.e3n_1.asEmptyBlock();
+    return this.l3n_1.asEmptyBlock();
   };
   protoOf(ProbTerm).asFact = function () {
-    return this.e3n_1.asFact();
+    return this.l3n_1.asFact();
   };
   protoOf(ProbTerm).asIndicator = function () {
-    return this.e3n_1.asIndicator();
+    return this.l3n_1.asIndicator();
   };
   protoOf(ProbTerm).asInteger = function () {
-    return this.e3n_1.asInteger();
+    return this.l3n_1.asInteger();
   };
   protoOf(ProbTerm).asList = function () {
-    return this.e3n_1.asList();
+    return this.l3n_1.asList();
   };
   protoOf(ProbTerm).asNumeric = function () {
-    return this.e3n_1.asNumeric();
+    return this.l3n_1.asNumeric();
   };
   protoOf(ProbTerm).asReal = function () {
-    return this.e3n_1.asReal();
+    return this.l3n_1.asReal();
   };
   protoOf(ProbTerm).asRule = function () {
-    return this.e3n_1.asRule();
+    return this.l3n_1.asRule();
   };
   protoOf(ProbTerm).asBlock = function () {
-    return this.e3n_1.asBlock();
+    return this.l3n_1.asBlock();
   };
   protoOf(ProbTerm).asStruct = function () {
-    return this.e3n_1.ox();
+    return this.l3n_1.nx();
   };
   protoOf(ProbTerm).asRecursive = function () {
-    return this.e3n_1.asRecursive();
+    return this.l3n_1.asRecursive();
   };
   protoOf(ProbTerm).asTerm = function () {
-    return this.e3n_1.asTerm();
+    return this.l3n_1.asTerm();
   };
   protoOf(ProbTerm).asTruth = function () {
-    return this.e3n_1.asTruth();
+    return this.l3n_1.asTruth();
   };
   protoOf(ProbTerm).asTuple = function () {
-    return this.e3n_1.asTuple();
+    return this.l3n_1.asTuple();
   };
   protoOf(ProbTerm).asVar = function () {
-    return this.e3n_1.asVar();
+    return this.l3n_1.asVar();
   };
-  protoOf(ProbTerm).ux = function () {
-    return this.e3n_1.ux();
+  protoOf(ProbTerm).tx = function () {
+    return this.l3n_1.tx();
   };
-  protoOf(ProbTerm).ex = function () {
-    return this.e3n_1.ex();
+  protoOf(ProbTerm).dx = function () {
+    return this.l3n_1.dx();
+  };
+  protoOf(ProbTerm).ux = function () {
+    return this.l3n_1.ux();
   };
   protoOf(ProbTerm).vx = function () {
-    return this.e3n_1.vx();
+    return this.l3n_1.vx();
   };
-  protoOf(ProbTerm).wx = function () {
-    return this.e3n_1.wx();
+  protoOf(ProbTerm).sw = function () {
+    return this.l3n_1.sw();
   };
-  protoOf(ProbTerm).tw = function () {
-    return this.e3n_1.tw();
+  protoOf(ProbTerm).wx = function () {
+    return this.l3n_1.wx();
   };
   protoOf(ProbTerm).xx = function () {
-    return this.e3n_1.xx();
+    return this.l3n_1.xx();
   };
   protoOf(ProbTerm).yx = function () {
-    return this.e3n_1.yx();
+    return this.l3n_1.yx();
   };
   protoOf(ProbTerm).zx = function () {
-    return this.e3n_1.zx();
+    return this.l3n_1.zx();
   };
-  protoOf(ProbTerm).ay = function () {
-    return this.e3n_1.ay();
+  protoOf(ProbTerm).jx = function () {
+    return this.l3n_1.jx();
   };
-  protoOf(ProbTerm).kx = function () {
-    return this.e3n_1.kx();
+  protoOf(ProbTerm).ix = function () {
+    return this.l3n_1.ix();
   };
-  protoOf(ProbTerm).jx = function () {
-    return this.e3n_1.jx();
+  protoOf(ProbTerm).tw = function () {
+    return this.l3n_1.tw();
   };
-  protoOf(ProbTerm).uw = function () {
-    return this.e3n_1.uw();
+  protoOf(ProbTerm).ex = function () {
+    return this.l3n_1.ex();
   };
-  protoOf(ProbTerm).fx = function () {
-    return this.e3n_1.fx();
+  protoOf(ProbTerm).kx = function () {
+    return this.l3n_1.kx();
   };
-  protoOf(ProbTerm).lx = function () {
-    return this.e3n_1.lx();
+  protoOf(ProbTerm).uw = function () {
+    return this.l3n_1.uw();
   };
   protoOf(ProbTerm).vw = function () {
-    return this.e3n_1.vw();
-  };
-  protoOf(ProbTerm).ww = function () {
-    return this.e3n_1.ww();
+    return this.l3n_1.vw();
   };
-  protoOf(ProbTerm).nx = function () {
-    return this.e3n_1.nx();
+  protoOf(ProbTerm).mx = function () {
+    return this.l3n_1.mx();
   };
   protoOf(ProbTerm).getTag = function (name) {
-    return this.e3n_1.getTag(name);
+    return this.l3n_1.getTag(name);
   };
   protoOf(ProbTerm).resetTags = function (tags) {
-    return this.e3n_1.resetTags(tags);
+    return this.l3n_1.resetTags(tags);
   };
   protoOf(ProbTerm).containsTag = function (name) {
-    return this.e3n_1.containsTag(name);
+    return this.l3n_1.containsTag(name);
   };
-  protoOf(ProbTerm).du = function () {
-    return this.e3n_1.du();
+  protoOf(ProbTerm).cu = function () {
+    return this.l3n_1.cu();
   };
-  protoOf(ProbTerm).ax = function () {
-    return this.e3n_1.ax();
+  protoOf(ProbTerm).zw = function () {
+    return this.l3n_1.zw();
   };
   function Companion_1() {
   }
@@ -1631,25 +1644,25 @@
   function collectAllHeads($this, head, accumulator) {
     var tmp;
     if (isInterface(head, Struct)) {
-      tmp = head.sw() === 2;
+      tmp = head.rw() === 2;
     } else {
       tmp = false;
     }
     if (tmp) {
-      if (!(head.yw() === ';') && !(head.yw() === '::')) {
+      if (!(head.xw() === ';') && !(head.xw() === '::')) {
         throw TuPrologException_init_$Create$('Badly formatted disjoint annotation: ' + head.toString());
       }
-      if (head.yw() === ';') {
+      if (head.xw() === ';') {
         collectAllHeads($this, head.get(1), accumulator);
       }
     }
     var curHeadProb = 1.0;
     var curHead = head;
     if (isInterface(head, Struct)) {
-      curHead = head.yw() === ';' ? head.get(0) : head;
+      curHead = head.xw() === ';' ? head.get(0) : head;
       var tmp_0;
       if (isInterface(curHead, Struct)) {
-        tmp_0 = curHead.yw() === '::';
+        tmp_0 = curHead.xw() === '::';
       } else {
         tmp_0 = false;
       }
@@ -1657,7 +1670,7 @@
         var curHeadProbTerm = curHead.get(0);
         var tmp_1;
         if (isInterface(curHeadProbTerm, Numeric)) {
-          tmp_1 = curHeadProbTerm.o11().toDouble();
+          tmp_1 = curHeadProbTerm.n11().toDouble();
         } else {
           tmp_1 = solveArithmeticExpression(curHeadProbTerm);
         }
@@ -1669,23 +1682,23 @@
   }
   function AnnotatedDisjunctionClauseMapper() {
   }
-  protoOf(AnnotatedDisjunctionClauseMapper).o3n = function (clause) {
+  protoOf(AnnotatedDisjunctionClauseMapper).v3n = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
-      tmp = clause.ez().yw() === ';';
+      tmp = clause.dz().xw() === ';';
     } else {
       tmp = false;
     }
     return tmp;
   };
-  protoOf(AnnotatedDisjunctionClauseMapper).p3n = function (clause) {
+  protoOf(AnnotatedDisjunctionClauseMapper).w3n = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause.toString());
     }
-    var body = clause.fz();
+    var body = clause.ez();
     // Inline function 'kotlin.collections.mutableListOf' call
     var disjointHeads = ArrayList_init_$Create$_0();
-    collectAllHeads(this, clause.ez(), disjointHeads);
+    collectAllHeads(this, clause.dz(), disjointHeads);
     var probSum = 0.0;
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
@@ -1694,7 +1707,7 @@
     while (_iterator__ex2g4s.q()) {
       var item = _iterator__ex2g4s.r();
       var tmp = item.get(0);
-      var curProb = (isInterface(tmp, Numeric) ? tmp : THROW_CCE()).o11().toDouble();
+      var curProb = (isInterface(tmp, Numeric) ? tmp : THROW_CCE()).n11().toDouble();
       var tmp_0;
       var tmp_1 = item.get(1);
       if (isInterface(tmp_1, Struct)) {
@@ -1705,21 +1718,21 @@
       }
       var curRuleHead = tmp_0;
       probSum = probSum + curProb;
-      var tmp$ret$3 = ProbabilisticClauseMapper_instance.q3n(Companion_instance_3.of(Companion_getInstance_1().of('::', [Companion_getInstance_6().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
+      var tmp$ret$3 = ProbabilisticClauseMapper_instance.x3n(Companion_instance_3.of(Companion_getInstance_1().of('::', [Companion_getInstance_6().ofDouble(curProb / (1.0 - (probSum - curProb))), curRuleHead]), [body]));
       destination.l(tmp$ret$3);
     }
-    var mappedRules = toList_0(destination);
-    var explanation = Companion_getInstance_11().z3m_1;
+    var mappedRules = toList(destination);
+    var explanation = Companion_getInstance_11().g3n_1;
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(mappedRules, 10));
     var _iterator__ex2g4s_0 = mappedRules.n();
     while (_iterator__ex2g4s_0.q()) {
       var item_0 = _iterator__ex2g4s_0.r();
-      var thisExplanation = Companion_getInstance_11().d3n(item_0.second);
+      var thisExplanation = Companion_getInstance_11().k3n(item_0.second);
       var resultExplanation = thisExplanation.and(explanation);
       explanation = explanation.and(thisExplanation.not());
-      var tmp$ret$6 = ProbabilisticClauseMapper_instance.r3n(item_0.first, resultExplanation);
+      var tmp$ret$6 = ProbabilisticClauseMapper_instance.y3n(item_0.first, resultExplanation);
       destination_0.l(tmp$ret$6);
     }
     return destination_0;
@@ -1729,28 +1742,28 @@
     return AnnotatedDisjunctionClauseMapper_instance;
   }
   function ComputedValue(probability) {
-    this.s3n_1 = probability;
+    this.z3n_1 = probability;
   }
   protoOf(ComputedValue).toString = function () {
-    return 'ComputedValue(probability=' + this.s3n_1 + ')';
+    return 'ComputedValue(probability=' + this.z3n_1 + ')';
   };
   protoOf(ComputedValue).hashCode = function () {
-    return this.s3n_1 == null ? 0 : getNumberHashCode(this.s3n_1);
+    return this.z3n_1 == null ? 0 : getNumberHashCode(this.z3n_1);
   };
   protoOf(ComputedValue).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof ComputedValue))
       return false;
-    if (!equals(this.s3n_1, other.s3n_1))
+    if (!equals(this.z3n_1, other.z3n_1))
       return false;
     return true;
   };
   function Companion_2() {
     Companion_instance_11 = this;
-    this.a3n_1 = new ComputedValue(null);
-    this.b3n_1 = new ComputedValue(0.0);
-    this.c3n_1 = new ComputedValue(1.0);
+    this.h3n_1 = new ComputedValue(null);
+    this.i3n_1 = new ComputedValue(0.0);
+    this.j3n_1 = new ComputedValue(1.0);
   }
   var Companion_instance_11;
   function Companion_getInstance_13() {
@@ -1766,15 +1779,15 @@
   }
   function computeExpansion($this, value, low, high) {
     var tmp;
-    if (!(low.s3n_1 == null) && !(high.s3n_1 == null)) {
-      tmp = value.g3n_1 * high.s3n_1 + (1.0 - value.g3n_1) * low.s3n_1;
+    if (!(low.z3n_1 == null) && !(high.z3n_1 == null)) {
+      tmp = value.n3n_1 * high.z3n_1 + (1.0 - value.n3n_1) * low.z3n_1;
     } else {
       tmp = null;
     }
     return new ComputedValue(tmp);
   }
   function _get_cachedNot__l38068($this) {
-    var tmp0 = $this.z3l_1;
+    var tmp0 = $this.g3m_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('cachedNot', 1, tmp, BinaryDecisionDiagramExplanation$_get_cachedNot_$ref_q3r5qq(), null);
@@ -1787,16 +1800,16 @@
   }
   function BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this$0) {
     return function () {
-      var tmp = Companion_getInstance_13().b3n_1;
-      var tmp_0 = Companion_getInstance_13().c3n_1;
-      var result = notThenExpansion(this$0.x3l_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
+      var tmp = Companion_getInstance_13().i3n_1;
+      var tmp_0 = Companion_getInstance_13().j3n_1;
+      var result = notThenExpansion(this$0.e3m_1, tmp, tmp_0, BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda$lambda(this$0));
       return new BinaryDecisionDiagramExplanation(result.first, result.second);
     };
   }
   function BinaryDecisionDiagramExplanation$_get_cachedNot_$ref_q3r5qq() {
     return constructCallableReference(function (p0) {
       return _get_cachedNot__l38068(p0);
-    }, 1, 0, 94);
+    }, 1, 0, 95);
   }
   function BinaryDecisionDiagramExplanation$and$lambda(this$0) {
     return function (node, low, high) {
@@ -1809,14 +1822,14 @@
     };
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda(node, low, high) {
-    return node.g3n_1 * high + (1.0 - node.g3n_1) * low;
+    return node.n3n_1 * high + (1.0 - node.n3n_1) * low;
   }
   function BinaryDecisionDiagramExplanation$probability$delegate$lambda(this$0) {
     return function () {
-      var tmp0_elvis_lhs = this$0.y3l_1.s3n_1;
+      var tmp0_elvis_lhs = this$0.f3m_1.z3n_1;
       var tmp;
       if (tmp0_elvis_lhs == null) {
-        tmp = expansion(this$0.x3l_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
+        tmp = expansion(this$0.e3m_1, 0.0, 1.0, BinaryDecisionDiagramExplanation$probability$delegate$lambda$lambda);
       } else {
         tmp = tmp0_elvis_lhs;
       }
@@ -1825,21 +1838,21 @@
   }
   function BinaryDecisionDiagramExplanation$_get_probability_$ref_gzzr62() {
     return constructCallableReference(function (p0) {
-      return p0.l3n();
-    }, 1, 0, 95);
+      return p0.s3n();
+    }, 1, 0, 96);
   }
   function BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda(it) {
-    return !it.cy();
+    return !it.by();
   }
   function BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this$0) {
     return function () {
-      return anyWhere(this$0.x3l_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
+      return anyWhere(this$0.e3m_1, BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda$lambda);
     };
   }
   function BinaryDecisionDiagramExplanation$_get_containsAnyNotGroundTerm_$ref_82xwv2() {
     return constructCallableReference(function (p0) {
-      return p0.n3n();
-    }, 1, 0, 96);
+      return p0.u3n();
+    }, 1, 0, 97);
   }
   function BinaryDecisionDiagramExplanation$apply$lambda($transformation) {
     return function (it) {
@@ -1848,93 +1861,98 @@
   }
   function BinaryDecisionDiagramExplanation(diagram, computedValue) {
     Companion_getInstance_13();
-    computedValue = computedValue === VOID ? Companion_getInstance_13().a3n_1 : computedValue;
-    this.x3l_1 = diagram;
-    this.y3l_1 = computedValue;
+    computedValue = computedValue === VOID ? Companion_getInstance_13().h3n_1 : computedValue;
+    this.e3m_1 = diagram;
+    this.f3m_1 = computedValue;
     var tmp = this;
-    tmp.z3l_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
+    tmp.g3m_1 = lazy(BinaryDecisionDiagramExplanation$cachedNot$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.a3m_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
+    tmp_0.h3m_1 = lazy(BinaryDecisionDiagramExplanation$probability$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.b3m_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
+    tmp_1.i3m_1 = lazy(BinaryDecisionDiagramExplanation$containsAnyNotGroundTerm$delegate$lambda(this));
   }
-  protoOf(BinaryDecisionDiagramExplanation).t3n = function () {
+  protoOf(BinaryDecisionDiagramExplanation).a3o = function () {
     return _get_cachedNot__l38068(this);
   };
   protoOf(BinaryDecisionDiagramExplanation).not = function () {
-    return this.t3n();
+    return this.a3o();
   };
-  protoOf(BinaryDecisionDiagramExplanation).u3n = function (that) {
-    var tmp = getAsInternal(this, that).x3l_1;
-    var tmp_0 = Companion_getInstance_13().b3n_1;
-    var tmp_1 = Companion_getInstance_13().c3n_1;
-    var result = andThenExpansion(this.x3l_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
+  protoOf(BinaryDecisionDiagramExplanation).b3o = function (that) {
+    var tmp = getAsInternal(this, that).e3m_1;
+    var tmp_0 = Companion_getInstance_13().i3n_1;
+    var tmp_1 = Companion_getInstance_13().j3n_1;
+    var result = andThenExpansion(this.e3m_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$and$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.first, result.second);
   };
   protoOf(BinaryDecisionDiagramExplanation).and = function (that) {
-    return this.u3n(that);
+    return this.b3o(that);
   };
-  protoOf(BinaryDecisionDiagramExplanation).v3n = function (that) {
-    var tmp = getAsInternal(this, that).x3l_1;
-    var tmp_0 = Companion_getInstance_13().b3n_1;
-    var tmp_1 = Companion_getInstance_13().c3n_1;
-    var result = orThenExpansion(this.x3l_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
+  protoOf(BinaryDecisionDiagramExplanation).c3o = function (that) {
+    var tmp = getAsInternal(this, that).e3m_1;
+    var tmp_0 = Companion_getInstance_13().i3n_1;
+    var tmp_1 = Companion_getInstance_13().j3n_1;
+    var result = orThenExpansion(this.e3m_1, tmp, tmp_0, tmp_1, BinaryDecisionDiagramExplanation$or$lambda(this));
     return new BinaryDecisionDiagramExplanation(result.first, result.second);
   };
   protoOf(BinaryDecisionDiagramExplanation).or = function (that) {
-    return this.v3n(that);
+    return this.c3o(that);
   };
-  protoOf(BinaryDecisionDiagramExplanation).l3n = function () {
-    var tmp0 = this.a3m_1;
+  protoOf(BinaryDecisionDiagramExplanation).s3n = function () {
+    var tmp0 = this.h3m_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('probability', 1, tmp, BinaryDecisionDiagramExplanation$_get_probability_$ref_gzzr62(), null);
     return tmp0.f1();
   };
-  protoOf(BinaryDecisionDiagramExplanation).n3n = function () {
-    var tmp0 = this.b3m_1;
+  protoOf(BinaryDecisionDiagramExplanation).u3n = function () {
+    var tmp0 = this.i3m_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('containsAnyNotGroundTerm', 1, tmp, BinaryDecisionDiagramExplanation$_get_containsAnyNotGroundTerm_$ref_82xwv2(), null);
     return tmp0.f1();
   };
   protoOf(BinaryDecisionDiagramExplanation).toString = function () {
-    return 'bdd:' + hashCode(this.x3l_1);
+    return 'bdd:' + hashCode(this.e3m_1);
   };
-  protoOf(BinaryDecisionDiagramExplanation).w3n = function (transformation) {
-    return new BinaryDecisionDiagramExplanation(map_0(this.x3l_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation)));
+  protoOf(BinaryDecisionDiagramExplanation).d3o = function (transformation) {
+    return new BinaryDecisionDiagramExplanation(map_0(this.e3m_1, BinaryDecisionDiagramExplanation$apply$lambda(transformation)));
   };
   protoOf(BinaryDecisionDiagramExplanation).applyTransformation = function (transformation) {
-    return this.w3n(transformation);
+    return this.d3o(transformation);
   };
   function get_nonWrappableFunctors() {
     _init_properties_ClauseMappingUtils_kt__go80e();
     return nonWrappableFunctors;
   }
   var nonWrappableFunctors;
+  function get_arithmeticOperators() {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return arithmeticOperators;
+  }
+  var arithmeticOperators;
   function ClauseMappingUtils() {
     ClauseMappingUtils_instance = this;
-    this.x3n_1 = 1n;
-    this.y3n_1 = listOf_0([DirectiveClauseMapper_instance, AnnotatedDisjunctionClauseMapper_instance, ProbabilisticClauseMapper_instance, EvidenceClauseMapper_instance, PrologClauseMapper_instance, NothingClauseMapper_instance]);
+    this.e3o_1 = 1n;
+    this.f3o_1 = listOf_0([DirectiveClauseMapper_instance, AnnotatedDisjunctionClauseMapper_instance, ProbabilisticClauseMapper_instance, EvidenceClauseMapper_instance, PrologClauseMapper_instance, NothingClauseMapper_instance]);
   }
-  protoOf(ClauseMappingUtils).z3n = function () {
-    var _unary__edvuaz = this.x3n_1;
-    this.x3n_1 = add(_unary__edvuaz, get_ONE());
+  protoOf(ClauseMappingUtils).g3o = function () {
+    var _unary__edvuaz = this.e3o_1;
+    this.e3o_1 = add(_unary__edvuaz, get_ONE());
     return _unary__edvuaz;
   };
-  protoOf(ClauseMappingUtils).a3o = function (clause) {
+  protoOf(ClauseMappingUtils).h3o = function (clause) {
     var tmp;
     if (get_isMappedAsProblog(clause)) {
       tmp = listOf(clause);
     } else {
-      var tmp0 = this.y3n_1;
+      var tmp0 = this.f3o_1;
       var tmp$ret$0;
       $l$block: {
         // Inline function 'kotlin.collections.first' call
         var _iterator__ex2g4s = tmp0.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          if (element.o3n(clause)) {
+          if (element.v3n(clause)) {
             tmp$ret$0 = element;
             break $l$block;
           }
@@ -1942,7 +1960,7 @@
         throw NoSuchElementException_init_$Create$('Collection contains no element matching the predicate.');
       }
       // Inline function 'kotlin.collections.map' call
-      var this_0 = tmp$ret$0.p3n(clause);
+      var this_0 = tmp$ret$0.w3n(clause);
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
       var _iterator__ex2g4s_0 = this_0.n();
@@ -1955,13 +1973,13 @@
     }
     return tmp;
   };
-  protoOf(ClauseMappingUtils).b3o = function (indicator) {
-    var arityTerm = indicator.f11();
+  protoOf(ClauseMappingUtils).i3o = function (indicator) {
+    var arityTerm = indicator.e11();
     var tmp = Companion_instance_4;
-    var tmp_0 = indicator.e11();
+    var tmp_0 = indicator.d11();
     var tmp_1;
     if (isInterface(arityTerm, Numeric)) {
-      tmp_1 = Companion_getInstance_6().ofInteger(arityTerm.g11().toInt() + 1 | 0);
+      tmp_1 = Companion_getInstance_6().ofInteger(arityTerm.f11().toInt() + 1 | 0);
     } else {
       tmp_1 = arityTerm;
     }
@@ -1973,6 +1991,10 @@
       new ClauseMappingUtils();
     return ClauseMappingUtils_instance;
   }
+  function anyMappedClause(_this__u8e3s4) {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return setMappedAsProblog(Companion_instance_3.of(withExplanation(_this__u8e3s4, Companion_getInstance_0().anonymous()), [Companion_getInstance_0().anonymous()]), true);
+  }
   function toTerm(_this__u8e3s4) {
     _init_properties_ClauseMappingUtils_kt__go80e();
     return new ProbExplanationTerm(_this__u8e3s4);
@@ -2001,7 +2023,7 @@
     } else {
       var tmp_0;
       if (isInterface(_this__u8e3s4, Struct)) {
-        tmp_0 = Companion_getInstance_1().ofList(_this__u8e3s4.yw(), plus(_this__u8e3s4.zw(), explanation));
+        tmp_0 = Companion_getInstance_1().ofList(_this__u8e3s4.xw(), plus(_this__u8e3s4.yw(), explanation));
       } else {
         tmp_0 = Companion_getInstance_1().of(_this__u8e3s4.toString(), [explanation]);
       }
@@ -2024,7 +2046,7 @@
     var tmp;
     if (isInterface(_this__u8e3s4, Struct)) {
       var tmp_0;
-      switch (_this__u8e3s4.yw()) {
+      switch (_this__u8e3s4.xw()) {
         case ',':
           var leftVar = Companion_getInstance_0().of('EXPL_A_' + depth);
           var rightVar = Companion_getInstance_0().of('EXPL_B_' + depth);
@@ -2055,11 +2077,11 @@
   }
   function get_isWrappableWithExplanation(_this__u8e3s4) {
     _init_properties_ClauseMappingUtils_kt__go80e();
-    return !get_nonWrappableFunctors().y(safeToStruct(_this__u8e3s4).yw());
+    return !get_nonWrappableFunctors().y(safeToStruct(_this__u8e3s4).xw());
   }
   function withExplanationNonWrappable(_this__u8e3s4, explanation) {
     _init_properties_ClauseMappingUtils_kt__go80e();
-    return Companion_instance_0.of(_this__u8e3s4, Companion_getInstance_1().of('=', [explanation, toTerm(Companion_getInstance_11().z3m_1)]));
+    return Companion_instance_0.of(_this__u8e3s4, Companion_getInstance_1().of('=', [explanation, toTerm(Companion_getInstance_11().g3n_1)]));
   }
   function wrapInPredicate(_this__u8e3s4, functor, explanation) {
     _init_properties_ClauseMappingUtils_kt__go80e();
@@ -2073,41 +2095,59 @@
   }
   function solveArithmeticExpression(_this__u8e3s4) {
     _init_properties_ClauseMappingUtils_kt__go80e();
-    var tmp0 = _this__u8e3s4.toString();
-    // Inline function 'kotlin.text.toRegex' call
-    // Inline function 'kotlin.text.replace' call
-    var termStr = Regex_init_$Create$('\\s').ub(tmp0, '');
-    var tmp0_elvis_lhs = Regex_init_$Create$('([0-9.]+)(/)([0-9.]+).*').pb(termStr);
     var tmp;
-    if (tmp0_elvis_lhs == null) {
-      throw TuPrologException_init_$Create$('Unsupported probability notation in annotated disjunction: ' + termStr);
+    if (isInterface(_this__u8e3s4, Numeric)) {
+      tmp = _this__u8e3s4.n11().toDouble();
     } else {
-      tmp = tmp0_elvis_lhs;
-    }
-    var regexMatch = tmp;
-    var _destruct__k2r9zo = regexMatch.oc();
-    // Inline function 'kotlin.text.Destructured.component1' call
-    var dividendStr = _destruct__k2r9zo.qj_1.nc().x(1);
-    // Inline function 'kotlin.text.Destructured.component3' call
-    var divisorStr = _destruct__k2r9zo.qj_1.nc().x(3);
-    var dividend = toDoubleOrNull(dividendStr);
-    var divisor = toDoubleOrNull(divisorStr);
-    if (dividend == null || divisor == null) {
-      throw TuPrologException_init_$Create$('Unable to parse arithmetic division expression: ' + termStr);
+      var tmp_0;
+      var tmp_1;
+      if (isInterface(_this__u8e3s4, Struct)) {
+        tmp_1 = _this__u8e3s4.rw() === 2;
+      } else {
+        tmp_1 = false;
+      }
+      if (tmp_1) {
+        var tmp0 = get_arithmeticOperators();
+        // Inline function 'kotlin.collections.contains' call
+        // Inline function 'kotlin.collections.containsKey' call
+        var key = _this__u8e3s4.xw();
+        tmp_0 = (isInterface(tmp0, KtMap) ? tmp0 : THROW_CCE()).h2(key);
+      } else {
+        tmp_0 = false;
+      }
+      if (tmp_0) {
+        // Inline function 'kotlin.collections.map' call
+        var this_0 = _this__u8e3s4.yw();
+        // Inline function 'kotlin.collections.mapTo' call
+        var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+        var _iterator__ex2g4s = this_0.n();
+        while (_iterator__ex2g4s.q()) {
+          var item = _iterator__ex2g4s.r();
+          var tmp$ret$4 = solveArithmeticExpression(item);
+          destination.l(tmp$ret$4);
+        }
+        // Inline function 'kotlin.collections.component1' call
+        var left = destination.t(0);
+        // Inline function 'kotlin.collections.component2' call
+        var right = destination.t(1);
+        tmp = getValue(get_arithmeticOperators(), _this__u8e3s4.xw())(left, right);
+      } else {
+        throw TuPrologException_init_$Create$('Unsupported probability notation: ' + _this__u8e3s4.toString());
+      }
     }
-    return dividend / divisor;
+    return tmp;
   }
   function withoutAnonymousVars(_this__u8e3s4) {
     _init_properties_ClauseMappingUtils_kt__go80e();
     var tmp = Companion_getInstance_5();
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = plus_0(toSet_0(_this__u8e3s4.ez().ax()), toSet_0(_this__u8e3s4.fz().ax()));
+    var tmp0 = plus_0(toSet_0(_this__u8e3s4.dz().zw()), toSet_0(_this__u8e3s4.ez().zw()));
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s = tmp0.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      if (element.v15()) {
+      if (element.u15()) {
         destination.l(element);
       }
     }
@@ -2127,44 +2167,64 @@
     var anonVarSubstitution = tmp.ofIterable(destination_0);
     var tmp_0;
     if (isInterface(_this__u8e3s4, Fact)) {
-      tmp_0 = Companion_instance.of(safeToStruct(_this__u8e3s4.ez().applySubstitution(anonVarSubstitution)));
+      tmp_0 = Companion_instance.of(safeToStruct(_this__u8e3s4.dz().applySubstitution(anonVarSubstitution)));
     } else {
-      tmp_0 = Companion_instance_3.of(safeToStruct(_this__u8e3s4.ez().applySubstitution(anonVarSubstitution)), [safeToStruct(_this__u8e3s4.fz().applySubstitution(anonVarSubstitution))]);
+      tmp_0 = Companion_instance_3.of(safeToStruct(_this__u8e3s4.dz().applySubstitution(anonVarSubstitution)), [safeToStruct(_this__u8e3s4.ez().applySubstitution(anonVarSubstitution))]);
     }
     return tmp_0;
   }
   function get_extraVariables(_this__u8e3s4) {
     _init_properties_ClauseMappingUtils_kt__go80e();
     var tmp;
-    if (!_this__u8e3s4.cy()) {
-      var headVars = toSet_0(_this__u8e3s4.ez().ax());
-      var bodyVars = toSet_0(_this__u8e3s4.fz().ax());
+    if (!_this__u8e3s4.by()) {
+      var headVars = toSet_0(_this__u8e3s4.dz().zw());
+      var bodyVars = toSet_0(_this__u8e3s4.ez().zw());
       tmp = subtract(bodyVars, headVars);
     } else {
       tmp = emptySet();
     }
     return tmp;
   }
+  function arithmeticOperators$lambda(a, b) {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return a + b;
+  }
+  function arithmeticOperators$lambda_0(a, b) {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return a - b;
+  }
+  function arithmeticOperators$lambda_1(a, b) {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return a * b;
+  }
+  function arithmeticOperators$lambda_2(a, b) {
+    _init_properties_ClauseMappingUtils_kt__go80e();
+    return a / b;
+  }
   var properties_initialized_ClauseMappingUtils_kt_tzf6ek;
   function _init_properties_ClauseMappingUtils_kt__go80e() {
     if (!properties_initialized_ClauseMappingUtils_kt_tzf6ek) {
       properties_initialized_ClauseMappingUtils_kt_tzf6ek = true;
       nonWrappableFunctors = setOf(['!', 'true', 'false']);
+      var tmp = to('+', arithmeticOperators$lambda);
+      var tmp_0 = to('-', arithmeticOperators$lambda_0);
+      var tmp_1 = to('*', arithmeticOperators$lambda_1);
+      arithmeticOperators = mapOf([tmp, tmp_0, tmp_1, to('/', arithmeticOperators$lambda_2)]);
     }
   }
   function DirectiveClauseMapper() {
   }
-  protoOf(DirectiveClauseMapper).o3n = function (clause) {
-    return clause.hx();
+  protoOf(DirectiveClauseMapper).v3n = function (clause) {
+    return clause.gx();
   };
-  protoOf(DirectiveClauseMapper).p3n = function (clause) {
-    var body = clause.fz();
+  protoOf(DirectiveClauseMapper).w3n = function (clause) {
+    var body = clause.ez();
     if (!isInterface(clause, Directive)) {
       throw new ClauseMappingException('Clause is not an instance of Directive: ' + clause.toString());
     }
     var tmp;
     if (isInterface(body, Struct)) {
-      tmp = body.yw() === 'static' || body.yw() === 'dynamic';
+      tmp = body.xw() === 'static' || body.xw() === 'dynamic';
     } else {
       tmp = false;
     }
@@ -2173,21 +2233,21 @@
       if (!isInterface(indicatorTerm, Indicator)) {
         throw new ClauseMappingException('Malformed directive: ' + clause.toString());
       }
-      var name = indicatorTerm.e11();
-      var arity = indicatorTerm.f11();
+      var name = indicatorTerm.d11();
+      var arity = indicatorTerm.e11();
       if (!isInterface(arity, Numeric)) {
         throw new ClauseMappingException('Malformed directive: ' + clause.toString());
       }
-      return listOf(Companion_instance_5.of(Companion_getInstance_1().of(body.yw(), [Companion_instance_4.of(name, Companion_getInstance_6().ofInteger(arity.o11().toInt() + 1 | 0))]), []));
+      return listOf(Companion_instance_5.of(Companion_getInstance_1().of(body.xw(), [Companion_instance_4.of(name, Companion_getInstance_6().ofInteger(arity.n11().toInt() + 1 | 0))]), []));
     }
     var tmp_0;
     if (isInterface(body, Struct)) {
-      tmp_0 = body.yw() === 'initialization' || body.yw() === 'solve';
+      tmp_0 = body.xw() === 'initialization' || body.xw() === 'solve';
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      return listOf(Companion_instance_5.of(Companion_getInstance_1().of(body.yw(), [withBodyExplanation(body.get(0), Companion_getInstance_0().anonymous())]), []));
+      return listOf(Companion_instance_5.of(Companion_getInstance_1().of(body.xw(), [withBodyExplanation(body.get(0), Companion_getInstance_0().anonymous())]), []));
     }
     return listOf(clause);
   };
@@ -2197,42 +2257,42 @@
   }
   function EvidenceClauseMapper() {
   }
-  protoOf(EvidenceClauseMapper).o3n = function (clause) {
+  protoOf(EvidenceClauseMapper).v3n = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
-      tmp = clause.ez().yw() === 'evidence';
+      tmp = clause.dz().xw() === 'evidence';
     } else {
       tmp = false;
     }
     return tmp;
   };
-  protoOf(EvidenceClauseMapper).p3n = function (clause) {
+  protoOf(EvidenceClauseMapper).w3n = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause.toString());
     }
-    if (clause.ez().sw() > 2) {
-      throw TuPrologException_init_$Create$('Invalid evidence predicate: ' + clause.ez().toString());
+    if (clause.dz().rw() > 2) {
+      throw TuPrologException_init_$Create$('Invalid evidence predicate: ' + clause.dz().toString());
     } else {
       var tmp;
-      if (clause.ez().sw() === 2) {
-        var tmp_0 = clause.ez().get(1);
+      if (clause.dz().rw() === 2) {
+        var tmp_0 = clause.dz().get(1);
         tmp = !isInterface(tmp_0, Truth);
       } else {
         tmp = false;
       }
       if (tmp) {
-        throw TuPrologException_init_$Create$('Invalid evidence predicate: ' + clause.ez().toString());
+        throw TuPrologException_init_$Create$('Invalid evidence predicate: ' + clause.dz().toString());
       }
     }
-    var headTerm = clause.ez();
-    if (headTerm.sw() === 1) {
-      headTerm = Companion_getInstance_1().of(headTerm.yw(), [headTerm.get(0), Companion_getInstance_7().pw_1]);
+    var headTerm = clause.dz();
+    if (headTerm.rw() === 1) {
+      headTerm = Companion_getInstance_1().of(headTerm.xw(), [headTerm.get(0), Companion_getInstance_7().ow_1]);
     }
     var tmp_1;
     if (isInterface(clause, Fact)) {
       tmp_1 = Companion_instance.of(headTerm);
     } else {
-      tmp_1 = Companion_instance_3.of(headTerm, [withBodyExplanation(clause.fz(), Companion_getInstance_0().anonymous())]);
+      tmp_1 = Companion_instance_3.of(headTerm, [withBodyExplanation(clause.ez(), Companion_getInstance_0().anonymous())]);
     }
     return listOf(tmp_1);
   };
@@ -2255,7 +2315,7 @@
         var _iterator__ex2g4s = clauses.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          var list = ClauseMappingUtils_getInstance().a3o(element);
+          var list = ClauseMappingUtils_getInstance().h3o(element);
           addAll(destination, list);
         }
         tmp_1 = destination;
@@ -2266,10 +2326,10 @@
       tmp = theory;
     }
     theory = tmp;
-    this.c3o_1 = theory;
+    this.j3o_1 = theory;
   }
   protoOf(MappedMutableProblogTheory).l1v = function () {
-    return false;
+    return true;
   };
   protoOf(MappedMutableProblogTheory).y1v = function () {
     return Companion_instance_8.ofIterable(this.v1n(), this);
@@ -2278,20 +2338,20 @@
     return this.y1v();
   };
   protoOf(MappedMutableProblogTheory).l1u = function () {
-    return this;
+    return new MappedProblogTheory(null, this.v1n(), this.j3o_1.toImmutableTheory());
   };
   protoOf(MappedMutableProblogTheory).toImmutableTheory = function () {
     return this.l1u();
   };
-  protoOf(MappedMutableProblogTheory).d3o = function (theory) {
-    return new MappedMutableProblogTheory(null, this.v1n(), this.c3o_1.y1u(theory));
+  protoOf(MappedMutableProblogTheory).k3o = function (theory) {
+    return new MappedMutableProblogTheory(null, this.v1n(), this.j3o_1.y1u(theory));
   };
   protoOf(MappedMutableProblogTheory).y1u = function (theory) {
     var tmp;
     if (isInterface(theory, ProblogTheory)) {
-      tmp = this.d3o(theory);
+      tmp = this.k3o(theory);
     } else {
-      tmp = this.d3o(new MappedMutableProblogTheory(theory, this.v1n()));
+      tmp = this.k3o(new MappedMutableProblogTheory(theory, this.v1n()));
     }
     return tmp;
   };
@@ -2299,8 +2359,8 @@
     return this.y1u(theory);
   };
   protoOf(MappedMutableProblogTheory).m1u = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().a3o(clause);
-    return new MappedMutableProblogTheory(null, this.v1n(), this.c3o_1.y1u(Companion_instance_7.indexedOfIterable(this.v1n(), mapped)));
+    var mapped = ClauseMappingUtils_getInstance().h3o(clause);
+    return new MappedMutableProblogTheory(null, this.v1n(), this.j3o_1.y1u(Companion_instance_7.indexedOfIterable(this.v1n(), mapped)));
   };
   protoOf(MappedMutableProblogTheory).plus = function (clause) {
     return this.m1u(clause);
@@ -2312,11 +2372,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedMutableProblogTheory(null, this.v1n(), this.c3o_1.c1v(mapped));
+    return new MappedMutableProblogTheory(null, this.v1n(), this.j3o_1.c1v(mapped));
   };
   protoOf(MappedMutableProblogTheory).assertAIterable = function (clauses) {
     return this.c1v(clauses);
@@ -2328,11 +2388,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedMutableProblogTheory(null, this.v1n(), this.c3o_1.f1v(mapped));
+    return new MappedMutableProblogTheory(null, this.v1n(), this.j3o_1.f1v(mapped));
   };
   protoOf(MappedMutableProblogTheory).assertZIterable = function (clauses) {
     return this.f1v(clauses);
@@ -2344,11 +2404,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    var result = this.c3o_1.j1v(mapped);
+    var result = this.j3o_1.j1v(mapped);
     var tmp;
     if (result instanceof Success) {
       tmp = new Success(new MappedMutableProblogTheory(null, this.v1n(), result.e1w_1), result.f1w_1);
@@ -2361,7 +2421,7 @@
     return this.j1v(clauses);
   };
   protoOf(MappedMutableProblogTheory).n1o = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().a3o(clause);
+    var mappedClauses = ClauseMappingUtils_getInstance().h3o(clause);
     var result = null;
     var _iterator__ex2g4s = mappedClauses.n();
     while (_iterator__ex2g4s.q()) {
@@ -2373,7 +2433,7 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.c3o_1.n1o(c);
+        result = this.j3o_1.n1o(c);
       }
     }
     var tmp0_subject = result;
@@ -2393,7 +2453,7 @@
     return this.n1o(clause);
   };
   protoOf(MappedMutableProblogTheory).r1u = function (indicator) {
-    return new MappedMutableProblogTheory(null, this.v1n(), this.c3o_1.r1u(ClauseMappingUtils_getInstance().b3o(indicator)));
+    return new MappedMutableProblogTheory(null, this.v1n(), this.j3o_1.r1u(ClauseMappingUtils_getInstance().i3o(indicator)));
   };
   protoOf(MappedMutableProblogTheory).abolish = function (indicator) {
     return this.r1u(indicator);
@@ -2435,7 +2495,7 @@
     return this.g1v(clauses);
   };
   protoOf(MappedMutableProblogTheory).c1w = function (head) {
-    return this.b1w(Companion_instance_3.of(head, [Companion_getInstance_0().anonymous()]));
+    return this.b1w(anyMappedClause(head));
   };
   protoOf(MappedMutableProblogTheory).retractByHead = function (head) {
     return this.c1w(head);
@@ -2453,82 +2513,82 @@
     return this.i1v(clauses);
   };
   protoOf(MappedMutableProblogTheory).d1w = function (head) {
-    return this.n1o(Companion_instance_3.of(head, [Companion_getInstance_0().anonymous()]));
+    return this.n1o(anyMappedClause(head));
   };
   protoOf(MappedMutableProblogTheory).retractAllByHead = function (head) {
     return this.d1w(head);
   };
   protoOf(MappedMutableProblogTheory).w1u = function (unificator) {
-    return this.c3o_1.w1u(unificator);
+    return this.j3o_1.w1u(unificator);
   };
   protoOf(MappedMutableProblogTheory).setUnificator = function (unificator) {
     return this.w1u(unificator);
   };
-  protoOf(MappedMutableProblogTheory).a13 = function (tags) {
-    return this.c3o_1.a13(tags);
+  protoOf(MappedMutableProblogTheory).z12 = function (tags) {
+    return this.j3o_1.z12(tags);
   };
   protoOf(MappedMutableProblogTheory).resetTags = function (tags) {
-    return this.a13(tags);
+    return this.z12(tags);
   };
   protoOf(MappedMutableProblogTheory).k1v = function () {
-    return this.c3o_1.k1v();
+    return this.j3o_1.k1v();
   };
   protoOf(MappedMutableProblogTheory).clone = function () {
     return this.k1v();
   };
   protoOf(MappedMutableProblogTheory).contains = function (clause) {
-    return this.c3o_1.contains(clause);
+    return this.j3o_1.contains(clause);
   };
   protoOf(MappedMutableProblogTheory).containsHead = function (head) {
-    return this.c3o_1.containsHead(head);
+    return this.j3o_1.containsHead(head);
   };
   protoOf(MappedMutableProblogTheory).containsIndicator = function (indicator) {
-    return this.c3o_1.containsIndicator(indicator);
+    return this.j3o_1.containsIndicator(indicator);
   };
   protoOf(MappedMutableProblogTheory).get = function (clause) {
-    return this.c3o_1.get(clause);
+    return this.j3o_1.get(clause);
   };
   protoOf(MappedMutableProblogTheory).getByHead = function (head) {
-    return this.c3o_1.getByHead(head);
+    return this.j3o_1.getByHead(head);
   };
   protoOf(MappedMutableProblogTheory).getByIndicator = function (indicator) {
-    return this.c3o_1.getByIndicator(indicator);
+    return this.j3o_1.getByIndicator(indicator);
   };
   protoOf(MappedMutableProblogTheory).toStringAsProlog = function (asPrologText) {
-    return this.c3o_1.toStringAsProlog(asPrologText);
+    return this.j3o_1.toStringAsProlog(asPrologText);
   };
   protoOf(MappedMutableProblogTheory).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.c3o_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.j3o_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(MappedMutableProblogTheory).f1o = function () {
-    return this.c3o_1.f1o();
+    return this.j3o_1.f1o();
   };
   protoOf(MappedMutableProblogTheory).y1n = function () {
-    return this.c3o_1.y1n();
+    return this.j3o_1.y1n();
   };
   protoOf(MappedMutableProblogTheory).s = function () {
-    return this.c3o_1.s();
+    return this.j3o_1.s();
   };
   protoOf(MappedMutableProblogTheory).a1o = function () {
-    return this.c3o_1.a1o();
+    return this.j3o_1.a1o();
   };
   protoOf(MappedMutableProblogTheory).v1u = function () {
-    return this.c3o_1.v1u();
+    return this.j3o_1.v1u();
   };
   protoOf(MappedMutableProblogTheory).n = function () {
-    return this.c3o_1.n();
+    return this.j3o_1.n();
   };
   protoOf(MappedMutableProblogTheory).getTag = function (name) {
-    return this.c3o_1.getTag(name);
+    return this.j3o_1.getTag(name);
   };
   protoOf(MappedMutableProblogTheory).containsTag = function (name) {
-    return this.c3o_1.containsTag(name);
+    return this.j3o_1.containsTag(name);
   };
-  protoOf(MappedMutableProblogTheory).du = function () {
-    return this.c3o_1.du();
+  protoOf(MappedMutableProblogTheory).cu = function () {
+    return this.j3o_1.cu();
   };
   protoOf(MappedMutableProblogTheory).v1n = function () {
-    return this.c3o_1.v1n();
+    return this.j3o_1.v1n();
   };
   function MappedProblogTheory(clauses, unificator, theory) {
     unificator = unificator === VOID ? Companion_getInstance_8().o1n() : unificator;
@@ -2545,7 +2605,7 @@
         var _iterator__ex2g4s = clauses.n();
         while (_iterator__ex2g4s.q()) {
           var element = _iterator__ex2g4s.r();
-          var list = ClauseMappingUtils_getInstance().a3o(element);
+          var list = ClauseMappingUtils_getInstance().h3o(element);
           addAll(destination, list);
         }
         tmp_1 = destination;
@@ -2556,7 +2616,7 @@
       tmp = theory;
     }
     theory = tmp;
-    this.e3o_1 = theory;
+    this.l3o_1 = theory;
   }
   protoOf(MappedProblogTheory).l1v = function () {
     return false;
@@ -2573,15 +2633,15 @@
   protoOf(MappedProblogTheory).toImmutableTheory = function () {
     return this.l1u();
   };
-  protoOf(MappedProblogTheory).d3o = function (theory) {
-    return new MappedProblogTheory(null, this.v1n(), this.e3o_1.plusTheory(theory));
+  protoOf(MappedProblogTheory).k3o = function (theory) {
+    return new MappedProblogTheory(null, this.v1n(), this.l3o_1.plusTheory(theory));
   };
   protoOf(MappedProblogTheory).y1u = function (theory) {
     var tmp;
     if (isInterface(theory, ProblogTheory)) {
-      tmp = this.d3o(theory);
+      tmp = this.k3o(theory);
     } else {
-      tmp = this.d3o(new MappedProblogTheory(theory, this.v1n()));
+      tmp = this.k3o(new MappedProblogTheory(theory, this.v1n()));
     }
     return tmp;
   };
@@ -2589,8 +2649,8 @@
     return this.y1u(theory);
   };
   protoOf(MappedProblogTheory).m1u = function (clause) {
-    var mapped = ClauseMappingUtils_getInstance().a3o(clause);
-    return new MappedProblogTheory(null, this.v1n(), this.e3o_1.plusTheory(Companion_instance_7.indexedOfIterable(this.v1n(), mapped)));
+    var mapped = ClauseMappingUtils_getInstance().h3o(clause);
+    return new MappedProblogTheory(null, this.v1n(), this.l3o_1.plusTheory(Companion_instance_7.indexedOfIterable(this.v1n(), mapped)));
   };
   protoOf(MappedProblogTheory).plus = function (clause) {
     return this.m1u(clause);
@@ -2602,11 +2662,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedProblogTheory(null, this.v1n(), this.e3o_1.assertAIterable(mapped));
+    return new MappedProblogTheory(null, this.v1n(), this.l3o_1.assertAIterable(mapped));
   };
   protoOf(MappedProblogTheory).assertAIterable = function (clauses) {
     return this.c1v(clauses);
@@ -2618,11 +2678,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    return new MappedProblogTheory(null, this.v1n(), this.e3o_1.assertZIterable(mapped));
+    return new MappedProblogTheory(null, this.v1n(), this.l3o_1.assertZIterable(mapped));
   };
   protoOf(MappedProblogTheory).assertZIterable = function (clauses) {
     return this.f1v(clauses);
@@ -2634,11 +2694,11 @@
     var _iterator__ex2g4s = clauses.n();
     while (_iterator__ex2g4s.q()) {
       var element = _iterator__ex2g4s.r();
-      var list = ClauseMappingUtils_getInstance().a3o(element);
+      var list = ClauseMappingUtils_getInstance().h3o(element);
       addAll(destination, list);
     }
     var mapped = destination;
-    var result = this.e3o_1.retractIterable(mapped);
+    var result = this.l3o_1.retractIterable(mapped);
     var tmp;
     if (result instanceof Success) {
       tmp = new Success(new MappedProblogTheory(null, this.v1n(), result.e1w_1), result.f1w_1);
@@ -2651,7 +2711,7 @@
     return this.j1v(clauses);
   };
   protoOf(MappedProblogTheory).n1o = function (clause) {
-    var mappedClauses = ClauseMappingUtils_getInstance().a3o(clause);
+    var mappedClauses = ClauseMappingUtils_getInstance().h3o(clause);
     var result = null;
     var _iterator__ex2g4s = mappedClauses.n();
     while (_iterator__ex2g4s.q()) {
@@ -2663,7 +2723,7 @@
         tmp = !(result instanceof Failure);
       }
       if (tmp) {
-        result = this.e3o_1.retractAll(c);
+        result = this.l3o_1.retractAll(c);
       }
     }
     var tmp_0;
@@ -2678,7 +2738,7 @@
     return this.n1o(clause);
   };
   protoOf(MappedProblogTheory).r1u = function (indicator) {
-    return new MappedProblogTheory(null, this.v1n(), this.e3o_1.abolish(ClauseMappingUtils_getInstance().b3o(indicator)));
+    return new MappedProblogTheory(null, this.v1n(), this.l3o_1.abolish(ClauseMappingUtils_getInstance().i3o(indicator)));
   };
   protoOf(MappedProblogTheory).abolish = function (indicator) {
     return this.r1u(indicator);
@@ -2720,7 +2780,7 @@
     return this.g1v(clauses);
   };
   protoOf(MappedProblogTheory).c1w = function (head) {
-    return this.b1w(Companion_instance_3.of(head, [Companion_getInstance_0().anonymous()]));
+    return this.b1w(anyMappedClause(head));
   };
   protoOf(MappedProblogTheory).retractByHead = function (head) {
     return this.c1w(head);
@@ -2738,80 +2798,80 @@
     return this.i1v(clauses);
   };
   protoOf(MappedProblogTheory).d1w = function (head) {
-    return this.n1o(Companion_instance_3.of(head, [Companion_getInstance_0().anonymous()]));
+    return this.n1o(anyMappedClause(head));
   };
   protoOf(MappedProblogTheory).retractAllByHead = function (head) {
     return this.d1w(head);
   };
   protoOf(MappedProblogTheory).setUnificator = function (unificator) {
-    return this.e3o_1.setUnificator(unificator);
+    return this.l3o_1.setUnificator(unificator);
   };
   protoOf(MappedProblogTheory).contains = function (clause) {
-    return this.e3o_1.contains(clause);
+    return this.l3o_1.contains(clause);
   };
   protoOf(MappedProblogTheory).containsHead = function (head) {
-    return this.e3o_1.containsHead(head);
+    return this.l3o_1.containsHead(head);
   };
   protoOf(MappedProblogTheory).containsIndicator = function (indicator) {
-    return this.e3o_1.containsIndicator(indicator);
+    return this.l3o_1.containsIndicator(indicator);
   };
   protoOf(MappedProblogTheory).get = function (clause) {
-    return this.e3o_1.get(clause);
+    return this.l3o_1.get(clause);
   };
   protoOf(MappedProblogTheory).getByHead = function (head) {
-    return this.e3o_1.getByHead(head);
+    return this.l3o_1.getByHead(head);
   };
   protoOf(MappedProblogTheory).getByIndicator = function (indicator) {
-    return this.e3o_1.getByIndicator(indicator);
+    return this.l3o_1.getByIndicator(indicator);
   };
   protoOf(MappedProblogTheory).toStringAsProlog = function (asPrologText) {
-    return this.e3o_1.toStringAsProlog(asPrologText);
+    return this.l3o_1.toStringAsProlog(asPrologText);
   };
   protoOf(MappedProblogTheory).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.e3o_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.l3o_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(MappedProblogTheory).clone = function () {
-    return this.e3o_1.clone();
+    return this.l3o_1.clone();
   };
   protoOf(MappedProblogTheory).f1o = function () {
-    return this.e3o_1.f1o();
+    return this.l3o_1.f1o();
   };
   protoOf(MappedProblogTheory).y1n = function () {
-    return this.e3o_1.y1n();
+    return this.l3o_1.y1n();
   };
   protoOf(MappedProblogTheory).s = function () {
-    return this.e3o_1.s();
+    return this.l3o_1.s();
   };
   protoOf(MappedProblogTheory).a1o = function () {
-    return this.e3o_1.a1o();
+    return this.l3o_1.a1o();
   };
   protoOf(MappedProblogTheory).v1u = function () {
-    return this.e3o_1.v1u();
+    return this.l3o_1.v1u();
   };
   protoOf(MappedProblogTheory).n = function () {
-    return this.e3o_1.n();
+    return this.l3o_1.n();
   };
   protoOf(MappedProblogTheory).getTag = function (name) {
-    return this.e3o_1.getTag(name);
+    return this.l3o_1.getTag(name);
   };
   protoOf(MappedProblogTheory).resetTags = function (tags) {
-    return this.e3o_1.resetTags(tags);
+    return this.l3o_1.resetTags(tags);
   };
   protoOf(MappedProblogTheory).containsTag = function (name) {
-    return this.e3o_1.containsTag(name);
+    return this.l3o_1.containsTag(name);
   };
-  protoOf(MappedProblogTheory).du = function () {
-    return this.e3o_1.du();
+  protoOf(MappedProblogTheory).cu = function () {
+    return this.l3o_1.cu();
   };
   protoOf(MappedProblogTheory).v1n = function () {
-    return this.e3o_1.v1n();
+    return this.l3o_1.v1n();
   };
   function NothingClauseMapper() {
   }
-  protoOf(NothingClauseMapper).o3n = function (clause) {
+  protoOf(NothingClauseMapper).v3n = function (clause) {
     return true;
   };
-  protoOf(NothingClauseMapper).p3n = function (clause) {
+  protoOf(NothingClauseMapper).w3n = function (clause) {
     return listOf(clause);
   };
   var NothingClauseMapper_instance;
@@ -2820,63 +2880,63 @@
   }
   function ProbabilisticClauseMapper() {
   }
-  protoOf(ProbabilisticClauseMapper).o3n = function (clause) {
+  protoOf(ProbabilisticClauseMapper).v3n = function (clause) {
     var tmp;
     if (isInterface(clause, Rule)) {
-      tmp = clause.ez().yw() === '::';
+      tmp = clause.dz().xw() === '::';
     } else {
       tmp = false;
     }
     return tmp;
   };
-  protoOf(ProbabilisticClauseMapper).p3n = function (clause) {
+  protoOf(ProbabilisticClauseMapper).w3n = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause.toString());
     }
-    var mapped = this.q3n(clause);
-    return listOf(this.r3n(mapped.first, Companion_getInstance_11().d3n(mapped.second)));
+    var mapped = this.x3n(clause);
+    return listOf(this.y3n(mapped.first, Companion_getInstance_11().k3n(mapped.second)));
   };
-  protoOf(ProbabilisticClauseMapper).q3n = function (rule) {
-    if (!(rule.ez().sw() === 2)) {
-      throw TuPrologException_init_$Create$('Invalid probabilistic rule: ' + rule.ez().toString());
+  protoOf(ProbabilisticClauseMapper).x3n = function (rule) {
+    if (!(rule.dz().rw() === 2)) {
+      throw TuPrologException_init_$Create$('Invalid probabilistic rule: ' + rule.dz().toString());
     }
-    var probTerm = rule.ez().get(0);
+    var probTerm = rule.dz().get(0);
     var tmp;
     if (isInterface(probTerm, Numeric)) {
-      tmp = probTerm.o11().toDouble();
+      tmp = probTerm.n11().toDouble();
     } else {
       tmp = solveArithmeticExpression(probTerm);
     }
     var probability = tmp;
-    var headTerm = safeToStruct(rule.ez().get(1));
-    if (headTerm.yw() === 'evidence') {
-      throw TuPrologException_init_$Create$("Probability notation can't be expressed on evidence: " + rule.ez().toString());
+    var headTerm = safeToStruct(rule.dz().get(1));
+    if (headTerm.xw() === 'evidence') {
+      throw TuPrologException_init_$Create$("Probability notation can't be expressed on evidence: " + rule.dz().toString());
     }
-    var bodyTerm = rule.fz();
-    var tmp_0 = rule.fz();
+    var bodyTerm = rule.ez();
+    var tmp_0 = rule.ez();
     if (isInterface(tmp_0, Truth)) {
-      if (!rule.fz().ww() && probability < 1.0) {
+      if (!rule.ez().vw() && probability < 1.0) {
         probability = 1.0 - probability;
         bodyTerm = Companion_getInstance_7().of(true);
       }
     }
     var anonVariablesFix = withoutAnonymousVars(Companion_instance_3.of(headTerm, [bodyTerm]));
-    headTerm = anonVariablesFix.ez();
-    bodyTerm = anonVariablesFix.fz();
+    headTerm = anonVariablesFix.dz();
+    bodyTerm = anonVariablesFix.ez();
     var extraVariables = get_extraVariables(Companion_instance_3.of(headTerm, [bodyTerm]));
-    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().z3n(), probability, headTerm, extraVariables);
+    var probTerm_0 = new ProbTerm(ClauseMappingUtils_getInstance().g3o(), probability, headTerm, extraVariables);
     return new Pair(Companion_instance_3.of(headTerm, [bodyTerm]), probTerm_0);
   };
-  protoOf(ProbabilisticClauseMapper).r3n = function (rule, explanation) {
-    var tmp = rule.fz();
+  protoOf(ProbabilisticClauseMapper).y3n = function (rule, explanation) {
+    var tmp = rule.ez();
     if (isInterface(tmp, Truth)) {
-      return Companion_instance_3.of(withExplanation(rule.ez(), toTerm(explanation)), [rule.fz()]);
+      return Companion_instance_3.of(withExplanation(rule.dz(), toTerm(explanation)), [rule.ez()]);
     }
     var explanationVar = Companion_getInstance_0().of('EXPL_Res');
     var explanationBodyVar = Companion_getInstance_0().of('EXPL_Body');
-    var newBody = withBodyExplanation(rule.fz(), explanationBodyVar);
+    var newBody = withBodyExplanation(rule.ez(), explanationBodyVar);
     var tmp_0 = Companion_instance_3;
-    var tmp_1 = withExplanation(rule.ez(), explanationVar);
+    var tmp_1 = withExplanation(rule.dz(), explanationVar);
     var tmp_2 = Companion_getInstance_1();
     var tmp_3 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
@@ -2889,36 +2949,36 @@
   }
   function PrologClauseMapper() {
   }
-  protoOf(PrologClauseMapper).o3n = function (clause) {
+  protoOf(PrologClauseMapper).v3n = function (clause) {
     return isInterface(clause, Rule);
   };
-  protoOf(PrologClauseMapper).p3n = function (clause) {
+  protoOf(PrologClauseMapper).w3n = function (clause) {
     if (!isInterface(clause, Rule)) {
       throw new ClauseMappingException('Clause is not an instance of Rule: ' + clause.toString());
     }
-    var tmp = clause.fz();
+    var tmp = clause.ez();
     if (isInterface(tmp, Truth)) {
-      return listOf(Companion_instance_3.of(withExplanation(clause.ez(), toTerm(Companion_getInstance_11().z3m_1)), [clause.fz()]));
+      return listOf(Companion_instance_3.of(withExplanation(clause.dz(), toTerm(Companion_getInstance_11().g3n_1)), [clause.ez()]));
     }
     var explanationVar = Companion_getInstance_0().of('EXPL_Res');
-    return listOf(Companion_instance_3.of(withExplanation(clause.ez(), explanationVar), [withBodyExplanation(clause.fz(), explanationVar)]));
+    return listOf(Companion_instance_3.of(withExplanation(clause.dz(), explanationVar), [withBodyExplanation(clause.ez(), explanationVar)]));
   };
   var PrologClauseMapper_instance;
   function PrologClauseMapper_getInstance() {
     return PrologClauseMapper_instance;
   }
   function _get_prob__dc6m52($this, $receiver) {
-    return $receiver.w3l_1.l3n();
+    return $receiver.d3m_1.s3n();
   }
   function ProbExplAnd() {
     ProbExplAnd_instance = this;
     NonBacktrackable.call(this, 'prob_expl_and');
   }
-  protoOf(ProbExplAnd).w2z = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().g3o(_this__u8e3s4.context)) {
-      return _this__u8e3s4.replyWith(Companion_getInstance_9().i2l(_this__u8e3s4, first, toTerm(Companion_getInstance_11().z3m_1)), VOID, []);
+  protoOf(ProbExplAnd).c30 = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().n3o(_this__u8e3s4.context)) {
+      return _this__u8e3s4.replyWith(Companion_getInstance_9().q2l(_this__u8e3s4, first, toTerm(Companion_getInstance_11().g3n_1)), VOID, []);
     }
     var tmp;
     var tmp_0;
@@ -2934,12 +2994,12 @@
       tmp_0 = false;
     }
     if (tmp_0) {
-      var explanation = _get_prob__dc6m52(this, second) === 0.0 || _get_prob__dc6m52(this, third) === 0.0 ? Companion_getInstance_11().y3m_1 : _get_prob__dc6m52(this, second) === 1.0 && _get_prob__dc6m52(this, third) === 1.0 ? Companion_getInstance_11().z3m_1 : _get_prob__dc6m52(this, second) === 1.0 ? third.w3l_1 : _get_prob__dc6m52(this, third) === 1.0 ? second.w3l_1 : second.w3l_1.and(third.w3l_1);
+      var explanation = _get_prob__dc6m52(this, second) === 0.0 || _get_prob__dc6m52(this, third) === 0.0 ? Companion_getInstance_11().f3n_1 : _get_prob__dc6m52(this, second) === 1.0 && _get_prob__dc6m52(this, third) === 1.0 ? Companion_getInstance_11().g3n_1 : _get_prob__dc6m52(this, second) === 1.0 ? third.d3m_1 : _get_prob__dc6m52(this, third) === 1.0 ? second.d3m_1 : second.d3m_1.and(third.d3m_1);
       var tmp_2;
-      if (explanation.l3n() === 0.0) {
+      if (explanation.s3n() === 0.0) {
         tmp_2 = _this__u8e3s4.replyWithCondition(false, VOID, []);
       } else {
-        tmp_2 = _this__u8e3s4.replyWith(Companion_getInstance_9().i2l(_this__u8e3s4, first, new ProbExplanationTerm(explanation)), VOID, []);
+        tmp_2 = _this__u8e3s4.replyWith(Companion_getInstance_9().q2l(_this__u8e3s4, first, new ProbExplanationTerm(explanation)), VOID, []);
       }
       tmp = tmp_2;
     } else {
@@ -2949,8 +3009,8 @@
     }
     return tmp;
   };
-  protoOf(ProbExplAnd).r2n = function (_this__u8e3s4, first, second, third) {
-    return this.w2z(_this__u8e3s4, first, second, third);
+  protoOf(ProbExplAnd).z2n = function (_this__u8e3s4, first, second, third) {
+    return this.c30(_this__u8e3s4, first, second, third);
   };
   var ProbExplAnd_instance;
   function ProbExplAnd_getInstance() {
@@ -2959,22 +3019,22 @@
     return ProbExplAnd_instance;
   }
   function ProbHelper$computeAllSubstitutions$slambda($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation) {
-    this.p3o_1 = $goal;
-    this.q3o_1 = $this_computeAllSubstitutions;
-    this.r3o_1 = $third;
-    this.s3o_1 = $first;
-    this.t3o_1 = $second;
-    this.u3o_1 = $goalSignature;
+    this.w3o_1 = $goal;
+    this.x3o_1 = $this_computeAllSubstitutions;
+    this.y3o_1 = $third;
+    this.z3o_1 = $first;
+    this.a3p_1 = $second;
+    this.b3p_1 = $goalSignature;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbHelper$computeAllSubstitutions$slambda).x31 = function ($this$sequence, $completion) {
-    var tmp = this.y31($this$sequence, $completion);
+  protoOf(ProbHelper$computeAllSubstitutions$slambda).a32 = function ($this$sequence, $completion) {
+    var tmp = this.b32($this$sequence, $completion);
     tmp.r8_1 = Unit_instance;
     tmp.s8_1 = null;
     return tmp.x8();
   };
   protoOf(ProbHelper$computeAllSubstitutions$slambda).o9 = function (p1, $completion) {
-    return this.x31(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.a32(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbHelper$computeAllSubstitutions$slambda).x8 = function () {
     var suspendResult = this.r8_1;
@@ -2984,27 +3044,27 @@
         switch (tmp) {
           case 0:
             this.q8_1 = 18;
-            var tmp0_subject = this.p3o_1.yw();
+            var tmp0_subject = this.w3o_1.xw();
             switch (tmp0_subject) {
               case '\\+':
               case 'not':
                 this.p8_1 = 16;
                 var tmp_0;
-                if (ProbSetConfig_getInstance().g3o(this.q3o_1.context)) {
+                if (ProbSetConfig_getInstance().n3o(this.x3o_1.context)) {
                   var tmp_1 = Companion_getInstance_9();
                   var tmp_2 = Companion_getInstance_1();
-                  var tmp_3 = this.p3o_1.yw();
+                  var tmp_3 = this.w3o_1.xw();
                   var tmp_4 = Companion_getInstance_1();
                   var this_0 = Prob_getInstance();
-                  tmp_0 = tmp_1.i2l(this.q3o_1, this.r3o_1, tmp_2.of(tmp_3, [tmp_4.of(this_0.signature.name, [Companion_getInstance_0().anonymous(), this.p3o_1.get(0)])])).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1)));
+                  tmp_0 = tmp_1.q2l(this.x3o_1, this.y3o_1, tmp_2.of(tmp_3, [tmp_4.of(this_0.signature.name, [Companion_getInstance_0().anonymous(), this.w3o_1.get(0)])])).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1)));
                 } else {
                   var tmp_5 = Companion_getInstance_9();
                   var tmp_6 = Companion_getInstance_1();
                   var this_1 = ProbNegationAsFailure_getInstance();
-                  tmp_0 = tmp_5.i2l(this.q3o_1, this.r3o_1, tmp_6.of(this_1.signature.name, [this.s3o_1, this.p3o_1.get(0)]));
+                  tmp_0 = tmp_5.q2l(this.x3o_1, this.y3o_1, tmp_6.of(this_1.signature.name, [this.z3o_1, this.w3o_1.get(0)]));
                 }
 
-                suspendResult = this.v3o_1.te(tmp_0, this);
+                suspendResult = this.c3p_1.se(tmp_0, this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
@@ -3017,13 +3077,13 @@
                   case '->':
                     this.p8_1 = 15;
                     var tmp_7;
-                    if (ProbSetConfig_getInstance().g3o(this.q3o_1.context)) {
-                      tmp_7 = Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, withBodyExplanation(this.p3o_1, Companion_getInstance_0().anonymous())).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1)));
+                    if (ProbSetConfig_getInstance().n3o(this.x3o_1.context)) {
+                      tmp_7 = Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, withBodyExplanation(this.w3o_1, Companion_getInstance_0().anonymous())).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1)));
                     } else {
-                      tmp_7 = Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, withBodyExplanation(this.p3o_1, this.s3o_1));
+                      tmp_7 = Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, withBodyExplanation(this.w3o_1, this.z3o_1));
                     }
 
-                    suspendResult = this.v3o_1.te(tmp_7, this);
+                    suspendResult = this.c3p_1.se(tmp_7, this);
                     if (suspendResult === get_COROUTINE_SUSPENDED()) {
                       return suspendResult;
                     }
@@ -3031,9 +3091,9 @@
                     continue $sm;
                   default:
                     if (tmp0_subject === 'call') {
-                      var newGoal = this.p3o_1.get(0);
+                      var newGoal = this.w3o_1.get(0);
                       this.p8_1 = 14;
-                      suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, Companion_instance_0.of(Companion_getInstance_1().of('ensure_executable', [newGoal]), Companion_getInstance_1().of(this.p3o_1.yw(), [withBodyExplanation(newGoal, this.s3o_1)]))), this);
+                      suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, Companion_instance_0.of(Companion_getInstance_1().of('ensure_executable', [newGoal]), Companion_getInstance_1().of(this.w3o_1.xw(), [withBodyExplanation(newGoal, this.z3o_1)]))), this);
                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                         return suspendResult;
                       }
@@ -3041,18 +3101,18 @@
                     } else {
                       if (tmp0_subject === 'catch') {
                         this.p8_1 = 13;
-                        suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, Companion_getInstance_1().of(this.p3o_1.yw(), [withBodyExplanation(this.p3o_1.get(0), this.s3o_1), this.p3o_1.get(1), withBodyExplanation(this.p3o_1.get(2), this.s3o_1)])), this);
+                        suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, Companion_getInstance_1().of(this.w3o_1.xw(), [withBodyExplanation(this.w3o_1.get(0), this.z3o_1), this.w3o_1.get(1), withBodyExplanation(this.w3o_1.get(2), this.z3o_1)])), this);
                         if (suspendResult === get_COROUTINE_SUSPENDED()) {
                           return suspendResult;
                         }
                         continue $sm;
                       } else {
                         if (tmp0_subject === 'findall') {
-                          var this_2 = this.p3o_1.zw();
+                          var this_2 = this.w3o_1.yw();
                           var goalArgs = copyToArray(this_2);
                           goalArgs[1] = withBodyExplanation(goalArgs[1], Companion_getInstance_0().anonymous());
                           this.p8_1 = 12;
-                          suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, Companion_getInstance_1().of(this.p3o_1.yw(), goalArgs.slice())).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1))), this);
+                          suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, Companion_getInstance_1().of(this.w3o_1.xw(), goalArgs.slice())).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1))), this);
                           if (suspendResult === get_COROUTINE_SUSPENDED()) {
                             return suspendResult;
                           }
@@ -3062,22 +3122,22 @@
                             case 'assert':
                             case 'asserta':
                             case 'assertz':
-                              var subGoal = this.p3o_1.get(0);
+                              var subGoal = this.w3o_1.get(0);
                               var tmp_8;
                               if (isInterface(subGoal, Clause)) {
-                                tmp_8 = extractSignature(ensureNotNull(subGoal.ez()));
+                                tmp_8 = extractSignature(ensureNotNull(subGoal.dz()));
                               } else {
                                 tmp_8 = extractSignature(safeToStruct(subGoal));
                               }
 
                               var subGoalSignature = tmp_8;
                               var tmp_9;
-                              if (this.q3o_1.context.t1x().containsSignature(subGoalSignature)) {
+                              if (this.x3o_1.context.t1x().containsSignature(subGoalSignature)) {
                                 tmp_9 = true;
                               } else {
                                 var tmp_10;
                                 if (isInterface(subGoal, Clause)) {
-                                  tmp_10 = !subGoal.oz();
+                                  tmp_10 = !subGoal.nz();
                                 } else {
                                   tmp_10 = false;
                                 }
@@ -3086,7 +3146,7 @@
 
                               if (tmp_9) {
                                 this.p8_1 = 10;
-                                suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, this.p3o_1).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1))), this);
+                                suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, this.w3o_1).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1))), this);
                                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                   return suspendResult;
                                 }
@@ -3094,15 +3154,15 @@
                               } else {
                                 var tmp_11;
                                 if (isInterface(subGoal, Clause)) {
-                                  tmp_11 = ClauseMappingUtils_getInstance().a3o(subGoal);
+                                  tmp_11 = ClauseMappingUtils_getInstance().h3o(subGoal);
                                 } else {
                                   if (isInterface(subGoal, Struct)) {
-                                    var this_3 = ClauseMappingUtils_getInstance().a3o(Companion_instance.of(subGoal));
+                                    var this_3 = ClauseMappingUtils_getInstance().h3o(Companion_instance.of(subGoal));
                                     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_3, 10));
                                     var _iterator__ex2g4s = this_3.n();
                                     while (_iterator__ex2g4s.q()) {
                                       var item = _iterator__ex2g4s.r();
-                                      destination.l(ensureNotNull(item.ez()));
+                                      destination.l(ensureNotNull(item.dz()));
                                     }
                                     tmp_11 = destination;
                                   } else {
@@ -3115,9 +3175,9 @@
                                 var _iterator__ex2g4s_0 = newGoals.n();
                                 while (_iterator__ex2g4s_0.q()) {
                                   var item_0 = _iterator__ex2g4s_0.r();
-                                  destination_0.l(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, Companion_getInstance_1().of(this.p3o_1.yw(), [item_0])).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1))));
+                                  destination_0.l(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, Companion_getInstance_1().of(this.w3o_1.xw(), [item_0])).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1))));
                                 }
-                                suspendResult = this.v3o_1.ve(destination_0, this);
+                                suspendResult = this.c3p_1.ue(destination_0, this);
                                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                   return suspendResult;
                                 }
@@ -3128,20 +3188,20 @@
                               switch (tmp0_subject) {
                                 case 'retract':
                                 case 'retractall':
-                                  var goalArg = this.p3o_1.get(0);
+                                  var goalArg = this.w3o_1.get(0);
                                   this.p8_1 = 8;
                                   var tmp_12 = Companion_getInstance_9();
                                   var tmp_13 = Companion_getInstance_1();
-                                  var tmp_14 = this.p3o_1.yw();
+                                  var tmp_14 = this.w3o_1.xw();
                                   var tmp_15;
                                   var tmp_16;
                                   var tmp_17;
-                                  if (goalArg.fx()) {
+                                  if (goalArg.ex()) {
                                     tmp_17 = true;
                                   } else {
                                     var tmp_18;
                                     if (isInterface(goalArg, Struct)) {
-                                      tmp_18 = goalArg.yw() === ':-';
+                                      tmp_18 = goalArg.xw() === ':-';
                                     } else {
                                       tmp_18 = false;
                                     }
@@ -3151,16 +3211,16 @@
                                   if (tmp_17) {
                                     tmp_16 = true;
                                   } else {
-                                    tmp_16 = this.q3o_1.context.t1x().containsSignature(extractSignature(safeToStruct(goalArg)));
+                                    tmp_16 = this.x3o_1.context.t1x().containsSignature(extractSignature(safeToStruct(goalArg)));
                                   }
 
                                   if (tmp_16) {
                                     tmp_15 = goalArg;
                                   } else {
-                                    tmp_15 = withExplanation(goalArg, this.s3o_1);
+                                    tmp_15 = withExplanation(goalArg, this.z3o_1);
                                   }
 
-                                  suspendResult = this.v3o_1.te(tmp_12.i2l(this.q3o_1, this.r3o_1, tmp_13.of(tmp_14, [tmp_15])), this);
+                                  suspendResult = this.c3p_1.se(tmp_12.q2l(this.x3o_1, this.y3o_1, tmp_13.of(tmp_14, [tmp_15])), this);
                                   if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                     return suspendResult;
                                   }
@@ -3168,23 +3228,23 @@
                                   continue $sm;
                                 default:
                                   if (tmp0_subject === 'clause') {
-                                    var subGoal_0 = this.p3o_1.get(0);
+                                    var subGoal_0 = this.w3o_1.get(0);
                                     var tmp_19;
                                     if (!isInterface(subGoal_0, Struct)) {
                                       tmp_19 = true;
                                     } else {
-                                      tmp_19 = this.q3o_1.context.t1x().hasProtected(extractSignature(subGoal_0));
+                                      tmp_19 = this.x3o_1.context.t1x().hasProtected(extractSignature(subGoal_0));
                                     }
                                     if (tmp_19) {
                                       this.p8_1 = 6;
-                                      suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, this.p3o_1).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1))), this);
+                                      suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, this.w3o_1).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1))), this);
                                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                         return suspendResult;
                                       }
                                       continue $sm;
                                     } else {
                                       this.p8_1 = 5;
-                                      suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, Companion_getInstance_1().of(this.p3o_1.yw(), [withExplanation(this.p3o_1.get(0), this.s3o_1), this.p3o_1.get(1)])), this);
+                                      suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, Companion_getInstance_1().of(this.w3o_1.xw(), [withExplanation(this.w3o_1.get(0), this.z3o_1), this.w3o_1.get(1)])), this);
                                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                         return suspendResult;
                                       }
@@ -3193,16 +3253,16 @@
                                   } else {
                                     var tmp_20 = this;
                                     var tmp_21;
-                                    var tmp_22 = this.t3o_1;
+                                    var tmp_22 = this.a3p_1;
                                     if (isInterface(tmp_22, Truth)) {
                                       tmp_21 = true;
                                     } else {
-                                      tmp_21 = this.q3o_1.context.t1x().containsSignature(this.u3o_1);
+                                      tmp_21 = this.x3o_1.context.t1x().containsSignature(this.b3p_1);
                                     }
-                                    tmp_20.w3o_1 = tmp_21;
-                                    if (this.w3o_1 || this.q3o_1.context.v1x().containsIndicator(this.u3o_1.toIndicator()) || this.q3o_1.context.w1x().containsIndicator(this.u3o_1.toIndicator())) {
+                                    tmp_20.d3p_1 = tmp_21;
+                                    if (this.d3p_1 || this.x3o_1.context.v1x().containsIndicator(this.b3p_1.toIndicator()) || this.x3o_1.context.w1x().containsIndicator(this.b3p_1.toIndicator())) {
                                       this.p8_1 = 1;
-                                      suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, this.p3o_1).plus(Companion_getInstance_9().i2l(this.q3o_1, this.s3o_1, toTerm(Companion_getInstance_11().z3m_1))), this);
+                                      suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, this.w3o_1).plus(Companion_getInstance_9().q2l(this.x3o_1, this.z3o_1, toTerm(Companion_getInstance_11().g3n_1))), this);
                                       if (suspendResult === get_COROUTINE_SUSPENDED()) {
                                         return suspendResult;
                                       }
@@ -3232,9 +3292,9 @@
             this.p8_1 = 2;
             continue $sm;
           case 2:
-            if (!this.w3o_1) {
+            if (!this.d3p_1) {
               this.p8_1 = 3;
-              suspendResult = this.v3o_1.te(Companion_getInstance_9().i2l(this.q3o_1, this.r3o_1, withExplanation(this.p3o_1, this.s3o_1)), this);
+              suspendResult = this.c3p_1.se(Companion_getInstance_9().q2l(this.x3o_1, this.y3o_1, withExplanation(this.w3o_1, this.z3o_1)), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -3302,30 +3362,30 @@
       }
      while (true);
   };
-  protoOf(ProbHelper$computeAllSubstitutions$slambda).y31 = function ($this$sequence, completion) {
-    var i = new ProbHelper$computeAllSubstitutions$slambda(this.p3o_1, this.q3o_1, this.r3o_1, this.s3o_1, this.t3o_1, this.u3o_1, completion);
-    i.v3o_1 = $this$sequence;
+  protoOf(ProbHelper$computeAllSubstitutions$slambda).b32 = function ($this$sequence, completion) {
+    var i = new ProbHelper$computeAllSubstitutions$slambda(this.w3o_1, this.x3o_1, this.y3o_1, this.z3o_1, this.a3p_1, this.b3p_1, completion);
+    i.c3p_1 = $this$sequence;
     return i;
   };
   function ProbHelper$computeAllSubstitutions$slambda_0($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation) {
     var i = new ProbHelper$computeAllSubstitutions$slambda($goal, $this_computeAllSubstitutions, $third, $first, $second, $goalSignature, resultContinuation);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.x31($this$sequence, $completion);
+      return i.a32($this$sequence, $completion);
     }, 1);
   }
   function ProbHelper() {
     ProbHelper_instance = this;
     WithoutSideEffects.call(this, 'prob_helper');
   }
-  protoOf(ProbHelper).w2u = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 1);
+  protoOf(ProbHelper).d2v = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 1);
     var goal = safeToStruct(second);
     var goalSignature = extractSignature(goal);
     return sequence(ProbHelper$computeAllSubstitutions$slambda_0(goal, _this__u8e3s4, third, first, second, goalSignature, null));
   };
-  protoOf(ProbHelper).n2n = function (_this__u8e3s4, first, second, third) {
-    return this.w2u(_this__u8e3s4, first, second, third);
+  protoOf(ProbHelper).v2n = function (_this__u8e3s4, first, second, third) {
+    return this.d2v(_this__u8e3s4, first, second, third);
   };
   var ProbHelper_instance;
   function ProbHelper_getInstance() {
@@ -3337,11 +3397,11 @@
     ProbNegationAsFailure_instance = this;
     NonBacktrackable_0.call(this, 'prob_negation_as_failure');
   }
-  protoOf(ProbNegationAsFailure).c2v = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 1);
+  protoOf(ProbNegationAsFailure).j2v = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 1);
     var tmp;
-    if (!second.cy()) {
+    if (!second.by()) {
       tmp = _this__u8e3s4.replyException(ResolutionException_init_$Create$('Probabilistic negation does not support non-ground goals: ' + second.toString(), VOID, _this__u8e3s4.context, []), VOID, []);
     } else {
       var explanationTermVar = Companion_getInstance_0().of('Explanation');
@@ -3365,7 +3425,7 @@
         if (tmp_4) {
           tmp_3 = _this__u8e3s4.replyException(ResolutionException_init_$Create$('No valid explanation has been solved for goal: ' + second.toString(), VOID, _this__u8e3s4.context, []), VOID, []);
         } else {
-          tmp_3 = _this__u8e3s4.replyWith(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().i2l(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.w3l_1.not())), []), VOID, []);
+          tmp_3 = _this__u8e3s4.replyWith(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().q2l(_this__u8e3s4, first, new ProbExplanationTerm(explanationTerm.d3m_1.not())), []), VOID, []);
         }
         tmp_2 = tmp_3;
       }
@@ -3373,8 +3433,8 @@
     }
     return tmp;
   };
-  protoOf(ProbNegationAsFailure).n2k = function (_this__u8e3s4, first, second) {
-    return this.c2v(_this__u8e3s4, first, second);
+  protoOf(ProbNegationAsFailure).v2k = function (_this__u8e3s4, first, second) {
+    return this.j2v(_this__u8e3s4, first, second);
   };
   var ProbNegationAsFailure_instance;
   function ProbNegationAsFailure_getInstance() {
@@ -3388,22 +3448,22 @@
     };
   }
   function ProbQuery$computeAllSubstitutions$slambda($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation) {
-    this.h3p_1 = $solutions;
-    this.i3p_1 = $queryWithEvidenceExplanation;
-    this.j3p_1 = $evidenceExplanation;
-    this.k3p_1 = $this_computeAllSubstitutions;
-    this.l3p_1 = $first;
-    this.m3p_1 = $fourth;
+    this.o3p_1 = $solutions;
+    this.p3p_1 = $queryWithEvidenceExplanation;
+    this.q3p_1 = $evidenceExplanation;
+    this.r3p_1 = $this_computeAllSubstitutions;
+    this.s3p_1 = $first;
+    this.t3p_1 = $fourth;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbQuery$computeAllSubstitutions$slambda).x31 = function ($this$sequence, $completion) {
-    var tmp = this.y31($this$sequence, $completion);
+  protoOf(ProbQuery$computeAllSubstitutions$slambda).a32 = function ($this$sequence, $completion) {
+    var tmp = this.b32($this$sequence, $completion);
     tmp.r8_1 = Unit_instance;
     tmp.s8_1 = null;
     return tmp.x8();
   };
   protoOf(ProbQuery$computeAllSubstitutions$slambda).o9 = function (p1, $completion) {
-    return this.x31(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.a32(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbQuery$computeAllSubstitutions$slambda).x8 = function () {
     var suspendResult = this.r8_1;
@@ -3413,20 +3473,20 @@
         switch (tmp) {
           case 0:
             this.q8_1 = 8;
-            this.o3p_1 = this.h3p_1.n();
+            this.v3p_1 = this.o3p_1.n();
             this.p8_1 = 1;
             continue $sm;
           case 1:
-            if (!this.o3p_1.q()) {
+            if (!this.v3p_1.q()) {
               this.p8_1 = 7;
               continue $sm;
             }
 
-            var solution = this.o3p_1.r();
-            if (solution.n1z())
-              throw ensureNotNull(solution.l1z());
-            var queryWithEvidenceExplanationTerm = solution.p1x().j2(this.i3p_1);
-            var evidenceExplanationTerm = solution.p1x().j2(this.j3p_1);
+            var solution = this.v3p_1.r();
+            if (solution.o1z())
+              throw ensureNotNull(solution.m1z());
+            var queryWithEvidenceExplanationTerm = solution.p1x().j2(this.p3p_1);
+            var evidenceExplanationTerm = solution.p1x().j2(this.q3p_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
@@ -3450,27 +3510,27 @@
 
             if (tmp_0) {
               this.p8_1 = 5;
-              suspendResult = this.n3p_1.te(Companion_getInstance_5().failed(), this);
+              suspendResult = this.u3p_1.se(Companion_getInstance_5().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              var queryWithEvidenceProbability = queryWithEvidenceExplanationTerm.w3l_1.m3n();
-              var evidenceProbability = evidenceExplanationTerm.w3l_1.m3n();
+              var queryWithEvidenceProbability = queryWithEvidenceExplanationTerm.d3m_1.t3n();
+              var evidenceProbability = evidenceExplanationTerm.d3m_1.t3n();
               if (queryWithEvidenceProbability == null || evidenceProbability == null) {
                 this.p8_1 = 3;
-                suspendResult = this.n3p_1.te(Companion_getInstance_5().failed(), this);
+                suspendResult = this.u3p_1.se(Companion_getInstance_5().failed(), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
                 continue $sm;
               } else {
                 var tmp_3 = solution.p1x();
-                var solutionSubstitution = tmp_3.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.j3p_1, this.i3p_1));
+                var solutionSubstitution = tmp_3.filter(ProbQuery$computeAllSubstitutions$slambda$lambda(this.q3p_1, this.p3p_1));
                 var probabilityTerm = Companion_getInstance_6().ofDouble(queryWithEvidenceProbability / evidenceProbability);
                 this.p8_1 = 2;
-                suspendResult = this.n3p_1.te(Companion_getInstance_5().ofSubstitution(solutionSubstitution, [Companion_getInstance_9().i2l(this.k3p_1, this.l3p_1, probabilityTerm), Companion_getInstance_9().i2l(this.k3p_1, this.m3p_1, queryWithEvidenceExplanationTerm)]), this);
+                suspendResult = this.u3p_1.se(Companion_getInstance_5().ofSubstitution(solutionSubstitution, [Companion_getInstance_9().q2l(this.r3p_1, this.s3p_1, probabilityTerm), Companion_getInstance_9().q2l(this.r3p_1, this.t3p_1, queryWithEvidenceExplanationTerm)]), this);
                 if (suspendResult === get_COROUTINE_SUSPENDED()) {
                   return suspendResult;
                 }
@@ -3509,26 +3569,26 @@
       }
      while (true);
   };
-  protoOf(ProbQuery$computeAllSubstitutions$slambda).y31 = function ($this$sequence, completion) {
-    var i = new ProbQuery$computeAllSubstitutions$slambda(this.h3p_1, this.i3p_1, this.j3p_1, this.k3p_1, this.l3p_1, this.m3p_1, completion);
-    i.n3p_1 = $this$sequence;
+  protoOf(ProbQuery$computeAllSubstitutions$slambda).b32 = function ($this$sequence, completion) {
+    var i = new ProbQuery$computeAllSubstitutions$slambda(this.o3p_1, this.p3p_1, this.q3p_1, this.r3p_1, this.s3p_1, this.t3p_1, completion);
+    i.u3p_1 = $this$sequence;
     return i;
   };
   function ProbQuery$computeAllSubstitutions$slambda_0($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation) {
     var i = new ProbQuery$computeAllSubstitutions$slambda($solutions, $queryWithEvidenceExplanation, $evidenceExplanation, $this_computeAllSubstitutions, $first, $fourth, resultContinuation);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.x31($this$sequence, $completion);
+      return i.a32($this$sequence, $completion);
     }, 1);
   }
   function ProbQuery() {
     ProbQuery_instance = this;
     WithoutSideEffects_0.call(this, 'prob_query');
   }
-  protoOf(ProbQuery).q3p = function (_this__u8e3s4, first, second, third, fourth) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().s2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().o2l(_this__u8e3s4, 2);
+  protoOf(ProbQuery).x3p = function (_this__u8e3s4, first, second, third, fourth) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 1);
+    Companion_getInstance_9().a2m(_this__u8e3s4, 1);
+    Companion_getInstance_9().w2l(_this__u8e3s4, 2);
     var queryWithEvidenceExplanation = Companion_getInstance_0().of('QueryWithEvidenceExplanation');
     var evidenceExplanation = Companion_getInstance_0().of('EvidenceExplanation');
     var tmp = _this__u8e3s4.subSolver();
@@ -3540,11 +3600,11 @@
     var tmp_3 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = ProbSolveWithEvidence_getInstance().signature.name;
-    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().r3p(third));
+    var solutions = tmp.solveWithOptions(tmp_0.of(tmp_2, tmp_3.of(tmp$ret$1, [queryWithEvidenceExplanation, evidenceExplanation, second])), ProbSetConfig_getInstance().y3p(third));
     return sequence(ProbQuery$computeAllSubstitutions$slambda_0(solutions, queryWithEvidenceExplanation, evidenceExplanation, _this__u8e3s4, first, fourth, null));
   };
-  protoOf(ProbQuery).m2m = function (_this__u8e3s4, first, second, third, fourth) {
-    return this.q3p(_this__u8e3s4, first, second, third, fourth);
+  protoOf(ProbQuery).u2m = function (_this__u8e3s4, first, second, third, fourth) {
+    return this.x3p(_this__u8e3s4, first, second, third, fourth);
   };
   var ProbQuery_instance;
   function ProbQuery_getInstance() {
@@ -3557,40 +3617,40 @@
     NonBacktrackable_1.call(this, 'prob_set_config');
     var tmp = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp.r3l_1 = this.signature.name + '_flag';
+    tmp.y3l_1 = this.signature.name + '_flag';
     var tmp_0 = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp_0.s3l_1 = this.signature.name + '_term';
+    tmp_0.z3l_1 = this.signature.name + '_term';
     var tmp_1 = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
-    tmp_1.t3l_1 = 'it.unibo.tuprolog.solve.probability' + this.signature.name + '_tag';
+    tmp_1.a3m_1 = 'it.unibo.tuprolog.solve.probability' + this.signature.name + '_tag';
   }
-  protoOf(ProbSetConfig).l2u = function (_this__u8e3s4, first) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 0);
-    Companion_getInstance_9().x2l(_this__u8e3s4, 0);
+  protoOf(ProbSetConfig).v2u = function (_this__u8e3s4, first) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 0);
+    Companion_getInstance_9().f2m(_this__u8e3s4, 0);
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    var tmp$ret$0 = [SetFlags_init_$Create$([new Pair(this.r3l_1, first)])];
+    var tmp$ret$0 = [SetFlags_init_$Create$([new Pair(this.y3l_1, first)])];
     return _this__u8e3s4.replySuccess(VOID, VOID, tmp$ret$0.slice());
   };
-  protoOf(ProbSetConfig).a2o = function (_this__u8e3s4, first) {
-    return this.l2u(_this__u8e3s4, first);
+  protoOf(ProbSetConfig).i2o = function (_this__u8e3s4, first) {
+    return this.v2u(_this__u8e3s4, first);
   };
-  protoOf(ProbSetConfig).r3p = function (_this__u8e3s4) {
-    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.t3l_1);
+  protoOf(ProbSetConfig).y3p = function (_this__u8e3s4) {
+    var tmp0_elvis_lhs = _this__u8e3s4.getTag(this.a3m_1);
     return tmp0_elvis_lhs == null ? Companion_getInstance_2().DEFAULT : tmp0_elvis_lhs;
   };
-  protoOf(ProbSetConfig).u3l = function (_this__u8e3s4) {
-    return setTag(Companion_getInstance_4().of(this.s3l_1), this.t3l_1, _this__u8e3s4);
+  protoOf(ProbSetConfig).b3m = function (_this__u8e3s4) {
+    return setTag(Companion_getInstance_4().of(this.z3l_1), this.a3m_1, _this__u8e3s4);
   };
-  protoOf(ProbSetConfig).s3p = function (_this__u8e3s4) {
-    var tmp0_safe_receiver = _this__u8e3s4.u1x().zb(this.r3l_1);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.r3p(tmp0_safe_receiver);
+  protoOf(ProbSetConfig).z3p = function (_this__u8e3s4) {
+    var tmp0_safe_receiver = _this__u8e3s4.u1x().zb(this.y3l_1);
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.y3p(tmp0_safe_receiver);
     return tmp1_elvis_lhs == null ? Companion_getInstance_2().DEFAULT : tmp1_elvis_lhs;
   };
-  protoOf(ProbSetConfig).g3o = function (_this__u8e3s4) {
-    return !get_isProbabilistic(this.s3p(_this__u8e3s4));
+  protoOf(ProbSetConfig).n3o = function (_this__u8e3s4) {
+    return !get_isProbabilistic(this.z3p(_this__u8e3s4));
   };
   var ProbSetConfig_instance;
   function ProbSetConfig_getInstance() {
@@ -3599,8 +3659,8 @@
     return ProbSetConfig_instance;
   }
   function ProbSolve$computeAllSubstitutions$lambda(it) {
-    if (it.n1z())
-      throw ensureNotNull(it.l1z());
+    if (it.o1z())
+      throw ensureNotNull(it.m1z());
     return it.p1x();
   }
   function ProbSolve$computeAllSubstitutions$lambda_0(it) {
@@ -3612,20 +3672,20 @@
     };
   }
   function ProbSolve$computeAllSubstitutions$slambda($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation) {
-    this.b3q_1 = $solutionGroups;
-    this.c3q_1 = $explanationVar;
-    this.d3q_1 = $this_computeAllSubstitutions;
-    this.e3q_1 = $first;
+    this.i3q_1 = $solutionGroups;
+    this.j3q_1 = $explanationVar;
+    this.k3q_1 = $this_computeAllSubstitutions;
+    this.l3q_1 = $first;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbSolve$computeAllSubstitutions$slambda).x31 = function ($this$sequence, $completion) {
-    var tmp = this.y31($this$sequence, $completion);
+  protoOf(ProbSolve$computeAllSubstitutions$slambda).a32 = function ($this$sequence, $completion) {
+    var tmp = this.b32($this$sequence, $completion);
     tmp.r8_1 = Unit_instance;
     tmp.s8_1 = null;
     return tmp.x8();
   };
   protoOf(ProbSolve$computeAllSubstitutions$slambda).o9 = function (p1, $completion) {
-    return this.x31(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.a32(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbSolve$computeAllSubstitutions$slambda).x8 = function () {
     var suspendResult = this.r8_1;
@@ -3636,22 +3696,22 @@
           case 0:
             this.q8_1 = 4;
             var tmp_0 = this;
-            tmp_0.g3q_1 = this.b3q_1.d1().n();
+            tmp_0.n3q_1 = this.i3q_1.d1().n();
             this.p8_1 = 1;
             continue $sm;
           case 1:
-            if (!this.g3q_1.q()) {
+            if (!this.n3q_1.q()) {
               this.p8_1 = 3;
               continue $sm;
             }
 
-            var solutionGroup = this.g3q_1.r();
+            var solutionGroup = this.n3q_1.r();
             var this_0 = solutionGroup.f1();
             var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
             var _iterator__ex2g4s = this_0.n();
             while (_iterator__ex2g4s.q()) {
               var item = _iterator__ex2g4s.r();
-              destination.l(item.p1x().j2(this.c3q_1));
+              destination.l(item.p1x().j2(this.j3q_1));
             }
 
             var destination_0 = ArrayList_init_$Create$_0();
@@ -3667,7 +3727,7 @@
             var _iterator__ex2g4s_1 = destination_0.n();
             while (_iterator__ex2g4s_1.q()) {
               var item_0 = _iterator__ex2g4s_1.r();
-              destination_1.l(item_0.w3l_1);
+              destination_1.l(item_0.d3m_1);
             }
 
             var iterator = destination_1.n();
@@ -3677,13 +3737,13 @@
             while (iterator.q()) {
               var tmp0 = accumulator;
               var expl = iterator.r();
-              accumulator = expl.l3n() === 1.0 ? tmp0 : tmp0.l3n() === 1.0 ? expl : tmp0.or(expl);
+              accumulator = expl.s3n() === 1.0 ? tmp0 : tmp0.s3n() === 1.0 ? expl : tmp0.or(expl);
             }
 
             var explanation = accumulator;
-            var substitution = Companion_getInstance_5().ofSubstitution(solutionGroup.e1(), [Companion_getInstance_9().i2l(this.d3q_1, this.e3q_1, new ProbExplanationTerm(explanation))]);
+            var substitution = Companion_getInstance_5().ofSubstitution(solutionGroup.e1(), [Companion_getInstance_9().q2l(this.k3q_1, this.l3q_1, new ProbExplanationTerm(explanation))]);
             this.p8_1 = 2;
-            suspendResult = this.f3q_1.te(substitution, this);
+            suspendResult = this.m3q_1.se(substitution, this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -3708,30 +3768,30 @@
       }
      while (true);
   };
-  protoOf(ProbSolve$computeAllSubstitutions$slambda).y31 = function ($this$sequence, completion) {
-    var i = new ProbSolve$computeAllSubstitutions$slambda(this.b3q_1, this.c3q_1, this.d3q_1, this.e3q_1, completion);
-    i.f3q_1 = $this$sequence;
+  protoOf(ProbSolve$computeAllSubstitutions$slambda).b32 = function ($this$sequence, completion) {
+    var i = new ProbSolve$computeAllSubstitutions$slambda(this.i3q_1, this.j3q_1, this.k3q_1, this.l3q_1, completion);
+    i.m3q_1 = $this$sequence;
     return i;
   };
   function ProbSolve$computeAllSubstitutions$slambda_0($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation) {
     var i = new ProbSolve$computeAllSubstitutions$slambda($solutionGroups, $explanationVar, $this_computeAllSubstitutions, $first, resultContinuation);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.x31($this$sequence, $completion);
+      return i.a32($this$sequence, $completion);
     }, 1);
   }
   function ProbSolve() {
     ProbSolve_instance = this;
     WithoutSideEffects_1.call(this, 'prob_solve');
   }
-  protoOf(ProbSolve).c2x = function (_this__u8e3s4, first, second) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 1);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 1);
-    if (ProbSetConfig_getInstance().g3o(_this__u8e3s4.context)) {
+  protoOf(ProbSolve).i2x = function (_this__u8e3s4, first, second) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 1);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 1);
+    if (ProbSetConfig_getInstance().n3o(_this__u8e3s4.context)) {
       var tmp = _this__u8e3s4.subSolver();
       var tmp_0 = Companion_getInstance_1();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp$ret$0 = Prob_getInstance().signature.name;
-      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().s3p(_this__u8e3s4.context));
+      var tmp_1 = tmp.solveWithOptions(tmp_0.of(tmp$ret$0, [first, second]), ProbSetConfig_getInstance().z3p(_this__u8e3s4.context));
       return map(tmp_1, ProbSolve$computeAllSubstitutions$lambda);
     }
     var explanationVar = Companion_getInstance_0().of('EXPL');
@@ -3739,14 +3799,14 @@
     var tmp_3 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = Prob_getInstance().signature.name;
-    var solutions = toList(tmp_2.solveWithOptions(tmp_3.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().s3p(_this__u8e3s4.context)));
+    var solutions = toList_0(tmp_2.solveWithOptions(tmp_3.of(tmp$ret$1, [explanationVar, second]), ProbSetConfig_getInstance().z3p(_this__u8e3s4.context)));
     // Inline function 'kotlin.sequences.filterIsInstance' call
     var this_0 = asSequence(solutions);
     var tmp_4 = filter(this_0, ProbSolve$computeAllSubstitutions$lambda_0);
     var tmp$ret$2 = isInterface(tmp_4, Sequence) ? tmp_4 : THROW_CCE();
     var error = firstOrNull(tmp$ret$2);
     if (!(error == null))
-      throw error.l1z();
+      throw error.m1z();
     var tmp_5;
     var tmp$ret$3;
     $l$block_0: {
@@ -3772,7 +3832,7 @@
       tmp$ret$3 = false;
     }
     if (!tmp$ret$3) {
-      tmp_5 = sequenceOf(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().i2l(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().y3m_1)), []));
+      tmp_5 = sequenceOf(Companion_getInstance_5().ofSubstitution(Companion_getInstance_9().q2l(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().f3n_1)), []));
     } else {
       // Inline function 'kotlin.collections.filterIsInstance' call
       // Inline function 'kotlin.collections.filterIsInstanceTo' call
@@ -3791,7 +3851,7 @@
       while (_iterator__ex2g4s_1.q()) {
         var element_1 = _iterator__ex2g4s_1.r();
         var tmp_7 = element_1.p1x();
-        var key = tmp_7.x12(ProbSolve$computeAllSubstitutions$lambda_1(explanationVar));
+        var key = tmp_7.w12(ProbSolve$computeAllSubstitutions$lambda_1(explanationVar));
         // Inline function 'kotlin.collections.getOrPut' call
         var value = destination_0.j2(key);
         var tmp_8;
@@ -3810,8 +3870,8 @@
     }
     return tmp_5;
   };
-  protoOf(ProbSolve).u2k = function (_this__u8e3s4, first, second) {
-    return this.c2x(_this__u8e3s4, first, second);
+  protoOf(ProbSolve).c2l = function (_this__u8e3s4, first, second) {
+    return this.i2x(_this__u8e3s4, first, second);
   };
   var ProbSolve_instance;
   function ProbSolve_getInstance() {
@@ -3831,27 +3891,27 @@
     return it instanceof ProbExplanationTerm;
   }
   function ProbSolveEvidence$computeOne$lambda_2(t) {
-    return t.w3l_1;
+    return t.d3m_1;
   }
   function ProbSolveEvidence() {
     ProbSolveEvidence_instance = this;
     NonBacktrackable_1.call(this, 'prob_solve_evidence');
   }
-  protoOf(ProbSolveEvidence).l2u = function (_this__u8e3s4, first) {
+  protoOf(ProbSolveEvidence).v2u = function (_this__u8e3s4, first) {
     var evidenceIndicator = Companion_instance_4.ofString('evidence', 2);
     if (!_this__u8e3s4.context.v1x().containsIndicator(evidenceIndicator) && !_this__u8e3s4.context.w1x().containsIndicator(evidenceIndicator)) {
-      return _this__u8e3s4.replyWith(Companion_getInstance_9().i2l(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().z3m_1)), VOID, []);
+      return _this__u8e3s4.replyWith(Companion_getInstance_9().q2l(_this__u8e3s4, first, new ProbExplanationTerm(Companion_getInstance_11().g3n_1)), VOID, []);
     }
     var evidenceTermVar = Companion_getInstance_0().of('TermVar');
     var evidenceTruthVar = Companion_getInstance_0().of('TruthVar');
     var subQuery = Companion_getInstance_1().of('evidence', [evidenceTermVar, evidenceTruthVar]);
-    var subOptions = ProbSetConfig_getInstance().s3p(_this__u8e3s4.context).setLimit(-1).setLazy(false);
+    var subOptions = ProbSetConfig_getInstance().z3p(_this__u8e3s4.context).setLimit(-1).setLazy(false);
     // Inline function 'kotlin.sequences.filterIsInstance' call
     var this_0 = _this__u8e3s4.subSolver().solveWithOptions(subQuery, subOptions);
     var tmp = filter(this_0, ProbSolveEvidence$computeOne$lambda);
     var tmp$ret$0 = isInterface(tmp, Sequence) ? tmp : THROW_CCE();
     // Inline function 'kotlin.collections.map' call
-    var this_1 = toList(tmp$ret$0);
+    var this_1 = toList_0(tmp$ret$0);
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_1, 10));
     var _iterator__ex2g4s = this_1.n();
@@ -3861,13 +3921,13 @@
       var term = item.p1x().j2(evidenceTermVar);
       var tmp_0;
       var tmp_1;
-      if (term == null || term.ux() || truth == null) {
+      if (term == null || term.tx() || truth == null) {
         tmp_1 = true;
       } else {
         tmp_1 = !isInterface(truth, Truth);
       }
       if (tmp_1) {
-        tmp_0 = Companion_getInstance_11().y3m_1;
+        tmp_0 = Companion_getInstance_11().f3n_1;
       } else {
         var explanationVar = Companion_getInstance_0().of('EXPL');
         var tmp_2 = Companion_getInstance_1();
@@ -3886,10 +3946,10 @@
         while (iterator.q()) {
           var tmp0 = accumulator;
           var t = iterator.r();
-          accumulator = t.l3n() === 1.0 ? tmp0 : tmp0.l3n() === 1.0 ? t : t.or(tmp0);
+          accumulator = t.s3n() === 1.0 ? tmp0 : tmp0.s3n() === 1.0 ? t : t.or(tmp0);
         }
         var totalExplanation = accumulator;
-        tmp_0 = truth.ww() ? totalExplanation : totalExplanation.not();
+        tmp_0 = truth.vw() ? totalExplanation : totalExplanation.not();
       }
       var tmp$ret$3 = tmp_0;
       destination.l(tmp$ret$3);
@@ -3900,14 +3960,14 @@
     var _iterator__ex2g4s_0 = destination.n();
     while (_iterator__ex2g4s_0.q()) {
       var element = _iterator__ex2g4s_0.r();
-      if (!equals(element, Companion_getInstance_11().y3m_1)) {
+      if (!equals(element, Companion_getInstance_11().f3n_1)) {
         destination_0.l(element);
       }
     }
     var result = destination_0;
     var tmp_6;
     if (result.i()) {
-      tmp_6 = Companion_getInstance_11().z3m_1;
+      tmp_6 = Companion_getInstance_11().g3n_1;
     } else {
       // Inline function 'kotlin.collections.reduce' call
       var iterator_0 = result.n();
@@ -3921,10 +3981,10 @@
       tmp_6 = accumulator_0;
     }
     var resultExplanation = tmp_6;
-    return _this__u8e3s4.replyWith(Companion_getInstance_9().i2l(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation)), VOID, []);
+    return _this__u8e3s4.replyWith(Companion_getInstance_9().q2l(_this__u8e3s4, first, new ProbExplanationTerm(resultExplanation)), VOID, []);
   };
-  protoOf(ProbSolveEvidence).a2o = function (_this__u8e3s4, first) {
-    return this.l2u(_this__u8e3s4, first);
+  protoOf(ProbSolveEvidence).i2o = function (_this__u8e3s4, first) {
+    return this.v2u(_this__u8e3s4, first);
   };
   var ProbSolveEvidence_instance;
   function ProbSolveEvidence_getInstance() {
@@ -3938,22 +3998,22 @@
     };
   }
   function ProbSolveWithEvidence$computeAllSubstitutions$slambda($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation) {
-    this.r3q_1 = $solutions;
-    this.s3q_1 = $goalExplanationVar;
-    this.t3q_1 = $evidenceExplanationTerm;
-    this.u3q_1 = $this_computeAllSubstitutions;
-    this.v3q_1 = $first;
-    this.w3q_1 = $second;
+    this.y3q_1 = $solutions;
+    this.z3q_1 = $goalExplanationVar;
+    this.a3r_1 = $evidenceExplanationTerm;
+    this.b3r_1 = $this_computeAllSubstitutions;
+    this.c3r_1 = $first;
+    this.d3r_1 = $second;
     CoroutineImpl.call(this, resultContinuation);
   }
-  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).x31 = function ($this$sequence, $completion) {
-    var tmp = this.y31($this$sequence, $completion);
+  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).a32 = function ($this$sequence, $completion) {
+    var tmp = this.b32($this$sequence, $completion);
     tmp.r8_1 = Unit_instance;
     tmp.s8_1 = null;
     return tmp.x8();
   };
   protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).o9 = function (p1, $completion) {
-    return this.x31(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
+    return this.a32(p1 instanceof SequenceScope ? p1 : THROW_CCE(), $completion);
   };
   protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).x8 = function () {
     var suspendResult = this.r8_1;
@@ -3963,26 +4023,26 @@
         switch (tmp) {
           case 0:
             this.q8_1 = 6;
-            this.y3q_1 = this.r3q_1.n();
+            this.f3r_1 = this.y3q_1.n();
             this.p8_1 = 1;
             continue $sm;
           case 1:
-            if (!this.y3q_1.q()) {
+            if (!this.f3r_1.q()) {
               this.p8_1 = 5;
               continue $sm;
             }
 
-            var solution = this.y3q_1.r();
-            if (solution.n1z())
-              throw ensureNotNull(solution.l1z());
-            var goalExplanationTerm = solution.p1x().j2(this.s3q_1);
+            var solution = this.f3r_1.r();
+            if (solution.o1z())
+              throw ensureNotNull(solution.m1z());
+            var goalExplanationTerm = solution.p1x().j2(this.z3q_1);
             var tmp_0;
             var tmp_1;
             var tmp_2;
-            if (this.t3q_1 == null) {
+            if (this.a3r_1 == null) {
               tmp_2 = true;
             } else {
-              var tmp_3 = this.t3q_1;
+              var tmp_3 = this.a3r_1;
               tmp_2 = !(tmp_3 instanceof ProbExplanationTerm);
             }
 
@@ -4000,19 +4060,19 @@
 
             if (tmp_0) {
               this.p8_1 = 3;
-              suspendResult = this.x3q_1.te(Companion_getInstance_5().failed(), this);
+              suspendResult = this.e3r_1.se(Companion_getInstance_5().failed(), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
               continue $sm;
             } else {
-              var explanationWithEvidenceTerm = new ProbExplanationTerm(goalExplanationTerm.w3l_1.and(this.t3q_1.w3l_1));
+              var explanationWithEvidenceTerm = new ProbExplanationTerm(goalExplanationTerm.d3m_1.and(this.a3r_1.d3m_1));
               this.p8_1 = 2;
               var tmp_4 = Companion_getInstance_5();
-              var tmp_5 = Companion_getInstance_9().i2l(this.u3q_1, this.v3q_1, explanationWithEvidenceTerm);
-              var tmp_6 = Companion_getInstance_9().i2l(this.u3q_1, this.w3q_1, this.t3q_1);
+              var tmp_5 = Companion_getInstance_9().q2l(this.b3r_1, this.c3r_1, explanationWithEvidenceTerm);
+              var tmp_6 = Companion_getInstance_9().q2l(this.b3r_1, this.d3r_1, this.a3r_1);
               var tmp_7 = solution.p1x();
-              suspendResult = this.x3q_1.te(tmp_4.ofSubstitution(tmp_5, [tmp_6, tmp_7.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.s3q_1))]), this);
+              suspendResult = this.e3r_1.se(tmp_4.ofSubstitution(tmp_5, [tmp_6, tmp_7.filter(ProbSolveWithEvidence$computeAllSubstitutions$slambda$lambda(this.z3q_1))]), this);
               if (suspendResult === get_COROUTINE_SUSPENDED()) {
                 return suspendResult;
               }
@@ -4044,34 +4104,34 @@
       }
      while (true);
   };
-  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).y31 = function ($this$sequence, completion) {
-    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.r3q_1, this.s3q_1, this.t3q_1, this.u3q_1, this.v3q_1, this.w3q_1, completion);
-    i.x3q_1 = $this$sequence;
+  protoOf(ProbSolveWithEvidence$computeAllSubstitutions$slambda).b32 = function ($this$sequence, completion) {
+    var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda(this.y3q_1, this.z3q_1, this.a3r_1, this.b3r_1, this.c3r_1, this.d3r_1, completion);
+    i.e3r_1 = $this$sequence;
     return i;
   };
   function ProbSolveWithEvidence$computeAllSubstitutions$slambda_0($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation) {
     var i = new ProbSolveWithEvidence$computeAllSubstitutions$slambda($solutions, $goalExplanationVar, $evidenceExplanationTerm, $this_computeAllSubstitutions, $first, $second, resultContinuation);
     return constructCallableReference(function ($this$sequence, $completion) {
-      return i.x31($this$sequence, $completion);
+      return i.a32($this$sequence, $completion);
     }, 1);
   }
   function ProbSolveWithEvidence() {
     ProbSolveWithEvidence_instance = this;
     WithoutSideEffects.call(this, 'prob_solve_with_evidence');
   }
-  protoOf(ProbSolveWithEvidence).w2u = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_9().o2l(_this__u8e3s4, 2);
-    Companion_getInstance_9().u2l(_this__u8e3s4, 2);
+  protoOf(ProbSolveWithEvidence).d2v = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_9().w2l(_this__u8e3s4, 2);
+    Companion_getInstance_9().c2m(_this__u8e3s4, 2);
     var evidenceExplanationVar = Companion_getInstance_0().of('EvidenceExplanation');
     var tmp;
-    if (ProbSetConfig_getInstance().g3o(_this__u8e3s4.context)) {
-      tmp = toTerm(Companion_getInstance_11().z3m_1);
+    if (ProbSetConfig_getInstance().n3o(_this__u8e3s4.context)) {
+      tmp = toTerm(Companion_getInstance_11().g3n_1);
     } else {
       var tmp_0 = Companion_getInstance_1();
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
       var tmp$ret$0 = ProbSolveEvidence_getInstance().signature.name;
       var subQuery = tmp_0.of(tmp$ret$0, [evidenceExplanationVar]);
-      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().s3p(_this__u8e3s4.context));
+      var solution = _this__u8e3s4.subSolver().solveOnceWithOptions(subQuery, ProbSetConfig_getInstance().z3p(_this__u8e3s4.context));
       tmp = solution.p1x().j2(evidenceExplanationVar);
     }
     var evidenceExplanationTerm = tmp;
@@ -4080,11 +4140,11 @@
     var tmp_2 = Companion_getInstance_1();
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$1 = ProbSolve_getInstance().signature.name;
-    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().s3p(_this__u8e3s4.context));
+    var solutions = tmp_1.solveWithOptions(tmp_2.of(tmp$ret$1, [goalExplanationVar, third]), ProbSetConfig_getInstance().z3p(_this__u8e3s4.context));
     return sequence(ProbSolveWithEvidence$computeAllSubstitutions$slambda_0(solutions, goalExplanationVar, evidenceExplanationTerm, _this__u8e3s4, first, second, null));
   };
-  protoOf(ProbSolveWithEvidence).n2n = function (_this__u8e3s4, first, second, third) {
-    return this.w2u(_this__u8e3s4, first, second, third);
+  protoOf(ProbSolveWithEvidence).v2n = function (_this__u8e3s4, first, second, third) {
+    return this.d2v(_this__u8e3s4, first, second, third);
   };
   var ProbSolveWithEvidence_instance;
   function ProbSolveWithEvidence_getInstance() {
@@ -4096,10 +4156,10 @@
     Prob_instance = this;
     RuleWrapper_init_$Init$('prob', 2, VOID, this);
   }
-  protoOf(Prob).g2o = function (_this__u8e3s4) {
+  protoOf(Prob).o2o = function (_this__u8e3s4) {
     return listOf_0([_this__u8e3s4.varOf('EXPL'), _this__u8e3s4.varOf('GOAL')]);
   };
-  protoOf(Prob).h2o = function (_this__u8e3s4) {
+  protoOf(Prob).p2o = function (_this__u8e3s4) {
     var expl = _this__u8e3s4.varOf('EXPL');
     var goal = _this__u8e3s4.varOf('GOAL');
     var newGoal = _this__u8e3s4.varOf('NEW_GOAL');
@@ -4116,7 +4176,7 @@
     return Prob_instance;
   }
   //region block: post-declaration
-  protoOf(ProblogSolver).copy = copy;
+  protoOf(ProblogSolver).b1z = copy$default;
   protoOf(MutableProblogSolver).loadStaticClauses = loadStaticClauses;
   protoOf(MutableProblogSolver).loadStaticClausesIterable = loadStaticClausesIterable;
   protoOf(MutableProblogSolver).loadStaticClausesSequence = loadStaticClausesSequence;
@@ -4128,22 +4188,22 @@
   protoOf(ProblogSolverFactory).mutableSolverOf = mutableSolverOf;
   protoOf(ProblogSolverFactory).rawMutableSolverOf = rawMutableSolverOf;
   protoOf(ProblogSolverFactory).newBuilder = newBuilder;
-  protoOf(ProblogSolverFactory).a21 = get_defaultRuntime;
-  protoOf(ProblogSolverFactory).c21 = get_defaultUnificator;
-  protoOf(ProblogSolverFactory).g21 = get_defaultStaticKb;
-  protoOf(ProblogSolverFactory).h21 = get_defaultDynamicKb;
-  protoOf(ProblogSolverFactory).i21 = get_defaultInputChannel;
-  protoOf(ProblogSolverFactory).j21 = get_defaultOutputChannel;
-  protoOf(ProblogSolverFactory).k21 = get_defaultErrorChannel;
-  protoOf(ProblogSolverFactory).l21 = get_defaultWarningsChannel;
-  protoOf(ProblogSolverFactory).t21 = solverWithDefaultBuiltins;
+  protoOf(ProblogSolverFactory).b21 = get_defaultRuntime;
+  protoOf(ProblogSolverFactory).d21 = get_defaultUnificator;
+  protoOf(ProblogSolverFactory).h21 = get_defaultStaticKb;
+  protoOf(ProblogSolverFactory).i21 = get_defaultDynamicKb;
+  protoOf(ProblogSolverFactory).j21 = get_defaultInputChannel;
+  protoOf(ProblogSolverFactory).k21 = get_defaultOutputChannel;
+  protoOf(ProblogSolverFactory).l21 = get_defaultErrorChannel;
+  protoOf(ProblogSolverFactory).m21 = get_defaultWarningsChannel;
+  protoOf(ProblogSolverFactory).u21 = solverWithDefaultBuiltins;
   protoOf(ProblogSolverFactory).solverWithDefaultBuiltinsAnd = solverWithDefaultBuiltinsAnd;
-  protoOf(ProblogSolverFactory).v21 = mutableSolverWithDefaultBuiltins;
+  protoOf(ProblogSolverFactory).w21 = mutableSolverWithDefaultBuiltins;
   protoOf(ProblogSolverFactory).mutableSolverWithDefaultBuiltinsAnd = mutableSolverWithDefaultBuiltinsAnd;
   defineProp(protoOf(ClauseMappingException), 'message', function () {
     return this.p1();
   });
-  protoOf(BinaryDecisionDiagramExplanation).m3n = get_probabilityOrNull;
+  protoOf(BinaryDecisionDiagramExplanation).t3n = get_probabilityOrNull;
   //endregion
   //region block: init
   ProblogSolverFactory_instance = new ProblogSolverFactory();