@tuprolog/2p-full 1.3.1 → 1.4.0

package/2p-core.js

@@ -110,6 +110,9 @@
   var initMetadataForObject = kotlin_kotlin.$_$.f6;
   var compareTo = kotlin_kotlin.$_$.q5;
   var Enum = kotlin_kotlin.$_$.ea;
+  var joinToString = kotlin_kotlin.$_$.t2;
+  var getBooleanHashCode = kotlin_kotlin.$_$.v5;
+  var getStringHashCode = kotlin_kotlin.$_$.y5;
   var noWhenBranchMatchedException = kotlin_kotlin.$_$.ua;
   var Regex_init_$Create$ = kotlin_kotlin.$_$.t;
   var toString_1 = kotlin_kotlin.$_$.g;
@@ -130,17 +133,16 @@
   var asSequence_1 = kotlin_kotlin.$_$.m7;
   var last_0 = kotlin_kotlin.$_$.f8;
   var take = kotlin_kotlin.$_$.s8;
-  var joinToString = kotlin_kotlin.$_$.d8;
+  var joinToString_0 = kotlin_kotlin.$_$.d8;
   var setTags = kotlin_it_unibo_tuprolog_utils.$_$.i1;
-  var getStringHashCode = kotlin_kotlin.$_$.y5;
   var forceCast = kotlin_it_unibo_tuprolog_utils.$_$.z;
   var itemWiseHashCode = kotlin_it_unibo_tuprolog_utils.$_$.d1;
-  var joinToString_0 = kotlin_kotlin.$_$.t2;
   var plus_1 = kotlin_kotlin.$_$.u3;
   var get_indices = kotlin_kotlin.$_$.s2;
   var IndexOutOfBoundsException_init_$Create$ = kotlin_kotlin.$_$.g1;
   var copyToArray = kotlin_kotlin.$_$.i2;
   var numberToChar = kotlin_kotlin.$_$.m6;
+  var charSequenceLength = kotlin_kotlin.$_$.p5;
   var mutableMapOf = kotlin_kotlin.$_$.n3;
   var drop = kotlin_kotlin.$_$.q7;
   var first_0 = kotlin_kotlin.$_$.x7;
@@ -1402,6 +1404,7 @@
   initMetadataForClass(VarFormat, 'VarFormat', VOID, Enum);
   initMetadataForClass(OpFormat, 'OpFormat', VOID, Enum);
   initMetadataForClass(FuncFormat, 'FuncFormat', VOID, Enum);
+  initMetadataForClass(TagsFormattingOptions, 'TagsFormattingOptions', TagsFormattingOptions);
   initMetadataForCompanion(Companion_20);
   function format(value) {
     return value.accept(this);
@@ -1419,7 +1422,7 @@
     return this;
   }
   function asTruth_1() {
-    return this.w11();
+    return this.j12();
   }
   function asAtom_4() {
     return this.cu();
@@ -1451,7 +1454,7 @@
     return this;
   }
   function asTuple_1() {
-    return this.b12();
+    return this.o12();
   }
   function toArray_4() {
     return this.ev();
@@ -1497,7 +1500,7 @@
     return this;
   }
   function asVar_1() {
-    return this.k12();
+    return this.x12();
   }
   function castTo_20() {
     return this.ru();
@@ -3566,6 +3569,21 @@
     FuncFormat_QUOTED_IF_NECESSARY_instance = new FuncFormat('QUOTED_IF_NECESSARY', 0);
     FuncFormat_LITERAL_instance = new FuncFormat('LITERAL', 1);
   }
+  function TermFormatter$TagsFormattingOptions$_init_$lambda_rws01d(it) {
+    return true;
+  }
+  function TermFormatter$TagsFormattingOptions$formatTags$lambda(this$0) {
+    return function (_destruct__k2r9zo) {
+      // Inline function 'kotlin.collections.component1' call
+      var key = _destruct__k2r9zo.d2();
+      // Inline function 'kotlin.collections.component2' call
+      var value = _destruct__k2r9zo.e2();
+      var tmp0_safe_receiver = this$0.y11_1;
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.format(value);
+      var formattedValue = tmp1_elvis_lhs == null ? toString(value) : tmp1_elvis_lhs;
+      return this$0.v11_1 ? key + '=' + formattedValue : formattedValue;
+    };
+  }
   function VarFormat(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
@@ -3575,66 +3593,167 @@
   function FuncFormat(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
+  function TagsFormattingOptions(showTags, delimiters, separator, showKeys, showDelimitersIfEmpty, keyFilter, tagFormatter) {
+    showTags = showTags === VOID ? false : showTags;
+    delimiters = delimiters === VOID ? to('<', '>') : delimiters;
+    separator = separator === VOID ? ', ' : separator;
+    showKeys = showKeys === VOID ? true : showKeys;
+    showDelimitersIfEmpty = showDelimitersIfEmpty === VOID ? false : showDelimitersIfEmpty;
+    var tmp;
+    if (keyFilter === VOID) {
+      tmp = TermFormatter$TagsFormattingOptions$_init_$lambda_rws01d;
+    } else {
+      tmp = keyFilter;
+    }
+    keyFilter = tmp;
+    tagFormatter = tagFormatter === VOID ? null : tagFormatter;
+    this.s11_1 = showTags;
+    this.t11_1 = delimiters;
+    this.u11_1 = separator;
+    this.v11_1 = showKeys;
+    this.w11_1 = showDelimitersIfEmpty;
+    this.x11_1 = keyFilter;
+    this.y11_1 = tagFormatter;
+  }
+  protoOf(TagsFormattingOptions).z11 = function (tags) {
+    if (!this.s11_1)
+      return '';
+    // Inline function 'kotlin.collections.filterKeys' call
+    var predicate = this.x11_1;
+    var result = LinkedHashMap_init_$Create$();
+    // Inline function 'kotlin.collections.iterator' call
+    var _iterator__ex2g4s = tags.d1().n();
+    while (_iterator__ex2g4s.q()) {
+      var entry = _iterator__ex2g4s.r();
+      if (predicate(entry.d2())) {
+        result.k4(entry.d2(), entry.e2());
+      }
+    }
+    var filteredTags = result;
+    if (filteredTags.h()) {
+      return this.w11_1 ? this.t11_1.first + this.t11_1.second : '';
+    }
+    var tmp = filteredTags.d1();
+    var formattedTags = joinToString(tmp, this.u11_1, VOID, VOID, VOID, VOID, TermFormatter$TagsFormattingOptions$formatTags$lambda(this));
+    return this.t11_1.first + formattedTags + this.t11_1.second;
+  };
+  protoOf(TagsFormattingOptions).toString = function () {
+    return 'TagsFormattingOptions(showTags=' + this.s11_1 + ', delimiters=' + this.t11_1.toString() + ', separator=' + this.u11_1 + ', showKeys=' + this.v11_1 + ', showDelimitersIfEmpty=' + this.w11_1 + ', keyFilter=' + toString(this.x11_1) + ', tagFormatter=' + toString_0(this.y11_1) + ')';
+  };
+  protoOf(TagsFormattingOptions).hashCode = function () {
+    var result = getBooleanHashCode(this.s11_1);
+    result = imul(result, 31) + this.t11_1.hashCode() | 0;
+    result = imul(result, 31) + getStringHashCode(this.u11_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.v11_1) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.w11_1) | 0;
+    result = imul(result, 31) + hashCode(this.x11_1) | 0;
+    result = imul(result, 31) + (this.y11_1 == null ? 0 : hashCode(this.y11_1)) | 0;
+    return result;
+  };
+  protoOf(TagsFormattingOptions).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof TagsFormattingOptions))
+      return false;
+    if (!(this.s11_1 === other.s11_1))
+      return false;
+    if (!this.t11_1.equals(other.t11_1))
+      return false;
+    if (!(this.u11_1 === other.u11_1))
+      return false;
+    if (!(this.v11_1 === other.v11_1))
+      return false;
+    if (!(this.w11_1 === other.w11_1))
+      return false;
+    if (!equals(this.x11_1, other.x11_1))
+      return false;
+    if (!equals(this.y11_1, other.y11_1))
+      return false;
+    return true;
+  };
   function Companion_20() {
   }
-  protoOf(Companion_20).s11 = function (varFormat, opFormat, funcFormat, numberVars, operators) {
+  protoOf(Companion_20).a12 = function (varFormat, opFormat, funcFormat, numberVars, operators, tagsOptions) {
     var quoted = funcFormat.equals(FuncFormat_QUOTED_IF_NECESSARY_getInstance());
     var ignoreOps = opFormat.equals(OpFormat_IGNORE_OPERATORS_getInstance());
     var tmp;
     switch (varFormat.l2_1) {
       case 0:
-        tmp = new SimpleTermFormatter(quoted, numberVars, ignoreOps);
+        tmp = new SimpleTermFormatter(quoted, numberVars, ignoreOps, tagsOptions);
         break;
       case 1:
-        tmp = new TermFormatterWithAnonymousVariables(quoted, numberVars, ignoreOps);
+        tmp = new TermFormatterWithAnonymousVariables(quoted, numberVars, ignoreOps, tagsOptions);
         break;
       case 2:
-        tmp = new TermFormatterWithPrettyVariables(quoted, numberVars, ignoreOps);
+        tmp = new TermFormatterWithPrettyVariables(quoted, numberVars, ignoreOps, tagsOptions);
         break;
       default:
         noWhenBranchMatchedException();
         break;
     }
     var inner = tmp;
-    return opFormat.l2_1 === 2 ? TermFormatterWithPrettyExpressions_init_$Create$(inner, operators, quoted, numberVars, ignoreOps) : inner;
+    return opFormat.l2_1 === 2 ? TermFormatterWithPrettyExpressions_init_$Create$(inner, operators, quoted, numberVars, ignoreOps, tagsOptions) : inner;
   };
-  protoOf(Companion_20).of = function (varFormat, opFormat, funcFormat, numberVars, operators, $super) {
+  protoOf(Companion_20).of = function (varFormat, opFormat, funcFormat, numberVars, operators, tagsOptions, $super) {
     funcFormat = funcFormat === VOID ? FuncFormat_QUOTED_IF_NECESSARY_getInstance() : funcFormat;
     numberVars = numberVars === VOID ? false : numberVars;
     operators = operators === VOID ? Companion_getInstance_33().DEFAULT : operators;
-    return $super === VOID ? this.s11(varFormat, opFormat, funcFormat, numberVars, operators) : $super.s11.call(this, varFormat, opFormat, funcFormat, numberVars, operators);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.a12(varFormat, opFormat, funcFormat, numberVars, operators, tagsOptions) : $super.a12.call(this, varFormat, opFormat, funcFormat, numberVars, operators, tagsOptions);
   };
-  protoOf(Companion_20).t11 = function (operators) {
-    return this.s11(VarFormat_UNDERSCORE_getInstance(), OpFormat_EXPRESSIONS_getInstance(), FuncFormat_LITERAL_getInstance(), true, operators);
+  protoOf(Companion_20).b12 = function (operators, tagsOptions) {
+    return this.a12(VarFormat_UNDERSCORE_getInstance(), OpFormat_EXPRESSIONS_getInstance(), FuncFormat_LITERAL_getInstance(), true, operators, tagsOptions);
   };
-  protoOf(Companion_20).default = function (operators, $super) {
+  protoOf(Companion_20).default = function (operators, tagsOptions, $super) {
     operators = operators === VOID ? Companion_getInstance_33().DEFAULT : operators;
-    return $super === VOID ? this.t11(operators) : $super.t11.call(this, operators);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions(true) : tagsOptions;
+    return $super === VOID ? this.b12(operators, tagsOptions) : $super.b12.call(this, operators, tagsOptions);
   };
   protoOf(Companion_20).canonical = function () {
     return this.of(VarFormat_UNDERSCORE_getInstance(), OpFormat_IGNORE_OPERATORS_getInstance(), FuncFormat_QUOTED_IF_NECESSARY_getInstance(), false);
   };
-  protoOf(Companion_20).u11 = function (operators) {
-    return this.s11(VarFormat_PRETTY_getInstance(), OpFormat_EXPRESSIONS_getInstance(), FuncFormat_QUOTED_IF_NECESSARY_getInstance(), true, operators);
+  protoOf(Companion_20).c12 = function (operators, tagsOptions) {
+    return this.a12(VarFormat_PRETTY_getInstance(), OpFormat_EXPRESSIONS_getInstance(), FuncFormat_QUOTED_IF_NECESSARY_getInstance(), true, operators, tagsOptions);
   };
-  protoOf(Companion_20).readable = function (operators, $super) {
+  protoOf(Companion_20).readable = function (operators, tagsOptions, $super) {
     operators = operators === VOID ? Companion_getInstance_33().DEFAULT : operators;
-    return $super === VOID ? this.u11(operators) : $super.u11.call(this, operators);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.c12(operators, tagsOptions) : $super.c12.call(this, operators, tagsOptions);
+  };
+  protoOf(Companion_20).d12 = function (tagsOptions) {
+    return this.of(VarFormat_PRETTY_getInstance(), OpFormat_COLLECTIONS_getInstance(), VOID, VOID, VOID, tagsOptions);
+  };
+  protoOf(Companion_20).prettyVariables = function (tagsOptions, $super) {
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.d12(tagsOptions) : $super.d12.call(this, tagsOptions);
+  };
+  protoOf(Companion_20).e12 = function (prettyVariables, operatorSet, tagsOptions) {
+    return this.of(prettyVariables ? VarFormat_PRETTY_getInstance() : VarFormat_COMPLETE_NAME_getInstance(), OpFormat_EXPRESSIONS_getInstance(), VOID, VOID, operatorSet, tagsOptions);
+  };
+  protoOf(Companion_20).prettyExpressions = function (prettyVariables, operatorSet, tagsOptions, $super) {
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.e12(prettyVariables, operatorSet, tagsOptions) : $super.e12.call(this, prettyVariables, operatorSet, tagsOptions);
   };
-  protoOf(Companion_20).prettyVariables = function () {
-    return this.of(VarFormat_PRETTY_getInstance(), OpFormat_COLLECTIONS_getInstance());
+  protoOf(Companion_20).f12 = function (operatorSet, tagsOptions) {
+    return this.e12(true, operatorSet, tagsOptions);
   };
-  protoOf(Companion_20).prettyExpressions = function (prettyVariables, operatorSet) {
-    return this.of(prettyVariables ? VarFormat_PRETTY_getInstance() : VarFormat_COMPLETE_NAME_getInstance(), OpFormat_EXPRESSIONS_getInstance(), VOID, VOID, operatorSet);
+  protoOf(Companion_20).prettyExpressionsPrettyVariables = function (operatorSet, tagsOptions, $super) {
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.f12(operatorSet, tagsOptions) : $super.f12.call(this, operatorSet, tagsOptions);
   };
-  protoOf(Companion_20).prettyExpressionsPrettyVariables = function (operatorSet) {
-    return this.prettyExpressions(true, operatorSet);
+  protoOf(Companion_20).g12 = function (prettyVariables, tagsOptions) {
+    return this.e12(prettyVariables, Companion_getInstance_33().DEFAULT, tagsOptions);
   };
-  protoOf(Companion_20).prettyExpressionsDefaultOperators = function (prettyVariables) {
-    return this.prettyExpressions(prettyVariables, Companion_getInstance_33().DEFAULT);
+  protoOf(Companion_20).prettyExpressionsDefaultOperators = function (prettyVariables, tagsOptions, $super) {
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.g12(prettyVariables, tagsOptions) : $super.g12.call(this, prettyVariables, tagsOptions);
   };
-  protoOf(Companion_20).prettyExpressionsPrettyVariablesDefaultOperators = function () {
-    return this.prettyExpressions(true, Companion_getInstance_33().DEFAULT);
+  protoOf(Companion_20).h12 = function (tagsOptions) {
+    return this.e12(true, Companion_getInstance_33().DEFAULT, tagsOptions);
+  };
+  protoOf(Companion_20).prettyExpressionsPrettyVariablesDefaultOperators = function (tagsOptions, $super) {
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    return $super === VOID ? this.h12(tagsOptions) : $super.h12.call(this, tagsOptions);
   };
   var Companion_instance_21;
   function Companion_getInstance_22() {
@@ -3770,10 +3889,10 @@
     return Companion_getInstance_23().ot_1;
   }
   function Companion_22() {
-    this.x11_1 = ',';
+    this.k12_1 = ',';
   }
-  protoOf(Companion_22).y11 = function (terms, ifEmpty) {
-    return this.z11(asIterable(terms), ifEmpty);
+  protoOf(Companion_22).l12 = function (terms, ifEmpty) {
+    return this.m12(asIterable(terms), ifEmpty);
   };
   protoOf(Companion_22).wrapIfNeeded = function (terms, ifEmpty, $super) {
     var tmp;
@@ -3783,9 +3902,9 @@
       tmp = ifEmpty;
     }
     ifEmpty = tmp;
-    return $super === VOID ? this.y11(terms, ifEmpty) : $super.y11.call(this, terms, ifEmpty);
+    return $super === VOID ? this.l12(terms, ifEmpty) : $super.l12.call(this, terms, ifEmpty);
   };
-  protoOf(Companion_22).z11 = function (terms, ifEmpty) {
+  protoOf(Companion_22).m12 = function (terms, ifEmpty) {
     var i = terms.n();
     if (!i.q())
       return ifEmpty();
@@ -3806,10 +3925,10 @@
       tmp = ifEmpty;
     }
     ifEmpty = tmp;
-    return $super === VOID ? this.z11(terms, ifEmpty) : $super.z11.call(this, terms, ifEmpty);
+    return $super === VOID ? this.m12(terms, ifEmpty) : $super.m12.call(this, terms, ifEmpty);
   };
-  protoOf(Companion_22).a12 = function (terms, ifEmpty) {
-    return this.z11(asIterable_0(terms), ifEmpty);
+  protoOf(Companion_22).n12 = function (terms, ifEmpty) {
+    return this.m12(asIterable_0(terms), ifEmpty);
   };
   protoOf(Companion_22).wrapSequenceIfNeeded = function (terms, ifEmpty, $super) {
     var tmp;
@@ -3819,7 +3938,7 @@
       tmp = ifEmpty;
     }
     ifEmpty = tmp;
-    return $super === VOID ? this.a12(terms, ifEmpty) : $super.a12.call(this, terms, ifEmpty);
+    return $super === VOID ? this.n12(terms, ifEmpty) : $super.n12.call(this, terms, ifEmpty);
   };
   protoOf(Companion_22).of = function (left, right) {
     return new TupleImpl(left, right);
@@ -3856,17 +3975,17 @@
   function Tuple() {
   }
   function TupleIterator$tupleIteratorVisitor$1(this$0) {
-    this.c12_1 = this$0;
+    this.p12_1 = this$0;
   }
   protoOf(TupleIterator$tupleIteratorVisitor$1).mv = function (term) {
-    this.c12_1.e12_1 = term.qv();
+    this.p12_1.r12_1 = term.qv();
     return term.rv();
   };
   protoOf(TupleIterator$tupleIteratorVisitor$1).visitTuple = function (term) {
     return this.mv(term);
   };
   protoOf(TupleIterator$tupleIteratorVisitor$1).sv = function (term) {
-    this.c12_1.e12_1 = null;
+    this.p12_1.r12_1 = null;
     return term;
   };
   protoOf(TupleIterator$tupleIteratorVisitor$1).defaultValue = function (term) {
@@ -3874,15 +3993,15 @@
   };
   function TupleIterator(tuple) {
     var tmp = this;
-    tmp.d12_1 = new TupleIterator$tupleIteratorVisitor$1(this);
-    this.e12_1 = tuple;
+    tmp.q12_1 = new TupleIterator$tupleIteratorVisitor$1(this);
+    this.r12_1 = tuple;
   }
   protoOf(TupleIterator).q = function () {
-    return !(this.e12_1 == null);
+    return !(this.r12_1 == null);
   };
   protoOf(TupleIterator).r = function () {
-    var tmp0_safe_receiver = this.e12_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.d12_1);
+    var tmp0_safe_receiver = this.r12_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.q12_1);
     var tmp;
     if (tmp1_elvis_lhs == null) {
       throw NoSuchElementException_init_$Create$();
@@ -3893,8 +4012,8 @@
   };
   function Companion_23() {
     Companion_instance_24 = this;
-    this.f12_1 = '_';
-    this.g12_1 = Terms_getInstance().us_1;
+    this.s12_1 = '_';
+    this.t12_1 = Terms_getInstance().us_1;
   }
   protoOf(Companion_23).of = function (name) {
     return new VarImpl(name);
@@ -3926,12 +4045,12 @@
   }
   function Companion_24() {
   }
-  protoOf(Companion_24).l12 = function (scope) {
+  protoOf(Companion_24).y12 = function (scope) {
     return new VariablesProviderImpl(scope);
   };
   protoOf(Companion_24).of = function (scope, $super) {
     scope = scope === VOID ? Companion_instance_16.empty() : scope;
-    return $super === VOID ? this.l12(scope) : $super.l12.call(this, scope);
+    return $super === VOID ? this.y12(scope) : $super.y12.call(this, scope);
   };
   var Companion_instance_25;
   function Companion_getInstance_26() {
@@ -3941,7 +4060,7 @@
     cause = cause === VOID ? null : cause;
     SubstitutionException_init_$Init$(substitution, message, cause, $this);
     SubstitutionApplicationException.call($this);
-    $this.n12_1 = term;
+    $this.a13_1 = term;
     return $this;
   }
   function SubstitutionApplicationException_init_$Init$_0(term, substitution, cause, $this) {
@@ -3964,7 +4083,7 @@
     cause = cause === VOID ? null : cause;
     TuPrologException_init_$Init$(message, cause, $this);
     SubstitutionException.call($this);
-    $this.o12_1 = substitution;
+    $this.b13_1 = substitution;
     return $this;
   }
   function SubstitutionException_init_$Init$_0(substitution, cause, $this) {
@@ -4029,17 +4148,17 @@
     captureStack(this, TuPrologException);
   }
   function Companion_26() {
-    this.p12_1 = 100;
+    this.c13_1 = 100;
   }
   var Companion_instance_27;
   function Companion_getInstance_28() {
     return Companion_instance_27;
   }
   function AbstractCons$unfoldedSequence$$inlined$Iterable$1(this$0) {
-    this.q12_1 = this$0;
+    this.d13_1 = this$0;
   }
   protoOf(AbstractCons$unfoldedSequence$$inlined$Iterable$1).n = function () {
-    return new All(this.q12_1);
+    return new All(this.d13_1);
   };
   function AbstractCons$isWellFormed$delegate$lambda(this$0) {
     return function () {
@@ -4052,17 +4171,17 @@
     }, 1, 0, 5);
   }
   function AbstractCons$unfold$$inlined$Iterable$1(this$0) {
-    this.y12_1 = this$0;
+    this.l13_1 = this$0;
   }
   protoOf(AbstractCons$unfold$$inlined$Iterable$1).n = function () {
-    return new ListUnfolder(this.y12_1);
+    return new ListUnfolder(this.l13_1);
   };
   function AbstractCons(args, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     RecursiveImpl.call(this, '.', args, tags);
-    this.w12_1 = '.';
+    this.j13_1 = '.';
     var tmp = this;
-    tmp.x12_1 = lazy(AbstractCons$isWellFormed$delegate$lambda(this));
+    tmp.k13_1 = lazy(AbstractCons$isWellFormed$delegate$lambda(this));
   }
   protoOf(AbstractCons).ww = function () {
     return 1;
@@ -4073,22 +4192,22 @@
     return asSequence_0(tmp$ret$0);
   };
   protoOf(AbstractCons).xt = function () {
-    return this.w12_1;
+    return this.j13_1;
   };
   protoOf(AbstractCons).nw = function () {
-    var tmp0 = this.x12_1;
+    var tmp0 = this.k13_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('isWellFormed', 1, tmp, AbstractCons$_get_isWellFormed_$ref_h49uq8(), null);
     return tmp0.e2();
   };
-  protoOf(AbstractCons).z12 = function () {
+  protoOf(AbstractCons).m13 = function () {
     // Inline function 'kotlin.collections.Iterable' call
     var tmp$ret$0 = new AbstractCons$unfold$$inlined$Iterable$1(this);
     return asSequence_0(tmp$ret$0);
   };
   protoOf(AbstractCons).unfold = function () {
-    return this.z12();
+    return this.m13();
   };
   protoOf(AbstractCons).t4 = function () {
     return this.nw() ? sliceArray(this.ev(), until(0, get_lastIndex_0(this.ev()))) : this.ev();
@@ -4118,7 +4237,7 @@
     var _destruct__k2r9zo = tmp;
     var ending = _destruct__k2r9zo.oc();
     var take_0 = _destruct__k2r9zo.pc();
-    return joinToString(take(this.hv(), take_0), ', ', '[', ending);
+    return joinToString_0(take(this.hv(), take_0), ', ', '[', ending);
   };
   protoOf(AbstractCons).au = function () {
     return protoOf(RecursiveImpl).au.call(this).castToCons();
@@ -4132,11 +4251,11 @@
   protoOf(AbstractCons).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(AbstractCons).i13 = function (visitor) {
+  protoOf(AbstractCons).v13 = function (visitor) {
     return visitor.visitCons(this);
   };
   protoOf(AbstractCons).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(AbstractCons).ep = function () {
     return this.ru();
@@ -4163,7 +4282,7 @@
       return false;
     if (!($this.rt() === other.rt()))
       return false;
-    if (!$this.m13(other, useVarCompleteName))
+    if (!$this.z13(other, useVarCompleteName))
       return false;
     return true;
   }
@@ -4176,33 +4295,33 @@
     return function () {
       var result = getStringHashCode(this$0.xt());
       result = imul(31, result) + this$0.rt() | 0;
-      result = imul(31, result) + this$0.k13() | 0;
+      result = imul(31, result) + this$0.x13() | 0;
       return result;
     };
   }
   function AbstractStruct$_get_hashCodeCache_$ref_897o98() {
     return constructCallableReference(function (p0) {
-      return p0.t13();
+      return p0.g14();
     }, 1, 0, 6);
   }
   function AbstractStruct(functor, args, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     TermImpl.call(this, tags);
-    this.o13_1 = functor;
-    this.p13_1 = args;
+    this.b14_1 = functor;
+    this.c14_1 = args;
     var tmp = this;
-    tmp.q13_1 = lazy(AbstractStruct$hashCodeCache$delegate$lambda(this));
+    tmp.d14_1 = lazy(AbstractStruct$hashCodeCache$delegate$lambda(this));
   }
   protoOf(AbstractStruct).xt = function () {
-    return this.o13_1;
+    return this.b14_1;
   };
   protoOf(AbstractStruct).yt = function () {
-    return this.p13_1;
+    return this.c14_1;
   };
   protoOf(AbstractStruct).bv = function () {
-    return this.j13();
+    return this.w13();
   };
-  protoOf(AbstractStruct).j13 = function () {
+  protoOf(AbstractStruct).w13 = function () {
     return none(this.zt());
   };
   protoOf(AbstractStruct).au = function () {
@@ -4225,21 +4344,21 @@
   protoOf(AbstractStruct).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(AbstractStruct).r13 = function (other) {
+  protoOf(AbstractStruct).e14 = function (other) {
     var tmp;
     if (other.du()) {
       // Inline function 'kotlin.let' call
       var it = other.castToStruct();
-      tmp = (this.xt() === it.xt() && this.rt() === it.rt() && this.l13(it));
+      tmp = (this.xt() === it.xt() && this.rt() === it.rt() && this.y13(it));
     } else {
       tmp = false;
     }
     return tmp;
   };
   protoOf(AbstractStruct).structurallyEquals = function (other) {
-    return this.r13(other);
+    return this.e14(other);
   };
-  protoOf(AbstractStruct).l13 = function (other) {
+  protoOf(AbstractStruct).y13 = function (other) {
     var inductionVariable = 0;
     var last = this.rt();
     if (inductionVariable < last)
@@ -4290,7 +4409,7 @@
     var tmp2_elvis_lhs = tmp_2;
     return tmp2_elvis_lhs == null ? false : tmp2_elvis_lhs;
   };
-  protoOf(AbstractStruct).m13 = function (other, useVarCompleteName) {
+  protoOf(AbstractStruct).z13 = function (other, useVarCompleteName) {
     var inductionVariable = 0;
     var last = this.rt();
     if (inductionVariable < last)
@@ -4304,7 +4423,7 @@
        while (inductionVariable < last);
     return true;
   };
-  protoOf(AbstractStruct).s13 = function (other, useVarCompleteName) {
+  protoOf(AbstractStruct).f14 = function (other, useVarCompleteName) {
     var tmp0_safe_receiver = other.asStruct();
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -4317,36 +4436,36 @@
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
   protoOf(AbstractStruct).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.s13(other, useVarCompleteName);
+    return this.f14(other, useVarCompleteName);
   };
-  protoOf(AbstractStruct).t13 = function () {
-    var tmp0 = this.q13_1;
+  protoOf(AbstractStruct).g14 = function () {
+    var tmp0 = this.d14_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('hashCodeCache', 1, tmp, AbstractStruct$_get_hashCodeCache_$ref_897o98(), null);
     return tmp0.e2();
   };
-  protoOf(AbstractStruct).k13 = function () {
+  protoOf(AbstractStruct).x13 = function () {
     return itemWiseHashCode(this.yt());
   };
   protoOf(AbstractStruct).toString = function () {
     var escaped = Companion_getInstance_18().escapeFunctorIfNeeded(this.xt());
     var quoted = Companion_getInstance_18().enquoteFunctorIfNecessary(escaped);
-    return quoted + (this.rt() > 0 ? '(' + joinToString_0(this.yt(), ', ') + ')' : '');
+    return quoted + (this.rt() > 0 ? '(' + joinToString(this.yt(), ', ') + ')' : '');
   };
-  protoOf(AbstractStruct).u13 = function (argument) {
+  protoOf(AbstractStruct).h14 = function (argument) {
     return Companion_getInstance_18().ofList(this.xt(), plus_1(this.yt(), argument));
   };
   protoOf(AbstractStruct).addLast = function (argument) {
-    return this.u13(argument);
+    return this.h14(argument);
   };
-  protoOf(AbstractStruct).v13 = function (argument) {
+  protoOf(AbstractStruct).i14 = function (argument) {
     return Companion_getInstance_18().ofList(this.xt(), plus(listOf_0(argument), this.yt()));
   };
   protoOf(AbstractStruct).addFirst = function (argument) {
-    return this.v13(argument);
+    return this.i14(argument);
   };
-  protoOf(AbstractStruct).w13 = function (index, argument) {
+  protoOf(AbstractStruct).j14 = function (index, argument) {
     var tmp;
     if (0 <= index ? index < this.rt() : false) {
       // Inline function 'kotlin.collections.toTypedArray' call
@@ -4359,33 +4478,33 @@
     return tmp;
   };
   protoOf(AbstractStruct).insertAt = function (index, argument) {
-    return this.w13(index, argument);
+    return this.j14(index, argument);
   };
-  protoOf(AbstractStruct).x13 = function (functor) {
+  protoOf(AbstractStruct).k14 = function (functor) {
     return Companion_getInstance_18().ofList(functor, this.yt());
   };
   protoOf(AbstractStruct).setFunctor = function (functor) {
-    return this.x13(functor);
+    return this.k14(functor);
   };
-  protoOf(AbstractStruct).y13 = function (args) {
+  protoOf(AbstractStruct).l14 = function (args) {
     return Companion_getInstance_18().of(this.xt(), args.slice());
   };
   protoOf(AbstractStruct).setArgs = function (args) {
-    return this.y13(args);
+    return this.l14(args);
   };
-  protoOf(AbstractStruct).z13 = function (args) {
+  protoOf(AbstractStruct).m14 = function (args) {
     return Companion_getInstance_18().ofIterable(this.xt(), args);
   };
   protoOf(AbstractStruct).setArgsIterable = function (args) {
-    return this.z13(args);
+    return this.m14(args);
   };
-  protoOf(AbstractStruct).a14 = function (args) {
+  protoOf(AbstractStruct).n14 = function (args) {
     return Companion_getInstance_18().ofSequence(this.xt(), args);
   };
   protoOf(AbstractStruct).setArgsSequence = function (args) {
-    return this.a14(args);
+    return this.n14(args);
   };
-  protoOf(AbstractStruct).f13 = function (unifier) {
+  protoOf(AbstractStruct).s13 = function (unifier) {
     var tmp = Companion_getInstance_18();
     var tmp_0 = this.xt();
     // Inline function 'kotlin.collections.map' call
@@ -4400,11 +4519,11 @@
     }
     return setTags(tmp.ofList(tmp_0, destination), this.lr());
   };
-  protoOf(AbstractStruct).i13 = function (visitor) {
+  protoOf(AbstractStruct).v13 = function (visitor) {
     return visitor.visitStruct(this);
   };
   protoOf(AbstractStruct).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(AbstractStruct).ep = function () {
     return this.ru();
@@ -4417,8 +4536,8 @@
   };
   function Companion_27() {
     Companion_instance_28 = this;
-    this.e14_1 = Companion_getInstance().of(26);
-    this.f14_1 = 65;
+    this.r14_1 = Companion_getInstance().of(26);
+    this.s14_1 = 65;
   }
   var Companion_instance_28;
   function Companion_getInstance_29() {
@@ -4438,13 +4557,13 @@
     return tmp;
   }
   function numberedVar($this, integer) {
-    var letterIndex = integer.e2().rem(Companion_getInstance_29().e14_1).toInt() + 65 | 0;
-    var varNumber = integer.e2().div(Companion_getInstance_29().e14_1);
+    var letterIndex = integer.e2().rem(Companion_getInstance_29().r14_1).toInt() + 65 | 0;
+    var varNumber = integer.e2().div(Companion_getInstance_29().r14_1);
     return toString_1(numberToChar(letterIndex)) + varNumber.toString();
   }
   function formatFunctor($this, term) {
     var tmp;
-    if ($this.g14_1) {
+    if ($this.t14_1) {
       tmp = Companion_getInstance_18().enquoteFunctorIfNecessary(Companion_getInstance_18().escapeFunctorIfNeeded(term.xt()));
     } else {
       tmp = term.xt();
@@ -4453,7 +4572,7 @@
   }
   function visitStructImpl($this, term, actualVisit) {
     var tmp;
-    if ($this.i14_1) {
+    if ($this.v14_1) {
       tmp = $this.yv(term);
     } else {
       tmp = actualVisit(term);
@@ -4462,7 +4581,7 @@
   }
   function AbstractTermFormatter$visitStruct$lambda(this$0) {
     return function (it) {
-      return it.accept(this$0.j14());
+      return it.accept(this$0.x14());
     };
   }
   function AbstractTermFormatter$visitCollection$lambda(this$0, $term) {
@@ -4472,46 +4591,47 @@
   }
   function AbstractTermFormatter$visitCons$lambda$lambda(this$0) {
     return function (it) {
-      return it.accept(this$0.k14());
+      return it.accept(this$0.y14());
     };
   }
-  function AbstractTermFormatter$visitCons$lambda($term, this$0) {
+  function AbstractTermFormatter$visitCons$lambda(this$0, $term) {
     return function (it) {
       // Inline function 'kotlin.with' call
       var $this$with = $term.gv();
       var last_0 = last($this$with);
       var tmp = $this$with.a1(0, get_lastIndex($this$with));
-      var base = joinToString_0(tmp, ', ', '[', '', VOID, VOID, AbstractTermFormatter$visitCons$lambda$lambda(this$0));
+      var base = joinToString(tmp, ', ', '[', '', VOID, VOID, AbstractTermFormatter$visitCons$lambda$lambda(this$0));
       var tmp_0;
       if (last_0.ut()) {
         tmp_0 = ']';
       } else {
-        tmp_0 = ' | ' + last_0.accept(this$0.k14()) + ']';
+        tmp_0 = ' | ' + last_0.accept(this$0.y14()) + ']';
       }
       var lastString = tmp_0;
-      return base + lastString;
+      var tmp$ret$0 = base + lastString;
+      return this$0.z14(tmp$ret$0, $term);
     };
   }
   function AbstractTermFormatter$visitBlock$lambda$lambda(this$0) {
     return function (it) {
-      return it.accept(this$0.j14());
+      return it.accept(this$0.x14());
     };
   }
-  function AbstractTermFormatter$visitBlock$lambda($term, this$0) {
+  function AbstractTermFormatter$visitBlock$lambda(this$0, $term) {
     return function (it) {
       var tmp = $term.hv();
-      return joinToString(tmp, ', ', '{', '}', VOID, VOID, AbstractTermFormatter$visitBlock$lambda$lambda(this$0));
+      return this$0.z14(joinToString_0(tmp, ', ', '{', '}', VOID, VOID, AbstractTermFormatter$visitBlock$lambda$lambda(this$0)), $term);
     };
   }
   function AbstractTermFormatter$visitTuple$lambda$lambda(this$0) {
     return function (it) {
-      return it.accept(this$0.j14());
+      return it.accept(this$0.x14());
     };
   }
-  function AbstractTermFormatter$visitTuple$lambda($term, this$0) {
+  function AbstractTermFormatter$visitTuple$lambda(this$0, $term) {
     return function (it) {
       var tmp = $term.hv();
-      return joinToString(tmp, ', ', '(', ')', VOID, VOID, AbstractTermFormatter$visitTuple$lambda$lambda(this$0));
+      return this$0.z14(joinToString_0(tmp, ', ', '(', ')', VOID, VOID, AbstractTermFormatter$visitTuple$lambda$lambda(this$0)), $term);
     };
   }
   function AbstractTermFormatter$visitClause$lambda($term, this$0) {
@@ -4519,50 +4639,68 @@
       return $term.accept(this$0);
     };
   }
-  function AbstractTermFormatter(quoted, numberVars, ignoreOps) {
+  function AbstractTermFormatter(quoted, numberVars, ignoreOps, tagsOptions) {
     Companion_getInstance_29();
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    this.g14_1 = quoted;
-    this.h14_1 = numberVars;
-    this.i14_1 = ignoreOps;
-  }
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    this.t14_1 = quoted;
+    this.u14_1 = numberVars;
+    this.v14_1 = ignoreOps;
+    this.w14_1 = tagsOptions;
+  }
+  protoOf(AbstractTermFormatter).z14 = function (_this__u8e3s4, term) {
+    var formattedTags = this.w14_1.z11(term.lr());
+    var tmp;
+    // Inline function 'kotlin.text.isNotEmpty' call
+    if (charSequenceLength(formattedTags) > 0) {
+      tmp = _this__u8e3s4 + formattedTags;
+    } else {
+      tmp = _this__u8e3s4;
+    }
+    return tmp;
+  };
   protoOf(AbstractTermFormatter).sv = function (term) {
-    return term.toString();
+    return this.z14(term.toString(), term);
   };
   protoOf(AbstractTermFormatter).defaultValue = function (term) {
     return this.sv(term);
   };
-  protoOf(AbstractTermFormatter).l14 = function (term) {
-    return formatFunctor(this, term);
+  protoOf(AbstractTermFormatter).a15 = function (term) {
+    return this.z14(formatFunctor(this, term), term);
   };
   protoOf(AbstractTermFormatter).visitAtom = function (term) {
-    return this.l14(term);
+    return this.a15(term);
   };
   protoOf(AbstractTermFormatter).yv = function (term) {
-    if (this.h14_1 && isNumberedVar(this, term)) {
-      return numberedVar(this, term.get(0).castToInteger());
+    // Inline function 'kotlin.let' call
+    var tmp;
+    if (this.u14_1 && isNumberedVar(this, term)) {
+      tmp = numberedVar(this, term.get(0).castToInteger());
+    } else {
+      var functor = formatFunctor(this, term);
+      var tmp_0 = term.qu();
+      var args = joinToString_0(tmp_0, ', ', '(', ')', VOID, VOID, AbstractTermFormatter$visitStruct$lambda(this));
+      tmp = functor + args;
     }
-    var functor = formatFunctor(this, term);
-    var tmp = term.qu();
-    var args = joinToString(map(tmp, AbstractTermFormatter$visitStruct$lambda(this)), ', ', '(', ')');
-    return functor + args;
+    var tmp$ret$0 = tmp;
+    return this.z14(tmp$ret$0, term);
   };
   protoOf(AbstractTermFormatter).visitStruct = function (term) {
     return this.yv(term);
   };
-  protoOf(AbstractTermFormatter).m14 = function (term) {
+  protoOf(AbstractTermFormatter).b15 = function (term) {
     return visitStructImpl(this, term, AbstractTermFormatter$visitCollection$lambda(this, term));
   };
   protoOf(AbstractTermFormatter).visitCollection = function (term) {
-    return this.m14(term);
+    return this.b15(term);
   };
-  protoOf(AbstractTermFormatter).n14 = function (term) {
-    return this.m14(term);
+  protoOf(AbstractTermFormatter).c15 = function (term) {
+    return this.b15(term);
   };
   protoOf(AbstractTermFormatter).visitList = function (term) {
-    return this.n14(term);
+    return this.c15(term);
   };
   protoOf(AbstractTermFormatter).az = function (term) {
     return this.sv(term);
@@ -4571,19 +4709,19 @@
     return this.az(term);
   };
   protoOf(AbstractTermFormatter).zy = function (term) {
-    return visitStructImpl(this, term, AbstractTermFormatter$visitCons$lambda(term, this));
+    return visitStructImpl(this, term, AbstractTermFormatter$visitCons$lambda(this, term));
   };
   protoOf(AbstractTermFormatter).visitCons = function (term) {
     return this.zy(term);
   };
   protoOf(AbstractTermFormatter).vv = function (term) {
-    return visitStructImpl(this, term, AbstractTermFormatter$visitBlock$lambda(term, this));
+    return visitStructImpl(this, term, AbstractTermFormatter$visitBlock$lambda(this, term));
   };
   protoOf(AbstractTermFormatter).visitBlock = function (term) {
     return this.vv(term);
   };
   protoOf(AbstractTermFormatter).mv = function (term) {
-    return visitStructImpl(this, term, AbstractTermFormatter$visitTuple$lambda(term, this));
+    return visitStructImpl(this, term, AbstractTermFormatter$visitTuple$lambda(this, term));
   };
   protoOf(AbstractTermFormatter).visitTuple = function (term) {
     return this.mv(term);
@@ -4594,88 +4732,89 @@
   protoOf(AbstractTermFormatter).visitClause = function (term) {
     return this.cw(term);
   };
-  protoOf(AbstractTermFormatter).o14 = function (term) {
+  protoOf(AbstractTermFormatter).d15 = function (term) {
     return this.yv(term);
   };
   protoOf(AbstractTermFormatter).visitRule = function (term) {
-    return this.o14(term);
+    return this.d15(term);
   };
-  protoOf(AbstractTermFormatter).p14 = function (term) {
-    return this.o14(term);
+  protoOf(AbstractTermFormatter).e15 = function (term) {
+    return this.d15(term);
   };
   protoOf(AbstractTermFormatter).visitFact = function (term) {
-    return this.p14(term);
+    return this.e15(term);
   };
-  protoOf(AbstractTermFormatter).q14 = function (term) {
+  protoOf(AbstractTermFormatter).f15 = function (term) {
     return this.yv(term);
   };
   protoOf(AbstractTermFormatter).visitDirective = function (term) {
-    return this.q14(term);
+    return this.f15(term);
   };
-  protoOf(AbstractTermFormatter).k14 = function () {
+  protoOf(AbstractTermFormatter).y14 = function () {
     return this;
   };
-  protoOf(AbstractTermFormatter).j14 = function () {
+  protoOf(AbstractTermFormatter).x14 = function () {
     return this;
   };
-  protoOf(AbstractTermFormatter).r14 = function (term) {
+  protoOf(AbstractTermFormatter).g15 = function (term) {
     return this.yv(term);
   };
   protoOf(AbstractTermFormatter).visitIndicator = function (term) {
-    return this.r14(term);
+    return this.g15(term);
   };
   protoOf(AbstractTermFormatter).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
-  function AbstractTermFormatterForVariables(quoted, numberVars, ignoreOps) {
+  function AbstractTermFormatterForVariables(quoted, numberVars, ignoreOps, tagsOptions) {
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps, tagsOptions);
     var tmp = this;
     // Inline function 'kotlin.collections.mutableMapOf' call
-    tmp.v14_1 = LinkedHashMap_init_$Create$();
+    tmp.l15_1 = LinkedHashMap_init_$Create$();
   }
   protoOf(AbstractTermFormatterForVariables).gw = function (term) {
     var tmp;
-    if (term.h12()) {
+    if (term.u12()) {
       tmp = '_';
-    } else if (this.v14_1.f2(term.m2())) {
-      var homonymous = ensureNotNull(this.v14_1.h2(term.m2()));
+    } else if (this.l15_1.f2(term.m2())) {
+      var homonymous = ensureNotNull(this.l15_1.h2(term.m2()));
       var tmp_0;
       if (homonymous.f2(term)) {
-        tmp_0 = this.w14(term, ensureNotNull(homonymous.h2(term)));
+        tmp_0 = this.m15(term, ensureNotNull(homonymous.h2(term)));
       } else {
         var homonymousCount = homonymous.s();
         var suffix = homonymousCount.toString();
         // Inline function 'kotlin.collections.set' call
         homonymous.k4(term, suffix);
-        tmp_0 = this.w14(term, suffix);
+        tmp_0 = this.m15(term, suffix);
       }
       tmp = tmp_0;
     } else {
-      var tmp0 = this.v14_1;
+      var tmp0 = this.l15_1;
       var tmp2 = term.m2();
       // Inline function 'kotlin.collections.set' call
       var value = mutableMapOf([to(term, '')]);
       tmp0.k4(tmp2, value);
-      tmp = this.w14(term, '');
+      tmp = this.m15(term, '');
     }
-    return tmp;
+    return this.z14(tmp, term);
   };
   protoOf(AbstractTermFormatterForVariables).visitVar = function (term) {
     return this.gw(term);
   };
   protoOf(AbstractTermFormatterForVariables).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
   function AtomImpl(functor, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractStruct.call(this, functor, emptyList(), tags);
-    this.b15_1 = functor;
+    this.r15_1 = functor;
   }
   protoOf(AtomImpl).xt = function () {
-    return this.b15_1;
+    return this.r15_1;
   };
   protoOf(AtomImpl).yt = function () {
     return emptyList();
@@ -4686,7 +4825,7 @@
   protoOf(AtomImpl).zt = function () {
     return emptySequence();
   };
-  protoOf(AtomImpl).g13 = function (tags) {
+  protoOf(AtomImpl).t13 = function (tags) {
     return new AtomImpl(this.xt(), tags);
   };
   protoOf(AtomImpl).au = function () {
@@ -4701,11 +4840,11 @@
   protoOf(AtomImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(AtomImpl).i13 = function (visitor) {
+  protoOf(AtomImpl).v13 = function (visitor) {
     return visitor.visitAtom(this);
   };
   protoOf(AtomImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(AtomImpl).ep = function () {
     return this.ru();
@@ -4723,16 +4862,16 @@
     return this.nu();
   };
   function BlockImpl$unfoldedSequence$$inlined$Iterable$1(this$0) {
-    this.c15_1 = this$0;
+    this.s15_1 = this$0;
   }
   protoOf(BlockImpl$unfoldedSequence$$inlined$Iterable$1).n = function () {
-    return new BlockIterator(this.c15_1);
+    return new BlockIterator(this.s15_1);
   };
   function BlockImpl$unfold$$inlined$Iterable$1(this$0) {
-    this.d15_1 = this$0;
+    this.t15_1 = this$0;
   }
   protoOf(BlockImpl$unfold$$inlined$Iterable$1).n = function () {
-    return new BlockUnfolder(this.d15_1);
+    return new BlockUnfolder(this.t15_1);
   };
   function BlockImpl$freshCopy$lambda($scope) {
     return function (it) {
@@ -4742,20 +4881,20 @@
   function BlockImpl(item, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     RecursiveImpl.call(this, '{}', listOfNotNull(item), tags);
-    this.j15_1 = item;
-    this.k15_1 = this.j13();
-    this.l15_1 = get_functor.call(this);
+    this.z15_1 = item;
+    this.a16_1 = this.w13();
+    this.b16_1 = get_functor.call(this);
   }
   protoOf(BlockImpl).bv = function () {
-    return this.k15_1;
+    return this.a16_1;
   };
-  protoOf(BlockImpl).j13 = function () {
-    var tmp0_safe_receiver = this.j15_1;
+  protoOf(BlockImpl).w13 = function () {
+    var tmp0_safe_receiver = this.z15_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bv();
     return tmp1_elvis_lhs == null ? true : tmp1_elvis_lhs;
   };
   protoOf(BlockImpl).xt = function () {
-    return this.l15_1;
+    return this.b16_1;
   };
   protoOf(BlockImpl).hv = function () {
     // Inline function 'kotlin.collections.Iterable' call
@@ -4765,19 +4904,19 @@
   protoOf(BlockImpl).s = function () {
     return this.gv().s();
   };
-  protoOf(BlockImpl).z12 = function () {
+  protoOf(BlockImpl).m13 = function () {
     // Inline function 'kotlin.collections.Iterable' call
     var tmp$ret$0 = new BlockImpl$unfold$$inlined$Iterable$1(this);
     return asSequence_0(tmp$ret$0);
   };
   protoOf(BlockImpl).unfold = function () {
-    return this.z12();
+    return this.m13();
   };
   protoOf(BlockImpl).toString = function () {
-    return joinToString(this.hv(), ', ', '{', '}');
+    return joinToString_0(this.hv(), ', ', '{', '}');
   };
-  protoOf(BlockImpl).g13 = function (tags) {
-    return new BlockImpl(this.j15_1, tags);
+  protoOf(BlockImpl).t13 = function (tags) {
+    return new BlockImpl(this.z15_1, tags);
   };
   protoOf(BlockImpl).au = function () {
     return protoOf(RecursiveImpl).au.call(this).castToBlock();
@@ -4798,11 +4937,11 @@
   protoOf(BlockImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(BlockImpl).i13 = function (visitor) {
+  protoOf(BlockImpl).v13 = function (visitor) {
     return visitor.visitBlock(this);
   };
   protoOf(BlockImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(BlockImpl).ep = function () {
     return this.ru();
@@ -4826,61 +4965,61 @@
     return this.fv();
   };
   function BlockUnfolder$tupleUnfolderVisitor$1(this$0) {
-    this.m15_1 = this$0;
+    this.c16_1 = this$0;
   }
   protoOf(BlockUnfolder$tupleUnfolderVisitor$1).mv = function (term) {
-    this.m15_1.n15_1 = term.qv();
+    this.c16_1.d16_1 = term.qv();
     return term;
   };
   protoOf(BlockUnfolder$tupleUnfolderVisitor$1).visitTuple = function (term) {
     return this.mv(term);
   };
   protoOf(BlockUnfolder$tupleUnfolderVisitor$1).sv = function (term) {
-    this.m15_1.n15_1 = null;
+    this.c16_1.d16_1 = null;
     return term;
   };
   protoOf(BlockUnfolder$tupleUnfolderVisitor$1).defaultValue = function (term) {
     return this.sv(term);
   };
   function BlockUnfolder$blockUnfolderVisitor$1(this$0) {
-    this.r15_1 = this$0;
+    this.h16_1 = this$0;
   }
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).wv = function (term) {
-    this.r15_1.n15_1 = null;
+    this.h16_1.d16_1 = null;
     return term;
   };
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).visitEmptyBlock = function (term) {
     return this.wv(term);
   };
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).vv = function (term) {
-    this.r15_1.n15_1 = term.get(0);
-    this.r15_1.o15_1 = true;
+    this.h16_1.d16_1 = term.get(0);
+    this.h16_1.e16_1 = true;
     return term;
   };
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).visitBlock = function (term) {
     return this.vv(term);
   };
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).sv = function (term) {
-    this.r15_1.n15_1 = null;
+    this.h16_1.d16_1 = null;
     return term;
   };
   protoOf(BlockUnfolder$blockUnfolderVisitor$1).defaultValue = function (term) {
     return this.sv(term);
   };
   function BlockUnfolder(block) {
-    this.n15_1 = block;
-    this.o15_1 = false;
+    this.d16_1 = block;
+    this.e16_1 = false;
     var tmp = this;
-    tmp.p15_1 = new BlockUnfolder$tupleUnfolderVisitor$1(this);
+    tmp.f16_1 = new BlockUnfolder$tupleUnfolderVisitor$1(this);
     var tmp_0 = this;
-    tmp_0.q15_1 = new BlockUnfolder$blockUnfolderVisitor$1(this);
+    tmp_0.g16_1 = new BlockUnfolder$blockUnfolderVisitor$1(this);
   }
   protoOf(BlockUnfolder).q = function () {
-    return !(this.n15_1 == null);
+    return !(this.d16_1 == null);
   };
   protoOf(BlockUnfolder).r = function () {
-    var tmp0_safe_receiver = this.n15_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.o15_1 ? this.p15_1 : this.q15_1);
+    var tmp0_safe_receiver = this.d16_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.e16_1 ? this.f16_1 : this.g16_1);
     var tmp;
     if (tmp1_elvis_lhs == null) {
       throw NoSuchElementException_init_$Create$();
@@ -4912,27 +5051,27 @@
   }
   function ClauseImpl(head, body, tags) {
     AbstractStruct.call(this, ':-', head === null ? listOf_0(body) : listOf([head, body]), tags);
-    this.w15_1 = head;
-    this.x15_1 = body;
+    this.m16_1 = head;
+    this.n16_1 = body;
     var tmp = this;
-    tmp.y15_1 = lazy(ClauseImpl$isWellFormed$delegate$lambda(this));
-    this.z15_1 = get_functor_0.call(this);
+    tmp.o16_1 = lazy(ClauseImpl$isWellFormed$delegate$lambda(this));
+    this.p16_1 = get_functor_0.call(this);
   }
   protoOf(ClauseImpl).dw = function () {
-    return this.w15_1;
+    return this.m16_1;
   };
   protoOf(ClauseImpl).ew = function () {
-    return this.x15_1;
+    return this.n16_1;
   };
   protoOf(ClauseImpl).nw = function () {
-    var tmp0 = this.y15_1;
+    var tmp0 = this.o16_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('isWellFormed', 1, tmp, ClauseImpl$_get_isWellFormed_$ref_4n3sk(), null);
     return tmp0.e2();
   };
   protoOf(ClauseImpl).xt = function () {
-    return this.z15_1;
+    return this.p16_1;
   };
   protoOf(ClauseImpl).toString = function () {
     return this.dw() == null ? this.xt() + ' ' + this.ew().toString() : toString_0(this.dw()) + ' ' + this.xt() + ' ' + this.ew().toString();
@@ -4960,18 +5099,18 @@
   protoOf(ClauseImpl).rw = function () {
     return this.ew().asTuple();
   };
-  protoOf(ClauseImpl).a16 = function (index) {
+  protoOf(ClauseImpl).q16 = function (index) {
     ensureIndexIsInBodyRange(this, index);
     return first_0(drop(_get_bodyItemsSequence__ip18gi(this), index));
   };
   protoOf(ClauseImpl).getBodyItem = function (index) {
-    return this.a16(index);
+    return this.q16(index);
   };
-  protoOf(ClauseImpl).b16 = function (head) {
+  protoOf(ClauseImpl).r16 = function (head) {
     return Companion_instance_15.of(head, [this.ew()]);
   };
   protoOf(ClauseImpl).setHead = function (head) {
-    return this.b16(head);
+    return this.r16(head);
   };
   protoOf(ClauseImpl).ux = function (body) {
     return Companion_getInstance_3().fw(this.dw(), [body]);
@@ -5084,11 +5223,11 @@
   protoOf(ClauseImpl).appendBodyItem = function (argument) {
     return this.by(argument);
   };
-  protoOf(ClauseImpl).i13 = function (visitor) {
+  protoOf(ClauseImpl).v13 = function (visitor) {
     return visitor.visitClause(this);
   };
   protoOf(ClauseImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(ClauseImpl).ep = function () {
     return this.ru();
@@ -5110,61 +5249,61 @@
   function ConsImpl(head, tail, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractCons.call(this, listOf([head, tail]), tags);
-    this.j16_1 = head;
-    this.k16_1 = tail;
-    this.l16_1 = this.j13();
-    this.m16_1 = this.k16_1.ju() ? this.k16_1.castToList().vw() : this.k16_1;
-    this.n16_1 = this.k16_1.ju() ? 1 + this.k16_1.castToList().s() | 0 : 2;
-    this.o16_1 = this.k16_1.ju() ? this.k16_1.castToList().nw() : false;
+    this.z16_1 = head;
+    this.a17_1 = tail;
+    this.b17_1 = this.w13();
+    this.c17_1 = this.a17_1.ju() ? this.a17_1.castToList().vw() : this.a17_1;
+    this.d17_1 = this.a17_1.ju() ? 1 + this.a17_1.castToList().s() | 0 : 2;
+    this.e17_1 = this.a17_1.ju() ? this.a17_1.castToList().nw() : false;
   }
   protoOf(ConsImpl).dw = function () {
-    return this.j16_1;
+    return this.z16_1;
   };
   protoOf(ConsImpl).tw = function () {
-    return this.k16_1;
+    return this.a17_1;
   };
   protoOf(ConsImpl).bv = function () {
-    return this.l16_1;
+    return this.b17_1;
   };
   protoOf(ConsImpl).vw = function () {
-    return this.m16_1;
+    return this.c17_1;
   };
   protoOf(ConsImpl).s = function () {
-    return this.n16_1;
+    return this.d17_1;
   };
   protoOf(ConsImpl).nw = function () {
-    return this.o16_1;
+    return this.e17_1;
   };
-  protoOf(ConsImpl).j13 = function () {
-    return this.j16_1.bv() && this.k16_1.bv();
+  protoOf(ConsImpl).w13 = function () {
+    return this.z16_1.bv() && this.a17_1.bv();
   };
   protoOf(ConsImpl).ww = function () {
-    return this.n16_1;
+    return this.d17_1;
   };
-  protoOf(ConsImpl).f13 = function (unifier) {
+  protoOf(ConsImpl).s13 = function (unifier) {
     var tmp;
     if (this.ww() >= 100) {
       var tmp_0 = cursor_0(this.hv());
       tmp = new LazyConsWithImplicitLast(tmp_0.map(ConsImpl$applyNonEmptyUnifier$lambda(unifier)), this.lr());
     } else {
-      tmp = new ConsImpl(this.j16_1.applySubstitution(unifier), this.k16_1.applySubstitution(unifier), this.lr());
+      tmp = new ConsImpl(this.z16_1.applySubstitution(unifier), this.a17_1.applySubstitution(unifier), this.lr());
     }
     return tmp;
   };
-  protoOf(ConsImpl).g13 = function (tags) {
+  protoOf(ConsImpl).t13 = function (tags) {
     var tmp;
     if (this.lr() === tags) {
       tmp = this;
     } else {
-      tmp = new ConsImpl(this.j16_1, this.k16_1, tags);
+      tmp = new ConsImpl(this.z16_1, this.a17_1, tags);
     }
     return tmp;
   };
   protoOf(ConsImpl).bu = function (scope) {
     var tmp;
-    if (this.l16_1) {
+    if (this.b17_1) {
       tmp = this;
-    } else if (this.o16_1) {
+    } else if (this.e17_1) {
       // Inline function 'kotlin.collections.map' call
       var this_0 = this.fv();
       // Inline function 'kotlin.collections.mapTo' call
@@ -5215,17 +5354,17 @@
   function DirectiveImpl(body, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     ClauseImpl.call(this, null, body, tags);
-    this.x16_1 = body;
-    this.y16_1 = get_head.call(this);
+    this.n17_1 = body;
+    this.o17_1 = get_head.call(this);
   }
   protoOf(DirectiveImpl).ew = function () {
-    return this.x16_1;
+    return this.n17_1;
   };
   protoOf(DirectiveImpl).dw = function () {
-    return this.y16_1;
+    return this.o17_1;
   };
-  protoOf(DirectiveImpl).g13 = function (tags) {
-    return new DirectiveImpl(this.x16_1, tags);
+  protoOf(DirectiveImpl).t13 = function (tags) {
+    return new DirectiveImpl(this.n17_1, tags);
   };
   protoOf(DirectiveImpl).au = function () {
     return protoOf(ClauseImpl).au.call(this).castToDirective();
@@ -5239,11 +5378,11 @@
   protoOf(DirectiveImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(DirectiveImpl).i13 = function (visitor) {
+  protoOf(DirectiveImpl).v13 = function (visitor) {
     return visitor.visitDirective(this);
   };
   protoOf(DirectiveImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(DirectiveImpl).ep = function () {
     return this.ru();
@@ -5263,14 +5402,14 @@
   function EmptyBlockImpl(tags) {
     tags = tags === VOID ? emptyMap() : tags;
     BlockImpl.call(this, null, tags);
-    this.h17_1 = get_functor.call(this);
-    this.i17_1 = emptySequence();
+    this.x17_1 = get_functor.call(this);
+    this.y17_1 = emptySequence();
   }
   protoOf(EmptyBlockImpl).yt = function () {
     return emptyList();
   };
   protoOf(EmptyBlockImpl).xt = function () {
-    return this.h17_1;
+    return this.x17_1;
   };
   protoOf(EmptyBlockImpl).bv = function () {
     return true;
@@ -5279,9 +5418,9 @@
     return 0;
   };
   protoOf(EmptyBlockImpl).zt = function () {
-    return this.i17_1;
+    return this.y17_1;
   };
-  protoOf(EmptyBlockImpl).g13 = function (tags) {
+  protoOf(EmptyBlockImpl).t13 = function (tags) {
     return new EmptyBlockImpl(tags);
   };
   protoOf(EmptyBlockImpl).au = function () {
@@ -5296,11 +5435,11 @@
   protoOf(EmptyBlockImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(EmptyBlockImpl).i13 = function (visitor) {
+  protoOf(EmptyBlockImpl).v13 = function (visitor) {
     return visitor.visitEmptyBlock(this);
   };
   protoOf(EmptyBlockImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(EmptyBlockImpl).ep = function () {
     return this.ru();
@@ -5335,32 +5474,32 @@
   function EmptyListImpl(tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AtomImpl.call(this, '[]', tags);
-    this.o17_1 = listOf_0(this);
-    this.p17_1 = sequenceOf_0(this);
+    this.e18_1 = listOf_0(this);
+    this.f18_1 = sequenceOf_0(this);
     var tmp = this;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.q17_1 = [this];
-    this.r17_1 = emptyList();
+    tmp.g18_1 = [this];
+    this.h18_1 = emptyList();
   }
   protoOf(EmptyListImpl).gv = function () {
-    return this.o17_1;
+    return this.e18_1;
   };
   protoOf(EmptyListImpl).hv = function () {
-    return this.p17_1;
+    return this.f18_1;
   };
   protoOf(EmptyListImpl).ev = function () {
-    return this.q17_1;
+    return this.g18_1;
   };
   protoOf(EmptyListImpl).kv = function () {
-    return this.r17_1;
+    return this.h18_1;
   };
-  protoOf(EmptyListImpl).z12 = function () {
+  protoOf(EmptyListImpl).m13 = function () {
     return sequenceOf_0(this);
   };
   protoOf(EmptyListImpl).unfold = function () {
-    return this.z12();
+    return this.m13();
   };
   protoOf(EmptyListImpl).toString = function () {
     return this.e2();
@@ -5377,7 +5516,7 @@
   protoOf(EmptyListImpl).nw = function () {
     return true;
   };
-  protoOf(EmptyListImpl).g13 = function (tags) {
+  protoOf(EmptyListImpl).t13 = function (tags) {
     return new EmptyListImpl(tags);
   };
   protoOf(EmptyListImpl).au = function () {
@@ -5392,11 +5531,11 @@
   protoOf(EmptyListImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(EmptyListImpl).i13 = function (visitor) {
+  protoOf(EmptyListImpl).v13 = function (visitor) {
     return visitor.visitEmptyList(this);
   };
   protoOf(EmptyListImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(EmptyListImpl).ep = function () {
     return this.ru();
@@ -5431,21 +5570,21 @@
   function FactImpl(head, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     RuleImpl.call(this, head, Companion_getInstance_23().ot_1, tags);
-    this.c18_1 = head;
-    this.d18_1 = true;
-    this.e18_1 = protoOf(RuleImpl).ew.call(this);
+    this.s18_1 = head;
+    this.t18_1 = true;
+    this.u18_1 = protoOf(RuleImpl).ew.call(this);
   }
   protoOf(FactImpl).dw = function () {
-    return this.c18_1;
+    return this.s18_1;
   };
   protoOf(FactImpl).nw = function () {
-    return this.d18_1;
+    return this.t18_1;
   };
   protoOf(FactImpl).ew = function () {
-    return this.e18_1;
+    return this.u18_1;
   };
-  protoOf(FactImpl).g13 = function (tags) {
-    return new FactImpl(this.c18_1, tags);
+  protoOf(FactImpl).t13 = function (tags) {
+    return new FactImpl(this.s18_1, tags);
   };
   protoOf(FactImpl).au = function () {
     return protoOf(RuleImpl).au.call(this).castToFact();
@@ -5507,11 +5646,11 @@
   protoOf(FactImpl).appendHeadArg = function (argument) {
     return this.qx(argument);
   };
-  protoOf(FactImpl).i13 = function (visitor) {
+  protoOf(FactImpl).v13 = function (visitor) {
     return visitor.visitFact(this);
   };
   protoOf(FactImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(FactImpl).ep = function () {
     return this.ru();
@@ -5534,14 +5673,14 @@
   function IndicatorImpl(nameTerm, arityTerm, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractStruct.call(this, '/', listOf([nameTerm, arityTerm]), tags);
-    this.u18_1 = nameTerm;
-    this.v18_1 = arityTerm;
+    this.k19_1 = nameTerm;
+    this.l19_1 = arityTerm;
   }
   protoOf(IndicatorImpl).dy = function () {
-    return this.u18_1;
+    return this.k19_1;
   };
   protoOf(IndicatorImpl).ey = function () {
-    return this.v18_1;
+    return this.l19_1;
   };
   protoOf(IndicatorImpl).xt = function () {
     return '/';
@@ -5553,10 +5692,10 @@
     return get_indicatedArity.call(this);
   };
   protoOf(IndicatorImpl).toString = function () {
-    return this.u18_1.toString() + '/' + this.v18_1.toString();
+    return this.k19_1.toString() + '/' + this.l19_1.toString();
   };
-  protoOf(IndicatorImpl).g13 = function (tags) {
-    return new IndicatorImpl(this.u18_1, this.v18_1, tags);
+  protoOf(IndicatorImpl).t13 = function (tags) {
+    return new IndicatorImpl(this.k19_1, this.l19_1, tags);
   };
   protoOf(IndicatorImpl).au = function () {
     return protoOf(AbstractStruct).au.call(this).castToIndicator();
@@ -5570,11 +5709,11 @@
   protoOf(IndicatorImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(IndicatorImpl).i13 = function (visitor) {
+  protoOf(IndicatorImpl).v13 = function (visitor) {
     return visitor.visitIndicator(this);
   };
   protoOf(IndicatorImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(IndicatorImpl).ep = function () {
     return this.ru();
@@ -5590,7 +5729,7 @@
   };
   function IntegerImpl$decimalValue$delegate$lambda(this$0) {
     return function () {
-      return Companion_getInstance_0().ofBigInteger(this$0.z18_1);
+      return Companion_getInstance_0().ofBigInteger(this$0.p19_1);
     };
   }
   function IntegerImpl$_get_decimalValue_$ref_cmliow() {
@@ -5600,39 +5739,39 @@
   }
   function IntegerImpl$hashCodeCache$delegate$lambda(this$0) {
     return function () {
-      return this$0.x18_1.hashCode();
+      return this$0.n19_1.hashCode();
     };
   }
   function IntegerImpl$_get_hashCodeCache_$ref_760h0z() {
     return constructCallableReference(function (p0) {
-      return p0.t13();
+      return p0.g14();
     }, 1, 0, 9);
   }
   function IntegerImpl(value, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     NumericImpl.call(this, tags);
-    this.x18_1 = value;
+    this.n19_1 = value;
     var tmp = this;
-    tmp.y18_1 = lazy(IntegerImpl$decimalValue$delegate$lambda(this));
-    this.z18_1 = this.x18_1;
+    tmp.o19_1 = lazy(IntegerImpl$decimalValue$delegate$lambda(this));
+    this.p19_1 = this.n19_1;
     var tmp_0 = this;
-    tmp_0.a19_1 = lazy(IntegerImpl$hashCodeCache$delegate$lambda(this));
+    tmp_0.q19_1 = lazy(IntegerImpl$hashCodeCache$delegate$lambda(this));
   }
   protoOf(IntegerImpl).e2 = function () {
-    return this.x18_1;
+    return this.n19_1;
   };
   protoOf(IntegerImpl).ny = function () {
-    var tmp0 = this.y18_1;
+    var tmp0 = this.o19_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('decimalValue', 1, tmp, IntegerImpl$_get_decimalValue_$ref_cmliow(), null);
     return tmp0.e2();
   };
   protoOf(IntegerImpl).fy = function () {
-    return this.z18_1;
+    return this.p19_1;
   };
   protoOf(IntegerImpl).toString = function () {
-    return this.x18_1.toString();
+    return this.n19_1.toString();
   };
   protoOf(IntegerImpl).equals = function (other) {
     if (this === other)
@@ -5663,37 +5802,37 @@
     if (integer === null)
       return false;
     // Inline function 'it.unibo.tuprolog.core.impl.IntegerImpl.equalsToInteger' call
-    return this.x18_1.bj(integer.e2()) === 0;
+    return this.n19_1.bj(integer.e2()) === 0;
   };
-  protoOf(IntegerImpl).s13 = function (other, useVarCompleteName) {
+  protoOf(IntegerImpl).f14 = function (other, useVarCompleteName) {
     var tmp;
     if (other.yu()) {
       // Inline function 'it.unibo.tuprolog.core.impl.IntegerImpl.equalsToInteger' call
       var other_0 = other.castToInteger();
-      tmp = this.x18_1.bj(other_0.e2()) === 0;
+      tmp = this.n19_1.bj(other_0.e2()) === 0;
     } else {
       tmp = false;
     }
     return tmp;
   };
   protoOf(IntegerImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.s13(other, useVarCompleteName);
+    return this.f14(other, useVarCompleteName);
   };
-  protoOf(IntegerImpl).t13 = function () {
-    var tmp0 = this.a19_1;
+  protoOf(IntegerImpl).g14 = function () {
+    var tmp0 = this.q19_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('hashCodeCache', 1, tmp, IntegerImpl$_get_hashCodeCache_$ref_760h0z(), null);
     return tmp0.e2();
   };
-  protoOf(IntegerImpl).b19 = function (other) {
-    return other.yu() ? this.x18_1.bj(other.castToInteger().e2()) : protoOf(NumericImpl).compareValueTo.call(this, other);
+  protoOf(IntegerImpl).r19 = function (other) {
+    return other.yu() ? this.n19_1.bj(other.castToInteger().e2()) : protoOf(NumericImpl).compareValueTo.call(this, other);
   };
   protoOf(IntegerImpl).compareValueTo = function (other) {
-    return this.b19(other);
+    return this.r19(other);
   };
-  protoOf(IntegerImpl).g13 = function (tags) {
-    return new IntegerImpl(this.x18_1, tags);
+  protoOf(IntegerImpl).t13 = function (tags) {
+    return new IntegerImpl(this.n19_1, tags);
   };
   protoOf(IntegerImpl).au = function () {
     return this;
@@ -5707,11 +5846,11 @@
   protoOf(IntegerImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(IntegerImpl).i13 = function (visitor) {
+  protoOf(IntegerImpl).v13 = function (visitor) {
     return visitor.visitInteger(this);
   };
   protoOf(IntegerImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(IntegerImpl).ep = function () {
     return this.ru();
@@ -5731,12 +5870,12 @@
   function LazyConsWithExplicitLast$tail$delegate$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.let' call
-      var it = this$0.k19_1.hp();
+      var it = this$0.a1a_1.hp();
       var tmp;
       if (it.kp()) {
-        tmp = this$0.l19_1;
+        tmp = this$0.b1a_1;
       } else {
-        tmp = new LazyConsWithExplicitLast(it, this$0.l19_1);
+        tmp = new LazyConsWithExplicitLast(it, this$0.b1a_1);
       }
       return tmp;
     };
@@ -5751,7 +5890,7 @@
       var current = this$0;
       while (current.ku()) {
         if (current instanceof LazyConsWithExplicitLast) {
-          current = current.l19_1;
+          current = current.b1a_1;
         } else {
           if (current.ju()) {
             current = current.castToList().vw();
@@ -5790,44 +5929,44 @@
     termination = termination === VOID ? Companion_getInstance_8().instance : termination;
     tags = tags === VOID ? emptyMap() : tags;
     AbstractCons.call(this, emptyList(), tags);
-    this.k19_1 = cursor;
-    this.l19_1 = termination;
+    this.a1a_1 = cursor;
+    this.b1a_1 = termination;
     var tmp = this;
-    tmp.m19_1 = lazy(LazyConsWithExplicitLast$tail$delegate$lambda(this));
+    tmp.c1a_1 = lazy(LazyConsWithExplicitLast$tail$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.n19_1 = lazy(LazyConsWithExplicitLast$last$delegate$lambda(this));
+    tmp_0.d1a_1 = lazy(LazyConsWithExplicitLast$last$delegate$lambda(this));
     var tmp_1 = this;
     var tmp_2 = LazyConsWithExplicitLast$args$lambda(this);
-    tmp_1.o19_1 = new LazyTwoItemsList(tmp_2, LazyConsWithExplicitLast$args$lambda_0(this));
+    tmp_1.e1a_1 = new LazyTwoItemsList(tmp_2, LazyConsWithExplicitLast$args$lambda_0(this));
   }
   protoOf(LazyConsWithExplicitLast).dw = function () {
-    return ensureNotNull(this.k19_1.ip());
+    return ensureNotNull(this.a1a_1.ip());
   };
   protoOf(LazyConsWithExplicitLast).tw = function () {
-    var tmp0 = this.m19_1;
+    var tmp0 = this.c1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('tail', 1, tmp, LazyConsWithExplicitLast$_get_tail_$ref_vwm9sp(), null);
     return tmp0.e2();
   };
   protoOf(LazyConsWithExplicitLast).vw = function () {
-    var tmp0 = this.n19_1;
+    var tmp0 = this.d1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('last', 1, tmp, LazyConsWithExplicitLast$_get_last_$ref_4ku2ct(), null);
     return tmp0.e2();
   };
   protoOf(LazyConsWithExplicitLast).yt = function () {
-    return this.o19_1;
+    return this.e1a_1;
   };
-  protoOf(LazyConsWithExplicitLast).f13 = function (unifier) {
+  protoOf(LazyConsWithExplicitLast).s13 = function (unifier) {
     var tmp = this.hv();
     return new LazyConsWithImplicitLast(cursor_0(map(tmp, LazyConsWithExplicitLast$applyNonEmptyUnifier$lambda(unifier))), this.lr());
   };
-  protoOf(LazyConsWithExplicitLast).g13 = function (tags) {
-    return this.lr() === tags ? this : new LazyConsWithExplicitLast(this.k19_1, this.l19_1, tags);
+  protoOf(LazyConsWithExplicitLast).t13 = function (tags) {
+    return this.lr() === tags ? this : new LazyConsWithExplicitLast(this.a1a_1, this.b1a_1, tags);
   };
-  protoOf(LazyConsWithExplicitLast).d14 = function (unifier) {
+  protoOf(LazyConsWithExplicitLast).q14 = function (unifier) {
     return unifier.h();
   };
   protoOf(LazyConsWithExplicitLast).bu = function (scope) {
@@ -5857,7 +5996,7 @@
   };
   function LazyConsWithImplicitLast$head$delegate$lambda(this$0) {
     return function () {
-      return ensureNotNull(this$0.w19_1.ip());
+      return ensureNotNull(this$0.m1a_1.ip());
     };
   }
   function LazyConsWithImplicitLast$_get_head_$ref_gh69tk() {
@@ -5868,7 +6007,7 @@
   function LazyConsWithImplicitLast$tail$delegate$lambda(this$0) {
     return function () {
       // Inline function 'kotlin.let' call
-      var it = this$0.w19_1.hp();
+      var it = this$0.m1a_1.hp();
       return it.kp() ? Companion_getInstance_8().instance : it.hp().kp() ? ensureNotNull(it.ip()) : new LazyConsWithImplicitLast(it);
     };
   }
@@ -5910,48 +6049,48 @@
   function LazyConsWithImplicitLast(cursor, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractCons.call(this, emptyList(), tags);
-    this.w19_1 = cursor;
+    this.m1a_1 = cursor;
     var tmp = this;
-    tmp.x19_1 = lazy(LazyConsWithImplicitLast$head$delegate$lambda(this));
+    tmp.n1a_1 = lazy(LazyConsWithImplicitLast$head$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.y19_1 = lazy(LazyConsWithImplicitLast$tail$delegate$lambda(this));
+    tmp_0.o1a_1 = lazy(LazyConsWithImplicitLast$tail$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.z19_1 = lazy(LazyConsWithImplicitLast$last$delegate$lambda(this));
+    tmp_1.p1a_1 = lazy(LazyConsWithImplicitLast$last$delegate$lambda(this));
     var tmp_2 = this;
     var tmp_3 = LazyConsWithImplicitLast$args$lambda(this);
-    tmp_2.a1a_1 = new LazyTwoItemsList(tmp_3, LazyConsWithImplicitLast$args$lambda_0(this));
+    tmp_2.q1a_1 = new LazyTwoItemsList(tmp_3, LazyConsWithImplicitLast$args$lambda_0(this));
   }
   protoOf(LazyConsWithImplicitLast).dw = function () {
-    var tmp0 = this.x19_1;
+    var tmp0 = this.n1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('head', 1, tmp, LazyConsWithImplicitLast$_get_head_$ref_gh69tk(), null);
     return tmp0.e2();
   };
   protoOf(LazyConsWithImplicitLast).tw = function () {
-    var tmp0 = this.y19_1;
+    var tmp0 = this.o1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('tail', 1, tmp, LazyConsWithImplicitLast$_get_tail_$ref_iufmx4(), null);
     return tmp0.e2();
   };
   protoOf(LazyConsWithImplicitLast).vw = function () {
-    var tmp0 = this.z19_1;
+    var tmp0 = this.p1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('last', 1, tmp, LazyConsWithImplicitLast$_get_last_$ref_hn0p8e(), null);
     return tmp0.e2();
   };
   protoOf(LazyConsWithImplicitLast).yt = function () {
-    return this.a1a_1;
+    return this.q1a_1;
   };
-  protoOf(LazyConsWithImplicitLast).f13 = function (unifier) {
-    return new LazyConsWithImplicitLast(this.w19_1.map(LazyConsWithImplicitLast$applyNonEmptyUnifier$lambda(unifier)), this.lr());
+  protoOf(LazyConsWithImplicitLast).s13 = function (unifier) {
+    return new LazyConsWithImplicitLast(this.m1a_1.map(LazyConsWithImplicitLast$applyNonEmptyUnifier$lambda(unifier)), this.lr());
   };
-  protoOf(LazyConsWithImplicitLast).g13 = function (tags) {
-    return this.lr() === tags ? this : new LazyConsWithImplicitLast(this.w19_1, tags);
+  protoOf(LazyConsWithImplicitLast).t13 = function (tags) {
+    return this.lr() === tags ? this : new LazyConsWithImplicitLast(this.m1a_1, tags);
   };
-  protoOf(LazyConsWithImplicitLast).d14 = function (unifier) {
+  protoOf(LazyConsWithImplicitLast).q14 = function (unifier) {
     return unifier.h();
   };
   protoOf(LazyConsWithImplicitLast).bu = function (scope) {
@@ -5980,40 +6119,40 @@
     return this.jv();
   };
   function ListUnfolder$listUnfolderVisitor$1(this$0) {
-    this.b1a_1 = this$0;
+    this.r1a_1 = this$0;
   }
   protoOf(ListUnfolder$listUnfolderVisitor$1).zy = function (term) {
-    this.b1a_1.c1a_1 = term.tw();
+    this.r1a_1.s1a_1 = term.tw();
     return term;
   };
   protoOf(ListUnfolder$listUnfolderVisitor$1).visitCons = function (term) {
     return this.zy(term);
   };
   protoOf(ListUnfolder$listUnfolderVisitor$1).az = function (term) {
-    this.b1a_1.c1a_1 = null;
+    this.r1a_1.s1a_1 = null;
     return term;
   };
   protoOf(ListUnfolder$listUnfolderVisitor$1).visitEmptyList = function (term) {
     return this.az(term);
   };
   protoOf(ListUnfolder$listUnfolderVisitor$1).sv = function (term) {
-    this.b1a_1.c1a_1 = null;
+    this.r1a_1.s1a_1 = null;
     return term;
   };
   protoOf(ListUnfolder$listUnfolderVisitor$1).defaultValue = function (term) {
     return this.sv(term);
   };
   function ListUnfolder(list) {
-    this.c1a_1 = list;
+    this.s1a_1 = list;
     var tmp = this;
-    tmp.d1a_1 = new ListUnfolder$listUnfolderVisitor$1(this);
+    tmp.t1a_1 = new ListUnfolder$listUnfolderVisitor$1(this);
   }
   protoOf(ListUnfolder).q = function () {
-    return !(this.c1a_1 == null);
+    return !(this.s1a_1 == null);
   };
   protoOf(ListUnfolder).r = function () {
-    var tmp0_safe_receiver = this.c1a_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.d1a_1);
+    var tmp0_safe_receiver = this.s1a_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.t1a_1);
     var tmp;
     if (tmp1_elvis_lhs == null) {
       throw NoSuchElementException_init_$Create$();
@@ -6025,17 +6164,17 @@
   function NumericImpl(tags) {
     TermImpl.call(this, tags);
   }
-  protoOf(NumericImpl).r13 = function (other) {
+  protoOf(NumericImpl).e14 = function (other) {
     return other.xu() && this.ny().si(other.castToNumeric().ny()) === 0;
   };
   protoOf(NumericImpl).structurallyEquals = function (other) {
-    return this.r13(other);
+    return this.e14(other);
   };
-  protoOf(NumericImpl).i13 = function (visitor) {
+  protoOf(NumericImpl).v13 = function (visitor) {
     return visitor.visitNumeric(this);
   };
   protoOf(NumericImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(NumericImpl).ep = function () {
     return this.ru();
@@ -6051,7 +6190,7 @@
   };
   function RealImpl$intValue$delegate$lambda(this$0) {
     return function () {
-      return this$0.f1a_1.toBigInteger();
+      return this$0.v1a_1.toBigInteger();
     };
   }
   function RealImpl$_get_intValue_$ref_vz60o2() {
@@ -6061,38 +6200,38 @@
   }
   function RealImpl$hashCodeCache$delegate$lambda(this$0) {
     return function () {
-      return hashCode(this$0.f1a_1.stripTrailingZeros());
+      return hashCode(this$0.v1a_1.stripTrailingZeros());
     };
   }
   function RealImpl$_get_hashCodeCache_$ref_gtsyxf() {
     return constructCallableReference(function (p0) {
-      return p0.t13();
+      return p0.g14();
     }, 1, 0, 16);
   }
   function RealImpl(value, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     NumericImpl.call(this, tags);
-    this.f1a_1 = value;
+    this.v1a_1 = value;
     var tmp = this;
-    tmp.g1a_1 = lazy(RealImpl$intValue$delegate$lambda(this));
+    tmp.w1a_1 = lazy(RealImpl$intValue$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.h1a_1 = lazy(RealImpl$hashCodeCache$delegate$lambda(this));
+    tmp_0.x1a_1 = lazy(RealImpl$hashCodeCache$delegate$lambda(this));
   }
   protoOf(RealImpl).e2 = function () {
-    return this.f1a_1;
+    return this.v1a_1;
   };
   protoOf(RealImpl).ny = function () {
-    return this.f1a_1;
+    return this.v1a_1;
   };
   protoOf(RealImpl).fy = function () {
-    var tmp0 = this.g1a_1;
+    var tmp0 = this.w1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('intValue', 1, tmp, RealImpl$_get_intValue_$ref_vz60o2(), null);
     return tmp0.e2();
   };
   protoOf(RealImpl).toString = function () {
-    return Companion_getInstance_15().toStringEnsuringDecimal(this.f1a_1);
+    return Companion_getInstance_15().toStringEnsuringDecimal(this.v1a_1);
   };
   protoOf(RealImpl).equals = function (other) {
     if (this === other)
@@ -6123,31 +6262,31 @@
     if (real === null)
       return false;
     // Inline function 'it.unibo.tuprolog.core.impl.RealImpl.equalsToReal' call
-    return this.f1a_1.si(real.e2()) === 0;
+    return this.v1a_1.si(real.e2()) === 0;
   };
-  protoOf(RealImpl).s13 = function (other, useVarCompleteName) {
+  protoOf(RealImpl).f14 = function (other, useVarCompleteName) {
     var tmp;
     if (other.zu()) {
       // Inline function 'it.unibo.tuprolog.core.impl.RealImpl.equalsToReal' call
       var other_0 = other.castToReal();
-      tmp = this.f1a_1.si(other_0.e2()) === 0;
+      tmp = this.v1a_1.si(other_0.e2()) === 0;
     } else {
       tmp = false;
     }
     return tmp;
   };
   protoOf(RealImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.s13(other, useVarCompleteName);
+    return this.f14(other, useVarCompleteName);
   };
-  protoOf(RealImpl).t13 = function () {
-    var tmp0 = this.h1a_1;
+  protoOf(RealImpl).g14 = function () {
+    var tmp0 = this.x1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('hashCodeCache', 1, tmp, RealImpl$_get_hashCodeCache_$ref_gtsyxf(), null);
     return tmp0.e2();
   };
-  protoOf(RealImpl).g13 = function (tags) {
-    return new RealImpl(this.f1a_1, tags);
+  protoOf(RealImpl).t13 = function (tags) {
+    return new RealImpl(this.v1a_1, tags);
   };
   protoOf(RealImpl).au = function () {
     return this;
@@ -6161,11 +6300,11 @@
   protoOf(RealImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(RealImpl).i13 = function (visitor) {
+  protoOf(RealImpl).v13 = function (visitor) {
     return visitor.visitReal(this);
   };
   protoOf(RealImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(RealImpl).ep = function () {
     return this.ru();
@@ -6183,14 +6322,14 @@
     return this.jz();
   };
   function _get_fst__e68kkq($this) {
-    var tmp0 = $this.i1a_1;
+    var tmp0 = $this.y1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('fst', 1, tmp, RecursiveImpl$LazyTwoItemsList$_get_fst_$ref_v7w1tf(), null);
     return tmp0.e2();
   }
   function _get_snd__e6grbc($this) {
-    var tmp0 = $this.j1a_1;
+    var tmp0 = $this.z1a_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('snd', 1, tmp, RecursiveImpl$LazyTwoItemsList$_get_snd_$ref_llxhcl(), null);
@@ -6207,7 +6346,7 @@
     }, 1, 0, 18);
   }
   function RecursiveImpl$LazyTwoItemsList$iterator$slambda(this$0, resultContinuation) {
-    this.s1a_1 = this$0;
+    this.i1b_1 = this$0;
     CoroutineImpl.call(this, resultContinuation);
   }
   protoOf(RecursiveImpl$LazyTwoItemsList$iterator$slambda).bq = function ($this$iterator, $completion) {
@@ -6228,7 +6367,7 @@
           case 0:
             this.c8_1 = 3;
             this.b8_1 = 1;
-            suspendResult = this.t1a_1.bd(_get_fst__e68kkq(this.s1a_1), this);
+            suspendResult = this.j1b_1.bd(_get_fst__e68kkq(this.i1b_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -6236,7 +6375,7 @@
             continue $sm;
           case 1:
             this.b8_1 = 2;
-            suspendResult = this.t1a_1.bd(_get_snd__e6grbc(this.s1a_1), this);
+            suspendResult = this.j1b_1.bd(_get_snd__e6grbc(this.i1b_1), this);
             if (suspendResult === get_COROUTINE_SUSPENDED()) {
               return suspendResult;
             }
@@ -6259,8 +6398,8 @@
      while (true);
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$iterator$slambda).cq = function ($this$iterator, completion) {
-    var i = new RecursiveImpl$LazyTwoItemsList$iterator$slambda(this.s1a_1, completion);
-    i.t1a_1 = $this$iterator;
+    var i = new RecursiveImpl$LazyTwoItemsList$iterator$slambda(this.i1b_1, completion);
+    i.j1b_1 = $this$iterator;
     return i;
   };
   function RecursiveImpl$LazyTwoItemsList$iterator$slambda_0(this$0, resultContinuation) {
@@ -6270,58 +6409,58 @@
     }, 1);
   }
   function RecursiveImpl$LazyTwoItemsList$listIterator$1($index, this$0) {
-    this.v1a_1 = $index;
-    this.w1a_1 = this$0;
-    this.u1a_1 = $index;
+    this.l1b_1 = $index;
+    this.m1b_1 = this$0;
+    this.k1b_1 = $index;
   }
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).q = function () {
-    return this.u1a_1 < this.w1a_1.s();
+    return this.k1b_1 < this.m1b_1.s();
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).m3 = function () {
-    return this.u1a_1 > 0;
+    return this.k1b_1 > 0;
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).r = function () {
     var tmp;
     if (this.q()) {
-      var _unary__edvuaz = this.u1a_1;
-      this.u1a_1 = _unary__edvuaz + 1 | 0;
-      tmp = this.w1a_1.x(_unary__edvuaz);
+      var _unary__edvuaz = this.k1b_1;
+      this.k1b_1 = _unary__edvuaz + 1 | 0;
+      tmp = this.m1b_1.x(_unary__edvuaz);
     } else {
       throw NoSuchElementException_init_$Create$();
     }
     return tmp;
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).n3 = function () {
-    return this.v1a_1 + 1 | 0;
+    return this.l1b_1 + 1 | 0;
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).o3 = function () {
     var tmp;
     if (this.m3()) {
-      var _unary__edvuaz = this.u1a_1;
-      this.u1a_1 = _unary__edvuaz - 1 | 0;
-      tmp = this.w1a_1.x(_unary__edvuaz);
+      var _unary__edvuaz = this.k1b_1;
+      this.k1b_1 = _unary__edvuaz - 1 | 0;
+      tmp = this.m1b_1.x(_unary__edvuaz);
     } else {
       throw NoSuchElementException_init_$Create$();
     }
     return tmp;
   };
   protoOf(RecursiveImpl$LazyTwoItemsList$listIterator$1).p3 = function () {
-    return this.u1a_1 - 1 | 0;
+    return this.k1b_1 - 1 | 0;
   };
   function LazyTwoItemsList(firstGenerator, secondGenerator) {
-    this.i1a_1 = lazy(firstGenerator);
-    this.j1a_1 = lazy(secondGenerator);
+    this.y1a_1 = lazy(firstGenerator);
+    this.z1a_1 = lazy(secondGenerator);
   }
   protoOf(LazyTwoItemsList).s = function () {
     return 2;
   };
-  protoOf(LazyTwoItemsList).x1a = function (element) {
+  protoOf(LazyTwoItemsList).n1b = function (element) {
     return equals(_get_fst__e68kkq(this), element) || equals(_get_snd__e6grbc(this), element);
   };
   protoOf(LazyTwoItemsList).y = function (element) {
     if (!true)
       return false;
-    return this.x1a(element);
+    return this.n1b(element);
   };
   protoOf(LazyTwoItemsList).x = function (index) {
     var tmp;
@@ -6337,13 +6476,13 @@
     }
     return tmp;
   };
-  protoOf(LazyTwoItemsList).y1a = function (element) {
+  protoOf(LazyTwoItemsList).o1b = function (element) {
     return equals(element, _get_fst__e68kkq(this)) ? 0 : equals(element, _get_snd__e6grbc(this)) ? 1 : -1;
   };
   protoOf(LazyTwoItemsList).b1 = function (element) {
     if (!true)
       return -1;
-    return this.y1a(element);
+    return this.o1b(element);
   };
   protoOf(LazyTwoItemsList).h = function () {
     return false;
@@ -6396,10 +6535,10 @@
   function RecursiveImpl(functor, args, tags) {
     AbstractStruct.call(this, functor, args, tags);
     var tmp = this;
-    tmp.e13_1 = lazy(RecursiveImpl$unfoldedList$delegate$lambda(this));
+    tmp.r13_1 = lazy(RecursiveImpl$unfoldedList$delegate$lambda(this));
   }
   protoOf(RecursiveImpl).gv = function () {
-    var tmp0 = this.e13_1;
+    var tmp0 = this.r13_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('unfoldedList', 1, tmp, RecursiveImpl$_get_unfoldedList_$ref_j3hyd1(), null);
@@ -6411,12 +6550,12 @@
     return copyToArray(this_0);
   };
   protoOf(RecursiveImpl).bv = function () {
-    return this.j13();
+    return this.w13();
   };
   protoOf(RecursiveImpl).kv = function () {
     return asIterable_0(this.ns());
   };
-  protoOf(RecursiveImpl).j13 = function () {
+  protoOf(RecursiveImpl).w13 = function () {
     var tmp0 = this.hv();
     var tmp$ret$0;
     $l$block: {
@@ -6433,7 +6572,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(RecursiveImpl).k13 = function () {
+  protoOf(RecursiveImpl).x13 = function () {
     return itemWiseHashCode_0(this.hv());
   };
   protoOf(RecursiveImpl).zt = function () {
@@ -6452,7 +6591,7 @@
   protoOf(RecursiveImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(RecursiveImpl).l13 = function (other) {
+  protoOf(RecursiveImpl).y13 = function (other) {
     var tmp0_safe_receiver = other.asRecursive();
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -6466,7 +6605,7 @@
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(RecursiveImpl).m13 = function (other, useVarCompleteName) {
+  protoOf(RecursiveImpl).z13 = function (other, useVarCompleteName) {
     var tmp0_safe_receiver = other.asRecursive();
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -6480,11 +6619,11 @@
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs;
   };
-  protoOf(RecursiveImpl).i13 = function (visitor) {
+  protoOf(RecursiveImpl).v13 = function (visitor) {
     return visitor.visitCollection(this);
   };
   protoOf(RecursiveImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(RecursiveImpl).ep = function () {
     return this.ru();
@@ -6501,16 +6640,16 @@
   function RuleImpl(head, body, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     ClauseImpl.call(this, head, body, tags);
-    this.n18_1 = head;
-    this.o18_1 = body;
+    this.d19_1 = head;
+    this.e19_1 = body;
   }
   protoOf(RuleImpl).dw = function () {
-    return this.n18_1;
+    return this.d19_1;
   };
   protoOf(RuleImpl).ew = function () {
-    return this.o18_1;
+    return this.e19_1;
   };
-  protoOf(RuleImpl).g13 = function (tags) {
+  protoOf(RuleImpl).t13 = function (tags) {
     return new RuleImpl(this.dw(), this.ew(), tags);
   };
   protoOf(RuleImpl).au = function () {
@@ -6531,11 +6670,11 @@
   protoOf(RuleImpl).tx = function () {
     return this.dw().rt();
   };
-  protoOf(RuleImpl).p18 = function (index) {
+  protoOf(RuleImpl).f19 = function (index) {
     return this.dw().get(index);
   };
   protoOf(RuleImpl).getHeadArg = function (index) {
-    return this.p18(index);
+    return this.f19(index);
   };
   protoOf(RuleImpl).ux = function (body) {
     return protoOf(ClauseImpl).ux.call(this, body).castToRule();
@@ -6633,11 +6772,11 @@
   protoOf(RuleImpl).appendBodyItem = function (argument) {
     return this.by(argument);
   };
-  protoOf(RuleImpl).i13 = function (visitor) {
+  protoOf(RuleImpl).v13 = function (visitor) {
     return visitor.visitRule(this);
   };
   protoOf(RuleImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(RuleImpl).ep = function () {
     return this.ru();
@@ -6657,67 +6796,67 @@
   function ScopeImpl$varOf$lambda(this$0, $name) {
     return function () {
       var tmp;
-      if (!this$0.z1a_1.f2($name)) {
-        var tmp0 = this$0.z1a_1;
+      if (!this$0.p1b_1.f2($name)) {
+        var tmp0 = this$0.p1b_1;
         var tmp2 = $name;
         // Inline function 'kotlin.collections.set' call
         var value = Companion_getInstance_25().of($name);
         tmp0.k4(tmp2, value);
         tmp = Unit_instance;
       }
-      return ensureNotNull(this$0.z1a_1.h2($name));
+      return ensureNotNull(this$0.p1b_1.h2($name));
     };
   }
   function ScopeImpl(_variables) {
-    this.z1a_1 = _variables;
+    this.p1b_1 = _variables;
   }
-  protoOf(ScopeImpl).a1b = function (variable) {
-    return this.z1a_1.f2(variable.m2());
+  protoOf(ScopeImpl).q1b = function (variable) {
+    return this.p1b_1.f2(variable.m2());
   };
   protoOf(ScopeImpl).containsVar = function (variable) {
-    return this.a1b(variable);
+    return this.q1b(variable);
   };
-  protoOf(ScopeImpl).b1b = function (variable) {
-    return this.z1a_1.f2(variable);
+  protoOf(ScopeImpl).r1b = function (variable) {
+    return this.p1b_1.f2(variable);
   };
   protoOf(ScopeImpl).contains = function (variable) {
-    return this.b1b(variable);
+    return this.r1b(variable);
   };
   protoOf(ScopeImpl).cb = function (variable) {
-    return this.z1a_1.h2(variable);
+    return this.p1b_1.h2(variable);
   };
   protoOf(ScopeImpl).get = function (variable) {
     return this.cb(variable);
   };
   protoOf(ScopeImpl).zt = function () {
-    return toMap_0(this.z1a_1);
+    return toMap_0(this.p1b_1);
   };
-  protoOf(ScopeImpl).c1b = function (name) {
+  protoOf(ScopeImpl).s1b = function (name) {
     return synchronizedOnSelf(this, ScopeImpl$varOf$lambda(this, name));
   };
   protoOf(ScopeImpl).varOf = function (name) {
-    return this.c1b(name);
+    return this.s1b(name);
   };
-  protoOf(ScopeImpl).d1b = function (name) {
-    return this.c1b(toString_1(name));
+  protoOf(ScopeImpl).t1b = function (name) {
+    return this.s1b(toString_1(name));
   };
   protoOf(ScopeImpl).varOfChar = function (name) {
-    return this.d1b(name);
+    return this.t1b(name);
   };
-  protoOf(ScopeImpl).e1b = function (lambda) {
+  protoOf(ScopeImpl).u1b = function (lambda) {
     // Inline function 'kotlin.also' call
     lambda(this);
     return this;
   };
   protoOf(ScopeImpl).where = function (lambda) {
-    return this.e1b(lambda);
+    return this.u1b(lambda);
   };
-  protoOf(ScopeImpl).f1b = function (lambda) {
+  protoOf(ScopeImpl).v1b = function (lambda) {
     // Inline function 'kotlin.with' call
     return lambda(this);
   };
   protoOf(ScopeImpl).with = function (lambda) {
-    return this.f1b(lambda);
+    return this.v1b(lambda);
   };
   protoOf(ScopeImpl).equals = function (other) {
     if (this === other)
@@ -6726,60 +6865,60 @@
       return false;
     if (!(other instanceof ScopeImpl))
       THROW_CCE();
-    if (!equals(this.z1a_1, other.z1a_1))
+    if (!equals(this.p1b_1, other.p1b_1))
       return false;
     return true;
   };
   protoOf(ScopeImpl).hashCode = function () {
-    return hashCode(this.z1a_1);
+    return hashCode(this.p1b_1);
   };
   protoOf(ScopeImpl).toString = function () {
     return toString(this.zt());
   };
-  protoOf(ScopeImpl).g1b = function (value) {
+  protoOf(ScopeImpl).w1b = function (value) {
     return Companion_getInstance_23().of(value);
   };
   protoOf(ScopeImpl).truthOf = function (value) {
-    return this.g1b(value);
+    return this.w1b(value);
   };
-  protoOf(ScopeImpl).h1b = function (terms) {
+  protoOf(ScopeImpl).x1b = function (terms) {
     return Companion_instance_1.ofIterable(terms);
   };
   protoOf(ScopeImpl).blockOfIterable = function (terms) {
-    return this.h1b(terms);
+    return this.x1b(terms);
   };
-  protoOf(ScopeImpl).i1b = function (terms) {
+  protoOf(ScopeImpl).y1b = function (terms) {
     return Companion_instance_1.ofSequence(terms);
   };
   protoOf(ScopeImpl).blockOfSequence = function (terms) {
-    return this.i1b(terms);
+    return this.y1b(terms);
   };
-  protoOf(ScopeImpl).j1b = function (terms) {
+  protoOf(ScopeImpl).z1b = function (terms) {
     return Companion_instance_1.of(terms.slice());
   };
   protoOf(ScopeImpl).blockOf = function (terms) {
-    return this.j1b(terms);
+    return this.z1b(terms);
   };
-  protoOf(ScopeImpl).k1b = function (terms) {
+  protoOf(ScopeImpl).a1c = function (terms) {
     return Companion_instance_11.ofIterable(terms);
   };
   protoOf(ScopeImpl).logicListOfIterable = function (terms) {
-    return this.k1b(terms);
+    return this.a1c(terms);
   };
-  protoOf(ScopeImpl).l1b = function (terms) {
+  protoOf(ScopeImpl).b1c = function (terms) {
     return Companion_instance_11.ofSequence(terms);
   };
   protoOf(ScopeImpl).logicListOfSequence = function (terms) {
-    return this.l1b(terms);
+    return this.b1c(terms);
   };
   protoOf(ScopeImpl).lz = function () {
     return Companion_getInstance_8().invoke();
   };
-  protoOf(ScopeImpl).m1b = function (terms) {
+  protoOf(ScopeImpl).c1c = function (terms) {
     return Companion_instance_11.of(terms.slice());
   };
   protoOf(ScopeImpl).logicListOf = function (terms) {
-    return this.m1b(terms);
+    return this.c1c(terms);
   };
   protoOf(ScopeImpl).nz = function (terms, last) {
     return Companion_instance_11.from(terms.slice(), last);
@@ -6799,253 +6938,253 @@
   protoOf(ScopeImpl).logicListFromIterable = function (terms, last, $super) {
     return this.logicListFromIterable(terms, last, ($super == null ? true : $super instanceof ScopeImpl) ? $super : THROW_CCE());
   };
-  protoOf(ScopeImpl).n1b = function (terms) {
+  protoOf(ScopeImpl).d1c = function (terms) {
     return Companion_instance_23.ofList(toList_0(terms));
   };
   protoOf(ScopeImpl).tupleOfIterable = function (terms) {
-    return this.n1b(terms);
+    return this.d1c(terms);
   };
-  protoOf(ScopeImpl).o1b = function (terms) {
+  protoOf(ScopeImpl).e1c = function (terms) {
     return Companion_instance_23.ofList(toList_1(terms));
   };
   protoOf(ScopeImpl).tupleOfSequence = function (terms) {
-    return this.o1b(terms);
+    return this.e1c(terms);
   };
-  protoOf(ScopeImpl).p1b = function (terms) {
+  protoOf(ScopeImpl).f1c = function (terms) {
     return Companion_instance_23.ofList(toList(terms));
   };
   protoOf(ScopeImpl).tupleOf = function (terms) {
-    return this.p1b(terms);
+    return this.f1c(terms);
   };
-  protoOf(ScopeImpl).q1b = function (value) {
+  protoOf(ScopeImpl).g1c = function (value) {
     return Companion_getInstance_1().of(value);
   };
   protoOf(ScopeImpl).atomOf = function (value) {
-    return this.q1b(value);
+    return this.g1c(value);
   };
-  protoOf(ScopeImpl).r1b = function (value) {
+  protoOf(ScopeImpl).h1c = function (value) {
     return Companion_getInstance_1().of(toString_1(value));
   };
   protoOf(ScopeImpl).atomOfChar = function (value) {
-    return this.r1b(value);
+    return this.h1c(value);
   };
-  protoOf(ScopeImpl).s1b = function (functor, args) {
+  protoOf(ScopeImpl).i1c = function (functor, args) {
     return Companion_getInstance_18().of(functor, args.slice());
   };
   protoOf(ScopeImpl).structOf = function (functor, args) {
-    return this.s1b(functor, args);
+    return this.i1c(functor, args);
   };
-  protoOf(ScopeImpl).t1b = function (functor, args) {
+  protoOf(ScopeImpl).j1c = function (functor, args) {
     return Companion_getInstance_18().ofSequence(functor, args);
   };
   protoOf(ScopeImpl).structOfSequence = function (functor, args) {
-    return this.t1b(functor, args);
+    return this.j1c(functor, args);
   };
-  protoOf(ScopeImpl).u1b = function (functor, args) {
+  protoOf(ScopeImpl).k1c = function (functor, args) {
     return Companion_getInstance_18().ofIterable(functor, args);
   };
   protoOf(ScopeImpl).structOfIterable = function (functor, args) {
-    return this.u1b(functor, args);
+    return this.k1c(functor, args);
   };
-  protoOf(ScopeImpl).v1b = function (functor, args) {
+  protoOf(ScopeImpl).l1c = function (functor, args) {
     return Companion_getInstance_18().ofList(functor, args);
   };
   protoOf(ScopeImpl).structOfList = function (functor, args) {
-    return this.v1b(functor, args);
+    return this.l1c(functor, args);
   };
-  protoOf(ScopeImpl).w1b = function (head) {
+  protoOf(ScopeImpl).m1c = function (head) {
     return Companion_instance_8.of(head);
   };
   protoOf(ScopeImpl).factOf = function (head) {
-    return this.w1b(head);
+    return this.m1c(head);
   };
-  protoOf(ScopeImpl).x1b = function (head, body1, body) {
+  protoOf(ScopeImpl).n1c = function (head, body1, body) {
     return Companion_instance_15.of(head, arrayConcat([[body1], body]));
   };
   protoOf(ScopeImpl).ruleOf = function (head, body1, body) {
-    return this.x1b(head, body1, body);
+    return this.n1c(head, body1, body);
   };
-  protoOf(ScopeImpl).y1b = function (body1, body) {
+  protoOf(ScopeImpl).o1c = function (body1, body) {
     return Companion_instance_4.of(body1, body.slice());
   };
   protoOf(ScopeImpl).directiveOf = function (body1, body) {
-    return this.y1b(body1, body);
+    return this.o1c(body1, body);
   };
-  protoOf(ScopeImpl).z1b = function (head, body) {
+  protoOf(ScopeImpl).p1c = function (head, body) {
     return Companion_getInstance_3().fw(head, body.slice());
   };
   protoOf(ScopeImpl).clauseOf = function (head, body) {
-    return this.z1b(head, body);
+    return this.p1c(head, body);
   };
-  protoOf(ScopeImpl).a1c = function (head, tail) {
+  protoOf(ScopeImpl).q1c = function (head, tail) {
     return Companion_instance_3.of(head, tail);
   };
   protoOf(ScopeImpl).consOf = function (head, tail) {
-    return this.a1c(head, tail);
+    return this.q1c(head, tail);
   };
-  protoOf(ScopeImpl).b1c = function (name, arity) {
+  protoOf(ScopeImpl).r1c = function (name, arity) {
     return Companion_instance_9.of(name, arity);
   };
   protoOf(ScopeImpl).indicatorOf = function (name, arity) {
-    return this.b1c(name, arity);
+    return this.r1c(name, arity);
   };
-  protoOf(ScopeImpl).c1c = function (name, arity) {
+  protoOf(ScopeImpl).s1c = function (name, arity) {
     return Companion_instance_9.ofString(name, arity);
   };
   protoOf(ScopeImpl).indicatorOfStringInt = function (name, arity) {
-    return this.c1c(name, arity);
+    return this.s1c(name, arity);
   };
-  protoOf(ScopeImpl).d1c = function () {
+  protoOf(ScopeImpl).t1c = function () {
     return Companion_getInstance_25().anonymous();
   };
   protoOf(ScopeImpl).anonymous = function () {
-    return this.d1c();
+    return this.t1c();
   };
-  protoOf(ScopeImpl).e1c = function () {
-    return this.d1c();
+  protoOf(ScopeImpl).u1c = function () {
+    return this.t1c();
   };
   protoOf(ScopeImpl).whatever = function () {
-    return this.e1c();
+    return this.u1c();
   };
-  protoOf(ScopeImpl).f1c = function (value) {
+  protoOf(ScopeImpl).v1c = function (value) {
     return Companion_getInstance_14().ofBigDecimal(value);
   };
   protoOf(ScopeImpl).numOfBigDecimal = function (value) {
-    return this.f1c(value);
+    return this.v1c(value);
   };
-  protoOf(ScopeImpl).g1c = function (value) {
+  protoOf(ScopeImpl).w1c = function (value) {
     return Companion_getInstance_14().ofDouble(value);
   };
   protoOf(ScopeImpl).numOfDouble = function (value) {
-    return this.g1c(value);
+    return this.w1c(value);
   };
-  protoOf(ScopeImpl).h1c = function (value) {
+  protoOf(ScopeImpl).x1c = function (value) {
     return Companion_getInstance_14().ofFloat(value);
   };
   protoOf(ScopeImpl).numOfFloat = function (value) {
-    return this.h1c(value);
+    return this.x1c(value);
   };
-  protoOf(ScopeImpl).i1c = function (value) {
+  protoOf(ScopeImpl).y1c = function (value) {
     return Companion_getInstance_14().ofBigInteger(value);
   };
   protoOf(ScopeImpl).numOfBigInteger = function (value) {
-    return this.i1c(value);
+    return this.y1c(value);
   };
-  protoOf(ScopeImpl).j1c = function (value) {
+  protoOf(ScopeImpl).z1c = function (value) {
     return Companion_getInstance_14().ofInteger(value);
   };
   protoOf(ScopeImpl).numOfInt = function (value) {
-    return this.j1c(value);
+    return this.z1c(value);
   };
-  protoOf(ScopeImpl).k1c = function (value) {
+  protoOf(ScopeImpl).a1d = function (value) {
     return Companion_getInstance_14().ofLong(value);
   };
   protoOf(ScopeImpl).numOfLong = function (value) {
-    return this.k1c(value);
+    return this.a1d(value);
   };
-  protoOf(ScopeImpl).l1c = function (value) {
+  protoOf(ScopeImpl).b1d = function (value) {
     return Companion_getInstance_14().ofShort(value);
   };
   protoOf(ScopeImpl).numOfShort = function (value) {
-    return this.l1c(value);
+    return this.b1d(value);
   };
-  protoOf(ScopeImpl).m1c = function (value) {
+  protoOf(ScopeImpl).c1d = function (value) {
     return Companion_getInstance_14().ofByte(value);
   };
   protoOf(ScopeImpl).numOfByte = function (value) {
-    return this.m1c(value);
+    return this.c1d(value);
   };
-  protoOf(ScopeImpl).n1c = function (value) {
+  protoOf(ScopeImpl).d1d = function (value) {
     return Companion_getInstance_14().parse(value);
   };
   protoOf(ScopeImpl).parseNum = function (value) {
-    return this.n1c(value);
+    return this.d1d(value);
   };
-  protoOf(ScopeImpl).o1c = function (value) {
+  protoOf(ScopeImpl).e1d = function (value) {
     return Companion_getInstance_14().of(value);
   };
   protoOf(ScopeImpl).numOf = function (value) {
-    return this.o1c(value);
+    return this.e1d(value);
   };
-  protoOf(ScopeImpl).p1c = function (value) {
+  protoOf(ScopeImpl).f1d = function (value) {
     return Companion_getInstance_11().ofBigInteger(value);
   };
   protoOf(ScopeImpl).intOfBigInteger = function (value) {
-    return this.p1c(value);
+    return this.f1d(value);
   };
-  protoOf(ScopeImpl).q1c = function (value) {
+  protoOf(ScopeImpl).g1d = function (value) {
     return Companion_getInstance_11().ofInt(value);
   };
   protoOf(ScopeImpl).intOf = function (value) {
-    return this.q1c(value);
+    return this.g1d(value);
   };
-  protoOf(ScopeImpl).r1c = function (value) {
+  protoOf(ScopeImpl).h1d = function (value) {
     return Companion_getInstance_11().ofLong(value);
   };
   protoOf(ScopeImpl).intOfLong = function (value) {
-    return this.r1c(value);
+    return this.h1d(value);
   };
-  protoOf(ScopeImpl).s1c = function (value) {
+  protoOf(ScopeImpl).i1d = function (value) {
     return Companion_getInstance_11().ofShort(value);
   };
   protoOf(ScopeImpl).intOfShort = function (value) {
-    return this.s1c(value);
+    return this.i1d(value);
   };
-  protoOf(ScopeImpl).t1c = function (value) {
+  protoOf(ScopeImpl).j1d = function (value) {
     return Companion_getInstance_11().ofByte(value);
   };
   protoOf(ScopeImpl).intOfByte = function (value) {
-    return this.t1c(value);
+    return this.j1d(value);
   };
-  protoOf(ScopeImpl).u1c = function (value) {
+  protoOf(ScopeImpl).k1d = function (value) {
     return Companion_getInstance_11().parse(value);
   };
   protoOf(ScopeImpl).parseInt = function (value) {
-    return this.u1c(value);
+    return this.k1d(value);
   };
-  protoOf(ScopeImpl).v1c = function (value, radix) {
+  protoOf(ScopeImpl).l1d = function (value, radix) {
     return Companion_getInstance_11().parseRadix(value, radix);
   };
   protoOf(ScopeImpl).parseIntRadix = function (value, radix) {
-    return this.v1c(value, radix);
+    return this.l1d(value, radix);
   };
-  protoOf(ScopeImpl).w1c = function (value) {
+  protoOf(ScopeImpl).m1d = function (value) {
     return Companion_getInstance_15().ofBigDecimal(value);
   };
   protoOf(ScopeImpl).realOfBigDecimal = function (value) {
-    return this.w1c(value);
+    return this.m1d(value);
   };
-  protoOf(ScopeImpl).x1c = function (value) {
+  protoOf(ScopeImpl).n1d = function (value) {
     return Companion_getInstance_15().ofDouble(value);
   };
   protoOf(ScopeImpl).realOf = function (value) {
-    return this.x1c(value);
+    return this.n1d(value);
   };
-  protoOf(ScopeImpl).y1c = function (value) {
+  protoOf(ScopeImpl).o1d = function (value) {
     return Companion_getInstance_15().ofFloat(value);
   };
   protoOf(ScopeImpl).realOfFloat = function (value) {
-    return this.y1c(value);
+    return this.o1d(value);
   };
-  protoOf(ScopeImpl).z1c = function (value) {
+  protoOf(ScopeImpl).p1d = function (value) {
     return Companion_getInstance_15().parse(value);
   };
   protoOf(ScopeImpl).parseReal = function (value) {
-    return this.z1c(value);
+    return this.p1d(value);
   };
-  protoOf(ScopeImpl).a1d = function (assignments) {
+  protoOf(ScopeImpl).q1d = function (assignments) {
     return Companion_getInstance_19().unifierIterable(assignments);
   };
   protoOf(ScopeImpl).unifierOfIterable = function (assignments) {
-    return this.a1d(assignments);
+    return this.q1d(assignments);
   };
-  protoOf(ScopeImpl).b1d = function (assignments) {
-    return this.a1d(asIterable_0(assignments));
+  protoOf(ScopeImpl).r1d = function (assignments) {
+    return this.q1d(asIterable_0(assignments));
   };
   protoOf(ScopeImpl).unifierOfSequence = function (assignments) {
-    return this.b1d(assignments);
+    return this.r1d(assignments);
   };
-  protoOf(ScopeImpl).c1d = function (assignments) {
+  protoOf(ScopeImpl).s1d = function (assignments) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(assignments.length);
@@ -7056,27 +7195,27 @@
       inductionVariable = inductionVariable + 1 | 0;
       var v = item.oc();
       var t = item.pc();
-      var tmp$ret$2 = to(this.c1b(v), t);
+      var tmp$ret$2 = to(this.s1b(v), t);
       destination.l(tmp$ret$2);
     }
-    return this.a1d(destination);
+    return this.q1d(destination);
   };
   protoOf(ScopeImpl).unifierOf = function (assignments) {
-    return this.c1d(assignments);
+    return this.s1d(assignments);
   };
-  protoOf(ScopeImpl).d1d = function (assignments) {
+  protoOf(ScopeImpl).t1d = function (assignments) {
     return Companion_getInstance_19().ofIterable(assignments);
   };
   protoOf(ScopeImpl).substitutionOfIterable = function (assignments) {
-    return this.d1d(assignments);
+    return this.t1d(assignments);
   };
-  protoOf(ScopeImpl).e1d = function (assignments) {
-    return this.d1d(asIterable_0(assignments));
+  protoOf(ScopeImpl).u1d = function (assignments) {
+    return this.t1d(asIterable_0(assignments));
   };
   protoOf(ScopeImpl).substitutionOfSequence = function (assignments) {
-    return this.e1d(assignments);
+    return this.u1d(assignments);
   };
-  protoOf(ScopeImpl).f1d = function (assignments) {
+  protoOf(ScopeImpl).v1d = function (assignments) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(assignments.length);
@@ -7087,26 +7226,27 @@
       inductionVariable = inductionVariable + 1 | 0;
       var v = item.oc();
       var t = item.pc();
-      var tmp$ret$2 = to(this.c1b(v), t);
+      var tmp$ret$2 = to(this.s1b(v), t);
       destination.l(tmp$ret$2);
     }
-    return this.d1d(destination);
+    return this.t1d(destination);
   };
   protoOf(ScopeImpl).substitutionOf = function (assignments) {
-    return this.f1d(assignments);
+    return this.v1d(assignments);
   };
-  function SimpleTermFormatter(quoted, numberVars, ignoreOps) {
+  function SimpleTermFormatter(quoted, numberVars, ignoreOps, tagsOptions) {
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps, tagsOptions);
   }
   protoOf(SimpleTermFormatter).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
   function StructImpl$isGround$delegate$lambda(this$0) {
     return function () {
-      return this$0.j13();
+      return this$0.w13();
     };
   }
   function StructImpl$_get_isGround_$ref_i5zjyw() {
@@ -7117,26 +7257,26 @@
   function StructImpl(functor, args, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AbstractStruct.call(this, functor, args, tags);
-    this.k1d_1 = functor;
-    this.l1d_1 = args;
+    this.a1e_1 = functor;
+    this.b1e_1 = args;
     var tmp = this;
-    tmp.m1d_1 = lazy(StructImpl$isGround$delegate$lambda(this));
+    tmp.c1e_1 = lazy(StructImpl$isGround$delegate$lambda(this));
   }
   protoOf(StructImpl).xt = function () {
-    return this.k1d_1;
+    return this.a1e_1;
   };
   protoOf(StructImpl).yt = function () {
-    return this.l1d_1;
+    return this.b1e_1;
   };
   protoOf(StructImpl).bv = function () {
-    var tmp0 = this.m1d_1;
+    var tmp0 = this.c1e_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('isGround', 1, tmp, StructImpl$_get_isGround_$ref_i5zjyw(), null);
     return tmp0.e2();
   };
-  protoOf(StructImpl).g13 = function (tags) {
-    return new StructImpl(this.k1d_1, this.l1d_1, tags);
+  protoOf(StructImpl).t13 = function (tags) {
+    return new StructImpl(this.a1e_1, this.b1e_1, tags);
   };
   protoOf(StructImpl).ep = function () {
     return this.ru();
@@ -7147,31 +7287,32 @@
   protoOf(StructImpl).asStruct = function () {
     return this.nu();
   };
-  function TermFormatterWithAnonymousVariables(quoted, numberVars, ignoreOps) {
+  function TermFormatterWithAnonymousVariables(quoted, numberVars, ignoreOps, tagsOptions) {
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps, tagsOptions);
   }
   protoOf(TermFormatterWithAnonymousVariables).gw = function (term) {
-    return '_' + term.i12();
+    return '_' + term.v12();
   };
   protoOf(TermFormatterWithAnonymousVariables).visitVar = function (term) {
     return this.gw(term);
   };
   protoOf(TermFormatterWithAnonymousVariables).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
   function OperatorDecorations(prefix, suffix) {
-    this.q1d_1 = prefix;
-    this.r1d_1 = suffix;
+    this.h1e_1 = prefix;
+    this.i1e_1 = suffix;
   }
   protoOf(OperatorDecorations).toString = function () {
-    return 'OperatorDecorations(prefix=' + this.q1d_1 + ', suffix=' + this.r1d_1 + ')';
+    return 'OperatorDecorations(prefix=' + this.h1e_1 + ', suffix=' + this.i1e_1 + ')';
   };
   protoOf(OperatorDecorations).hashCode = function () {
-    var result = getStringHashCode(this.q1d_1);
-    result = imul(result, 31) + getStringHashCode(this.r1d_1) | 0;
+    var result = getStringHashCode(this.h1e_1);
+    result = imul(result, 31) + getStringHashCode(this.i1e_1) | 0;
     return result;
   };
   protoOf(OperatorDecorations).equals = function (other) {
@@ -7179,26 +7320,26 @@
       return true;
     if (!(other instanceof OperatorDecorations))
       return false;
-    if (!(this.q1d_1 === other.q1d_1))
+    if (!(this.h1e_1 === other.h1e_1))
       return false;
-    if (!(this.r1d_1 === other.r1d_1))
+    if (!(this.i1e_1 === other.i1e_1))
       return false;
     return true;
   };
   function _get_decorations__mnzyq($this, $receiver) {
-    var tmp0_elvis_lhs = $this.t1d_1.h2($receiver);
-    return tmp0_elvis_lhs == null ? $this.s1d_1 : tmp0_elvis_lhs;
+    var tmp0_elvis_lhs = $this.k1e_1.h2($receiver);
+    return tmp0_elvis_lhs == null ? $this.j1e_1 : tmp0_elvis_lhs;
   }
   function _get_prefix__wiwq7t($this, $receiver) {
-    return _get_decorations__mnzyq($this, $receiver).q1d_1;
+    return _get_decorations__mnzyq($this, $receiver).h1e_1;
   }
   function _get_suffix__6yo6oq($this, $receiver) {
-    return _get_decorations__mnzyq($this, $receiver).r1d_1;
+    return _get_decorations__mnzyq($this, $receiver).i1e_1;
   }
   function Companion_28() {
     Companion_instance_29 = this;
-    this.s1d_1 = new OperatorDecorations(' ', ' ');
-    this.t1d_1 = mapOf_0([to(',', new OperatorDecorations('', ' ')), to(';', new OperatorDecorations('', ' ')), to('\\+', new OperatorDecorations('', ' '))]);
+    this.j1e_1 = new OperatorDecorations(' ', ' ');
+    this.k1e_1 = mapOf_0([to(',', new OperatorDecorations('', ' ')), to(';', new OperatorDecorations('', ' ')), to('\\+', new OperatorDecorations('', ' '))]);
   }
   var Companion_instance_29;
   function Companion_getInstance_30() {
@@ -7206,25 +7347,34 @@
       new Companion_28();
     return Companion_instance_29;
   }
-  function TermFormatterWithPrettyExpressions_init_$Init$(delegate, operators, quoted, numberVars, ignoreOps, $this) {
+  function TermFormatterWithPrettyExpressions_init_$Init$(delegate, operators, quoted, numberVars, ignoreOps, tagsOptions, $this) {
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    TermFormatterWithPrettyExpressions.call($this, 2147483647, delegate, toOperatorsIndex(operators), emptySet(), quoted, numberVars, ignoreOps);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    TermFormatterWithPrettyExpressions.call($this, 2147483647, delegate, toOperatorsIndex(operators), emptySet(), quoted, numberVars, ignoreOps, tagsOptions);
     return $this;
   }
-  function TermFormatterWithPrettyExpressions_init_$Create$(delegate, operators, quoted, numberVars, ignoreOps) {
-    return TermFormatterWithPrettyExpressions_init_$Init$(delegate, operators, quoted, numberVars, ignoreOps, objectCreate(protoOf(TermFormatterWithPrettyExpressions)));
+  function TermFormatterWithPrettyExpressions_init_$Create$(delegate, operators, quoted, numberVars, ignoreOps, tagsOptions) {
+    return TermFormatterWithPrettyExpressions_init_$Init$(delegate, operators, quoted, numberVars, ignoreOps, tagsOptions, objectCreate(protoOf(TermFormatterWithPrettyExpressions)));
   }
   function wrapWithinParentheses($this, $receiver) {
     return '(' + $receiver + ')';
   }
   function addingParenthesesIfForced($this, struct, stringGenerator) {
     var string = stringGenerator(struct);
-    if ($this.a1e_1.y(struct.xt())) {
-      return wrapWithinParentheses($this, string);
+    var tags = $this.w14_1.z11(struct.lr());
+    var tmp;
+    if ($this.s1e_1.y(struct.xt())) {
+      tmp = true;
+    } else {
+      // Inline function 'kotlin.text.isNotEmpty' call
+      tmp = charSequenceLength(tags) > 0;
+    }
+    if (tmp) {
+      string = wrapWithinParentheses($this, string);
     }
-    return string;
+    return string + tags;
   }
   function visitExpression($this, struct) {
     var prefix = isPrefix($this, struct);
@@ -7241,16 +7391,16 @@
     }
     var lowerPriority = isLowerPriority($this, struct);
     if (!(lowerPriority == null)) {
-      return wrapWithinParentheses($this, struct.accept(childFormatter($this, lowerPriority.second)));
+      return $this.z14(wrapWithinParentheses($this, struct.accept(childFormatter($this, lowerPriority.second))), struct);
     }
     return protoOf(AbstractTermFormatter).yv.call($this, struct);
   }
   function childFormatter($this, priority, forceParentheses) {
     forceParentheses = forceParentheses === VOID ? emptySet() : forceParentheses;
-    return new TermFormatterWithPrettyExpressions(priority, $this.y1d_1, $this.z1d_1, forceParentheses, $this.g14_1, $this.h14_1, $this.i14_1);
+    return new TermFormatterWithPrettyExpressions(priority, $this.q1e_1, $this.r1e_1, forceParentheses, $this.t14_1, $this.u14_1, $this.v14_1, $this.w14_1);
   }
   function isOperator($this, $receiver) {
-    return $this.z1d_1.f2($receiver);
+    return $this.r1e_1.f2($receiver);
   }
   function getSpecifierAndIndex($this, $receiver, functor, priorityPredicate, specifierPredicate) {
     var tmp0_safe_receiver = $receiver.h2(functor);
@@ -7288,7 +7438,7 @@
     var tmp;
     if ($receiver.rt() === 1) {
       var tmp_0 = $receiver.xt();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.z1d_1, tmp_0, $this.x1d_1, TermFormatterWithPrettyExpressions$isPrefix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.r1e_1, tmp_0, $this.p1e_1, TermFormatterWithPrettyExpressions$isPrefix$lambda);
     } else {
       tmp = null;
     }
@@ -7298,7 +7448,7 @@
     var tmp;
     if ($receiver.rt() === 1) {
       var tmp_0 = $receiver.xt();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.z1d_1, tmp_0, $this.x1d_1, TermFormatterWithPrettyExpressions$isPostfix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.r1e_1, tmp_0, $this.p1e_1, TermFormatterWithPrettyExpressions$isPostfix$lambda);
     } else {
       tmp = null;
     }
@@ -7308,7 +7458,7 @@
     var tmp;
     if ($receiver.rt() === 2) {
       var tmp_0 = $receiver.xt();
-      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.z1d_1, tmp_0, $this.x1d_1, TermFormatterWithPrettyExpressions$isInfix$lambda);
+      tmp = getSpecifierAndIndexWithNonGreaterPriority($this, $this.r1e_1, tmp_0, $this.p1e_1, TermFormatterWithPrettyExpressions$isInfix$lambda);
     } else {
       tmp = null;
     }
@@ -7319,11 +7469,11 @@
     switch ($receiver.rt()) {
       case 1:
         var tmp_0 = $receiver.xt();
-        tmp = getSpecifierAndIndexWithGreaterPriority($this, $this.z1d_1, tmp_0, $this.x1d_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda);
+        tmp = getSpecifierAndIndexWithGreaterPriority($this, $this.r1e_1, tmp_0, $this.p1e_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda);
         break;
       case 2:
         var tmp_1 = $receiver.xt();
-        tmp = getSpecifierAndIndexWithGreaterPriority($this, $this.z1d_1, tmp_1, $this.x1d_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0);
+        tmp = getSpecifierAndIndexWithGreaterPriority($this, $this.r1e_1, tmp_1, $this.p1e_1, TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0);
         break;
       default:
         tmp = null;
@@ -7331,9 +7481,17 @@
     }
     return tmp;
   }
-  function TermFormatterWithPrettyExpressions$visitTuple$lambda(this$0) {
+  function TermFormatterWithPrettyExpressions$visitTuple$lambda$lambda(this$0) {
     return function (it) {
-      return it.accept(this$0.k14());
+      return it.accept(this$0.y14());
+    };
+  }
+  function TermFormatterWithPrettyExpressions$visitTuple$lambda($term, this$0) {
+    return function ($this$addingParenthesesIfForced) {
+      var op = ',';
+      var tmp = $term.hv();
+      var tmp_0 = _get_prefix__wiwq7t(Companion_getInstance_30(), op) + op + _get_suffix__6yo6oq(Companion_getInstance_30(), op);
+      return joinToString_0(tmp, tmp_0, VOID, VOID, VOID, VOID, TermFormatterWithPrettyExpressions$visitTuple$lambda$lambda(this$0));
     };
   }
   function TermFormatterWithPrettyExpressions$visitExpression$lambda(this$0, $prefix) {
@@ -7358,7 +7516,7 @@
   }
   function TermFormatterWithPrettyExpressions$getSpecifierAndIndex$lambda_0(this$0) {
     return function (it) {
-      return !this$0.a1e_1.y(it.d2().k2_1);
+      return !this$0.s1e_1.y(it.d2().k2_1);
     };
   }
   function TermFormatterWithPrettyExpressions$getSpecifierAndIndex$lambda_1(it) {
@@ -7376,63 +7534,64 @@
     };
   }
   function TermFormatterWithPrettyExpressions$isPrefix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.d1e();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.v1e();
   }
   function TermFormatterWithPrettyExpressions$isPostfix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.e1e();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.w1e();
   }
   function TermFormatterWithPrettyExpressions$isInfix$lambda($this$getSpecifierAndIndexWithNonGreaterPriority) {
-    return $this$getSpecifierAndIndexWithNonGreaterPriority.f1e();
+    return $this$getSpecifierAndIndexWithNonGreaterPriority.x1e();
   }
   function TermFormatterWithPrettyExpressions$isLowerPriority$lambda($this$getSpecifierAndIndexWithGreaterPriority) {
-    return $this$getSpecifierAndIndexWithGreaterPriority.d1e() || $this$getSpecifierAndIndexWithGreaterPriority.e1e();
+    return $this$getSpecifierAndIndexWithGreaterPriority.v1e() || $this$getSpecifierAndIndexWithGreaterPriority.w1e();
   }
   function TermFormatterWithPrettyExpressions$isLowerPriority$lambda_0($this$getSpecifierAndIndexWithGreaterPriority) {
-    return $this$getSpecifierAndIndexWithGreaterPriority.f1e();
+    return $this$getSpecifierAndIndexWithGreaterPriority.x1e();
   }
-  function TermFormatterWithPrettyExpressions(priority, delegate, operators, forceParentheses, quoted, numberVars, ignoreOps) {
+  function TermFormatterWithPrettyExpressions(priority, delegate, operators, forceParentheses, quoted, numberVars, ignoreOps, tagsOptions) {
     Companion_getInstance_30();
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps);
-    this.x1d_1 = priority;
-    this.y1d_1 = delegate;
-    this.z1d_1 = operators;
-    this.a1e_1 = forceParentheses;
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    AbstractTermFormatter.call(this, quoted, numberVars, ignoreOps, tagsOptions);
+    this.p1e_1 = priority;
+    this.q1e_1 = delegate;
+    this.r1e_1 = operators;
+    this.s1e_1 = forceParentheses;
   }
   protoOf(TermFormatterWithPrettyExpressions).gw = function (term) {
-    return term.accept(this.y1d_1);
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitVar = function (term) {
     return this.gw(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).l14 = function (term) {
-    return term.accept(this.y1d_1);
+  protoOf(TermFormatterWithPrettyExpressions).a15 = function (term) {
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitAtom = function (term) {
-    return this.l14(term);
+    return this.a15(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).g1e = function (term) {
-    return term.accept(this.y1d_1);
+  protoOf(TermFormatterWithPrettyExpressions).y1e = function (term) {
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitInteger = function (term) {
-    return this.g1e(term);
+    return this.y1e(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).h1e = function (term) {
-    return term.accept(this.y1d_1);
+  protoOf(TermFormatterWithPrettyExpressions).z1e = function (term) {
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitReal = function (term) {
-    return this.h1e(term);
+    return this.z1e(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).wv = function (term) {
-    return term.accept(this.y1d_1);
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitEmptyBlock = function (term) {
     return this.wv(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).az = function (term) {
-    return term.accept(this.y1d_1);
+    return term.accept(this.q1e_1);
   };
   protoOf(TermFormatterWithPrettyExpressions).visitEmptyList = function (term) {
     return this.az(term);
@@ -7450,36 +7609,31 @@
     return this.yv(term);
   };
   protoOf(TermFormatterWithPrettyExpressions).mv = function (term) {
-    var op = ',';
-    var tmp = term.hv();
-    var string = joinToString(map(tmp, TermFormatterWithPrettyExpressions$visitTuple$lambda(this)), _get_prefix__wiwq7t(Companion_getInstance_30(), op) + op + _get_suffix__6yo6oq(Companion_getInstance_30(), op));
-    if (this.a1e_1.y(op)) {
-      return wrapWithinParentheses(this, string);
-    }
-    return string;
+    return addingParenthesesIfForced(this, term, TermFormatterWithPrettyExpressions$visitTuple$lambda(term, this));
   };
   protoOf(TermFormatterWithPrettyExpressions).visitTuple = function (term) {
     return this.mv(term);
   };
-  protoOf(TermFormatterWithPrettyExpressions).k14 = function () {
+  protoOf(TermFormatterWithPrettyExpressions).y14 = function () {
     return childFormatter(this, 2147483647, setOf([',', '|']));
   };
-  protoOf(TermFormatterWithPrettyExpressions).j14 = function () {
+  protoOf(TermFormatterWithPrettyExpressions).x14 = function () {
     return childFormatter(this, 2147483647, setOf_0(','));
   };
   protoOf(TermFormatterWithPrettyExpressions).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
-  function TermFormatterWithPrettyVariables(quoted, numberVars, ignoreOps) {
+  function TermFormatterWithPrettyVariables(quoted, numberVars, ignoreOps, tagsOptions) {
     quoted = quoted === VOID ? true : quoted;
     numberVars = numberVars === VOID ? false : numberVars;
     ignoreOps = ignoreOps === VOID ? false : ignoreOps;
-    AbstractTermFormatterForVariables.call(this, quoted, numberVars, ignoreOps);
+    tagsOptions = tagsOptions === VOID ? new TagsFormattingOptions() : tagsOptions;
+    AbstractTermFormatterForVariables.call(this, quoted, numberVars, ignoreOps, tagsOptions);
   }
-  protoOf(TermFormatterWithPrettyVariables).w14 = function (variable, suffix) {
+  protoOf(TermFormatterWithPrettyVariables).m15 = function (variable, suffix) {
     var baseName = variable.m2() + suffix;
     var tmp;
-    if (variable.j12()) {
+    if (variable.w12()) {
       tmp = baseName;
     } else {
       tmp = Companion_getInstance_25().escapeName(baseName);
@@ -7487,20 +7641,20 @@
     return tmp;
   };
   protoOf(TermFormatterWithPrettyVariables).format = function (value) {
-    return this.v11((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
+    return this.i12((!(value == null) ? isInterface(value, Term) : false) ? value : THROW_CCE());
   };
   function TermImpl(tags) {
     tags = tags === VOID ? emptyMap() : tags;
-    this.h13_1 = tags;
+    this.u13_1 = tags;
   }
   protoOf(TermImpl).lr = function () {
-    return this.h13_1;
+    return this.u13_1;
   };
-  protoOf(TermImpl).b14 = function () {
+  protoOf(TermImpl).o14 = function () {
     return -1368133982;
   };
   protoOf(TermImpl).hashCode = function () {
-    return this.t13();
+    return this.g14();
   };
   protoOf(TermImpl).au = function () {
     return this;
@@ -7517,7 +7671,7 @@
   protoOf(TermImpl).b10 = function (tags) {
     var tmp;
     if (!equals(this.lr(), tags)) {
-      tmp = this.g13(tags);
+      tmp = this.t13(tags);
     } else {
       tmp = this;
     }
@@ -7526,14 +7680,14 @@
   protoOf(TermImpl).resetTags = function (tags) {
     return this.b10(tags);
   };
-  protoOf(TermImpl).c14 = function (substitution) {
+  protoOf(TermImpl).p14 = function (substitution) {
     var tmp;
     if (substitution.d10()) {
       var tmp_0;
-      if (this.d14(substitution.castToUnifier())) {
+      if (this.q14(substitution.castToUnifier())) {
         tmp_0 = this;
       } else {
-        tmp_0 = this.f13(substitution.castToUnifier());
+        tmp_0 = this.s13(substitution.castToUnifier());
       }
       tmp = tmp_0;
     } else {
@@ -7542,12 +7696,12 @@
     return tmp;
   };
   protoOf(TermImpl).applySubstitution = function (substitution) {
-    return this.c14(substitution);
+    return this.p14(substitution);
   };
-  protoOf(TermImpl).d14 = function (unifier) {
+  protoOf(TermImpl).q14 = function (unifier) {
     return unifier.h() || this.bv();
   };
-  protoOf(TermImpl).f13 = function (unifier) {
+  protoOf(TermImpl).s13 = function (unifier) {
     return this;
   };
   protoOf(TermImpl).ep = function () {
@@ -7559,16 +7713,16 @@
   function TruthImpl(value, isTrue, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     AtomImpl.call(this, value, tags);
-    this.r1e_1 = isTrue;
+    this.k1f_1 = isTrue;
   }
   protoOf(TruthImpl).vt = function () {
-    return this.r1e_1;
+    return this.k1f_1;
   };
   protoOf(TruthImpl).toString = function () {
     return this.e2();
   };
-  protoOf(TruthImpl).g13 = function (tags) {
-    return new TruthImpl(this.e2(), this.r1e_1, tags);
+  protoOf(TruthImpl).t13 = function (tags) {
+    return new TruthImpl(this.e2(), this.k1f_1, tags);
   };
   protoOf(TruthImpl).au = function () {
     return this;
@@ -7582,11 +7736,11 @@
   protoOf(TruthImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(TruthImpl).i13 = function (visitor) {
+  protoOf(TruthImpl).v13 = function (visitor) {
     return visitor.visitTruth(this);
   };
   protoOf(TruthImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(TruthImpl).ep = function () {
     return this.ru();
@@ -7604,19 +7758,19 @@
     return this.nu();
   };
   protoOf(TruthImpl).asTruth = function () {
-    return this.w11();
+    return this.j12();
   };
   function TupleImpl$unfoldedSequence$$inlined$Iterable$1(this$0) {
-    this.s1e_1 = this$0;
+    this.l1f_1 = this$0;
   }
   protoOf(TupleImpl$unfoldedSequence$$inlined$Iterable$1).n = function () {
-    return new TupleIterator(this.s1e_1);
+    return new TupleIterator(this.l1f_1);
   };
   function TupleImpl$unfold$$inlined$Iterable$1(this$0) {
-    this.t1e_1 = this$0;
+    this.m1f_1 = this$0;
   }
   protoOf(TupleImpl$unfold$$inlined$Iterable$1).n = function () {
-    return new TupleUnfolder(this.t1e_1);
+    return new TupleUnfolder(this.m1f_1);
   };
   function TupleImpl$freshCopy$lambda($scope) {
     return function (it) {
@@ -7626,22 +7780,22 @@
   function TupleImpl(left, right, tags) {
     tags = tags === VOID ? emptyMap() : tags;
     RecursiveImpl.call(this, ',', listOf([left, right]), tags);
-    this.z1e_1 = left;
-    this.a1f_1 = right;
-    this.b1f_1 = this.j13();
-    this.c1f_1 = ',';
+    this.s1f_1 = left;
+    this.t1f_1 = right;
+    this.u1f_1 = this.w13();
+    this.v1f_1 = ',';
   }
   protoOf(TupleImpl).rv = function () {
-    return this.z1e_1;
+    return this.s1f_1;
   };
   protoOf(TupleImpl).qv = function () {
-    return this.a1f_1;
+    return this.t1f_1;
   };
   protoOf(TupleImpl).bv = function () {
-    return this.b1f_1;
+    return this.u1f_1;
   };
-  protoOf(TupleImpl).j13 = function () {
-    return this.z1e_1.bv() && this.a1f_1.bv();
+  protoOf(TupleImpl).w13 = function () {
+    return this.s1f_1.bv() && this.t1f_1.bv();
   };
   protoOf(TupleImpl).hv = function () {
     // Inline function 'kotlin.collections.Iterable' call
@@ -7651,22 +7805,22 @@
   protoOf(TupleImpl).s = function () {
     return this.gv().s();
   };
-  protoOf(TupleImpl).z12 = function () {
+  protoOf(TupleImpl).m13 = function () {
     // Inline function 'kotlin.collections.Iterable' call
     var tmp$ret$0 = new TupleImpl$unfold$$inlined$Iterable$1(this);
     return asSequence_0(tmp$ret$0);
   };
   protoOf(TupleImpl).unfold = function () {
-    return this.z12();
+    return this.m13();
   };
   protoOf(TupleImpl).xt = function () {
-    return this.c1f_1;
+    return this.v1f_1;
   };
   protoOf(TupleImpl).toString = function () {
-    return joinToString(this.hv(), ', ', '(', ')');
+    return joinToString_0(this.hv(), ', ', '(', ')');
   };
-  protoOf(TupleImpl).g13 = function (tags) {
-    return new TupleImpl(this.z1e_1, this.a1f_1, tags);
+  protoOf(TupleImpl).t13 = function (tags) {
+    return new TupleImpl(this.s1f_1, this.t1f_1, tags);
   };
   protoOf(TupleImpl).au = function () {
     return protoOf(RecursiveImpl).au.call(this).castToTuple();
@@ -7676,7 +7830,7 @@
   };
   protoOf(TupleImpl).bu = function (scope) {
     var tmp;
-    if (this.b1f_1) {
+    if (this.u1f_1) {
       tmp = this;
     } else {
       var tmp_0 = this.qu();
@@ -7687,11 +7841,11 @@
   protoOf(TupleImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
-  protoOf(TupleImpl).i13 = function (visitor) {
+  protoOf(TupleImpl).v13 = function (visitor) {
     return visitor.visitTuple(this);
   };
   protoOf(TupleImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(TupleImpl).ep = function () {
     return this.ru();
@@ -7706,7 +7860,7 @@
     return this.jv();
   };
   protoOf(TupleImpl).asTuple = function () {
-    return this.b12();
+    return this.o12();
   };
   protoOf(TupleImpl).t4 = function () {
     return this.t4();
@@ -7715,33 +7869,33 @@
     return this.fv();
   };
   function TupleUnfolder$tupleUnfolderVisitor$1(this$0) {
-    this.d1f_1 = this$0;
+    this.w1f_1 = this$0;
   }
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).mv = function (term) {
-    this.d1f_1.e1f_1 = term.qv();
+    this.w1f_1.x1f_1 = term.qv();
     return term;
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).visitTuple = function (term) {
     return this.mv(term);
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).sv = function (term) {
-    this.d1f_1.e1f_1 = null;
+    this.w1f_1.x1f_1 = null;
     return term;
   };
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).defaultValue = function (term) {
     return this.sv(term);
   };
   function TupleUnfolder(tuple) {
-    this.e1f_1 = tuple;
+    this.x1f_1 = tuple;
     var tmp = this;
-    tmp.f1f_1 = new TupleUnfolder$tupleUnfolderVisitor$1(this);
+    tmp.y1f_1 = new TupleUnfolder$tupleUnfolderVisitor$1(this);
   }
   protoOf(TupleUnfolder).q = function () {
-    return !(this.e1f_1 == null);
+    return !(this.x1f_1 == null);
   };
   protoOf(TupleUnfolder).r = function () {
-    var tmp0_safe_receiver = this.e1f_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.f1f_1);
+    var tmp0_safe_receiver = this.x1f_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.accept(this.y1f_1);
     var tmp;
     if (tmp1_elvis_lhs == null) {
       throw NoSuchElementException_init_$Create$();
@@ -7751,11 +7905,11 @@
     return tmp;
   };
   function instanceId($this, name) {
-    return synchronizedOn($this.g1f_1, VarImpl$Companion$instanceId$lambda(name));
+    return synchronizedOn($this.z1f_1, VarImpl$Companion$instanceId$lambda(name));
   }
   function VarImpl$Companion$instanceId$lambda($name) {
     return function () {
-      var tmp0_safe_receiver = Companion_getInstance_31().g1f_1.h2($name);
+      var tmp0_safe_receiver = Companion_getInstance_31().z1f_1.h2($name);
       var tmp;
       if (tmp0_safe_receiver == null) {
         tmp = null;
@@ -7766,7 +7920,7 @@
       }
       var tmp1_elvis_lhs = tmp;
       var count = tmp1_elvis_lhs == null ? 0n : tmp1_elvis_lhs;
-      var tmp0 = Companion_getInstance_31().g1f_1;
+      var tmp0 = Companion_getInstance_31().z1f_1;
       // Inline function 'kotlin.collections.set' call
       var key = $name;
       tmp0.k4(key, count);
@@ -7777,7 +7931,7 @@
     Companion_instance_30 = this;
     var tmp = this;
     // Inline function 'kotlin.collections.mutableMapOf' call
-    tmp.g1f_1 = LinkedHashMap_init_$Create$();
+    tmp.z1f_1 = LinkedHashMap_init_$Create$();
   }
   var Companion_instance_30;
   function Companion_getInstance_31() {
@@ -7790,13 +7944,13 @@
     if (useVarCompleteName) {
       tmp = $this.r11() === other.r11();
     } else {
-      tmp = $this.i1f_1 === other.m2();
+      tmp = $this.b1g_1 === other.m2();
     }
     return tmp;
   }
   function VarImpl$completeName$delegate$lambda(this$0) {
     return function () {
-      return this$0.i1f_1 + '_' + this$0.j1f_1.toString();
+      return this$0.b1g_1 + '_' + this$0.c1g_1.toString();
     };
   }
   function VarImpl$_get_completeName_$ref_846h0t() {
@@ -7806,12 +7960,12 @@
   }
   function VarImpl$isNameWellFormed$delegate$lambda(this$0) {
     return function () {
-      return Terms_getInstance().us_1.ta(this$0.i1f_1);
+      return Terms_getInstance().us_1.ta(this$0.b1g_1);
     };
   }
   function VarImpl$_get_isNameWellFormed_$ref_ddmxe7() {
     return constructCallableReference(function (p0) {
-      return p0.j12();
+      return p0.w12();
     }, 1, 0, 22);
   }
   function VarImpl$hashCodeCache$delegate$lambda(this$0) {
@@ -7821,7 +7975,7 @@
   }
   function VarImpl$_get_hashCodeCache_$ref_pd8joc() {
     return constructCallableReference(function (p0) {
-      return p0.t13();
+      return p0.g14();
     }, 1, 0, 23);
   }
   function VarImpl(name, identifier, tags) {
@@ -7829,62 +7983,62 @@
     identifier = identifier === VOID ? instanceId(Companion_getInstance_31(), name) : identifier;
     tags = tags === VOID ? emptyMap() : tags;
     TermImpl.call(this, tags);
-    this.i1f_1 = name;
-    this.j1f_1 = identifier;
+    this.b1g_1 = name;
+    this.c1g_1 = identifier;
     var tmp = this;
-    tmp.k1f_1 = lazy(VarImpl$completeName$delegate$lambda(this));
-    this.l1f_1 = get_isAnonymous.call(this);
+    tmp.d1g_1 = lazy(VarImpl$completeName$delegate$lambda(this));
+    this.e1g_1 = get_isAnonymous.call(this);
     var tmp_0 = this;
-    tmp_0.m1f_1 = lazy(VarImpl$isNameWellFormed$delegate$lambda(this));
+    tmp_0.f1g_1 = lazy(VarImpl$isNameWellFormed$delegate$lambda(this));
     var tmp_1 = this;
-    tmp_1.n1f_1 = lazy(VarImpl$hashCodeCache$delegate$lambda(this));
+    tmp_1.g1g_1 = lazy(VarImpl$hashCodeCache$delegate$lambda(this));
   }
   protoOf(VarImpl).m2 = function () {
-    return this.i1f_1;
+    return this.b1g_1;
   };
   protoOf(VarImpl).r11 = function () {
-    var tmp0 = this.k1f_1;
+    var tmp0 = this.d1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('completeName', 1, tmp, VarImpl$_get_completeName_$ref_846h0t(), null);
     return tmp0.e2();
   };
-  protoOf(VarImpl).h12 = function () {
-    return this.l1f_1;
+  protoOf(VarImpl).u12 = function () {
+    return this.e1g_1;
   };
-  protoOf(VarImpl).j12 = function () {
-    var tmp0 = this.m1f_1;
+  protoOf(VarImpl).w12 = function () {
+    var tmp0 = this.f1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('isNameWellFormed', 1, tmp, VarImpl$_get_isNameWellFormed_$ref_ddmxe7(), null);
     return tmp0.e2();
   };
-  protoOf(VarImpl).r13 = function (other) {
+  protoOf(VarImpl).e14 = function (other) {
     return other.tu();
   };
   protoOf(VarImpl).structurallyEquals = function (other) {
-    return this.r13(other);
+    return this.e14(other);
   };
-  protoOf(VarImpl).g13 = function (tags) {
-    return new VarImpl(this.i1f_1, this.j1f_1, tags);
+  protoOf(VarImpl).t13 = function (tags) {
+    return new VarImpl(this.b1g_1, this.c1g_1, tags);
   };
   protoOf(VarImpl).au = function () {
-    return new VarImpl(this.i1f_1, VOID, this.lr());
+    return new VarImpl(this.b1g_1, VOID, this.lr());
   };
   protoOf(VarImpl).freshCopy = function () {
     return this.au();
   };
   protoOf(VarImpl).bu = function (scope) {
-    return setTags(this.l1f_1 ? scope.anonymous() : scope.varOf(this.i1f_1), this.lr());
+    return setTags(this.e1g_1 ? scope.anonymous() : scope.varOf(this.b1g_1), this.lr());
   };
   protoOf(VarImpl).freshCopyFromScope = function (scope) {
     return this.bu(scope);
   };
   protoOf(VarImpl).toString = function () {
-    return this.j12() ? this.r11() : Companion_getInstance_25().escapeName(this.r11());
+    return this.w12() ? this.r11() : Companion_getInstance_25().escapeName(this.r11());
   };
-  protoOf(VarImpl).i12 = function () {
-    return this.j1f_1.toString();
+  protoOf(VarImpl).v12 = function () {
+    return this.c1g_1.toString();
   };
   protoOf(VarImpl).equals = function (other) {
     if (this === other)
@@ -7917,33 +8071,33 @@
     // Inline function 'it.unibo.tuprolog.core.impl.VarImpl.equalsByCompleteName' call
     return this.r11() === otherVar.r11();
   };
-  protoOf(VarImpl).s13 = function (other, useVarCompleteName) {
+  protoOf(VarImpl).f14 = function (other, useVarCompleteName) {
     return other.tu() && equalsToVar(this, other.castToVar(), useVarCompleteName);
   };
   protoOf(VarImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.s13(other, useVarCompleteName);
+    return this.f14(other, useVarCompleteName);
   };
-  protoOf(VarImpl).t13 = function () {
-    var tmp0 = this.n1f_1;
+  protoOf(VarImpl).g14 = function () {
+    var tmp0 = this.g1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('hashCodeCache', 1, tmp, VarImpl$_get_hashCodeCache_$ref_pd8joc(), null);
     return tmp0.e2();
   };
-  protoOf(VarImpl).d14 = function (unifier) {
+  protoOf(VarImpl).q14 = function (unifier) {
     // Inline function 'kotlin.collections.contains' call
     // Inline function 'kotlin.collections.containsKey' call
     return !(isInterface(unifier, KtMap) ? unifier : THROW_CCE()).f2(this);
   };
-  protoOf(VarImpl).f13 = function (unifier) {
+  protoOf(VarImpl).s13 = function (unifier) {
     var tmp0_elvis_lhs = unifier.h2(this);
     return tmp0_elvis_lhs == null ? this : tmp0_elvis_lhs;
   };
-  protoOf(VarImpl).i13 = function (visitor) {
+  protoOf(VarImpl).v13 = function (visitor) {
     return visitor.visitVar(this);
   };
   protoOf(VarImpl).accept = function (visitor) {
-    return this.i13(visitor);
+    return this.v13(visitor);
   };
   protoOf(VarImpl).ep = function () {
     return this.ru();
@@ -7952,210 +8106,210 @@
     return this.su((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(VarImpl).asVar = function () {
-    return this.k12();
+    return this.x12();
   };
   function VariablesProviderImpl(scope) {
-    this.o1f_1 = scope;
+    this.h1g_1 = scope;
   }
-  protoOf(VariablesProviderImpl).p1f = function (thisRef, property) {
+  protoOf(VariablesProviderImpl).i1g = function (thisRef, property) {
     return this.varOf(property.callableName);
   };
   protoOf(VariablesProviderImpl).getValue = function (thisRef, property) {
-    return this.p1f(thisRef, property);
+    return this.i1g(thisRef, property);
   };
   protoOf(VariablesProviderImpl).lz = function () {
-    return this.o1f_1.lz();
+    return this.h1g_1.lz();
   };
   protoOf(VariablesProviderImpl).containsVar = function (variable) {
-    return this.o1f_1.containsVar(variable);
+    return this.h1g_1.containsVar(variable);
   };
   protoOf(VariablesProviderImpl).contains = function (variable) {
-    return this.o1f_1.contains(variable);
+    return this.h1g_1.contains(variable);
   };
   protoOf(VariablesProviderImpl).get = function (variable) {
-    return this.o1f_1.get(variable);
+    return this.h1g_1.get(variable);
   };
   protoOf(VariablesProviderImpl).where = function (lambda) {
-    return this.o1f_1.where(lambda);
+    return this.h1g_1.where(lambda);
   };
   protoOf(VariablesProviderImpl).with = function (lambda) {
-    return this.o1f_1.with(lambda);
+    return this.h1g_1.with(lambda);
   };
   protoOf(VariablesProviderImpl).varOf = function (name) {
-    return this.o1f_1.varOf(name);
+    return this.h1g_1.varOf(name);
   };
   protoOf(VariablesProviderImpl).varOfChar = function (name) {
-    return this.o1f_1.varOfChar(name);
+    return this.h1g_1.varOfChar(name);
   };
   protoOf(VariablesProviderImpl).atomOf = function (value) {
-    return this.o1f_1.atomOf(value);
+    return this.h1g_1.atomOf(value);
   };
   protoOf(VariablesProviderImpl).atomOfChar = function (value) {
-    return this.o1f_1.atomOfChar(value);
+    return this.h1g_1.atomOfChar(value);
   };
   protoOf(VariablesProviderImpl).structOf = function (functor, args) {
-    return this.o1f_1.structOf(functor, args);
+    return this.h1g_1.structOf(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfSequence = function (functor, args) {
-    return this.o1f_1.structOfSequence(functor, args);
+    return this.h1g_1.structOfSequence(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfIterable = function (functor, args) {
-    return this.o1f_1.structOfIterable(functor, args);
+    return this.h1g_1.structOfIterable(functor, args);
   };
   protoOf(VariablesProviderImpl).structOfList = function (functor, args) {
-    return this.o1f_1.structOfList(functor, args);
+    return this.h1g_1.structOfList(functor, args);
   };
   protoOf(VariablesProviderImpl).tupleOf = function (terms) {
-    return this.o1f_1.tupleOf(terms);
+    return this.h1g_1.tupleOf(terms);
   };
   protoOf(VariablesProviderImpl).tupleOfIterable = function (terms) {
-    return this.o1f_1.tupleOfIterable(terms);
+    return this.h1g_1.tupleOfIterable(terms);
   };
   protoOf(VariablesProviderImpl).tupleOfSequence = function (terms) {
-    return this.o1f_1.tupleOfSequence(terms);
+    return this.h1g_1.tupleOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).logicListOf = function (terms) {
-    return this.o1f_1.logicListOf(terms);
+    return this.h1g_1.logicListOf(terms);
   };
   protoOf(VariablesProviderImpl).logicListOfIterable = function (terms) {
-    return this.o1f_1.logicListOfIterable(terms);
+    return this.h1g_1.logicListOfIterable(terms);
   };
   protoOf(VariablesProviderImpl).logicListOfSequence = function (terms) {
-    return this.o1f_1.logicListOfSequence(terms);
+    return this.h1g_1.logicListOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).nz = function (terms, last) {
-    return this.o1f_1.nz(terms, last);
+    return this.h1g_1.nz(terms, last);
   };
   protoOf(VariablesProviderImpl).oz = function (terms, last) {
-    return this.o1f_1.oz(terms, last);
+    return this.h1g_1.oz(terms, last);
   };
   protoOf(VariablesProviderImpl).pz = function (terms, last) {
-    return this.o1f_1.pz(terms, last);
+    return this.h1g_1.pz(terms, last);
   };
   protoOf(VariablesProviderImpl).blockOf = function (terms) {
-    return this.o1f_1.blockOf(terms);
+    return this.h1g_1.blockOf(terms);
   };
   protoOf(VariablesProviderImpl).blockOfIterable = function (terms) {
-    return this.o1f_1.blockOfIterable(terms);
+    return this.h1g_1.blockOfIterable(terms);
   };
   protoOf(VariablesProviderImpl).blockOfSequence = function (terms) {
-    return this.o1f_1.blockOfSequence(terms);
+    return this.h1g_1.blockOfSequence(terms);
   };
   protoOf(VariablesProviderImpl).factOf = function (head) {
-    return this.o1f_1.factOf(head);
+    return this.h1g_1.factOf(head);
   };
   protoOf(VariablesProviderImpl).ruleOf = function (head, body1, body) {
-    return this.o1f_1.ruleOf(head, body1, body);
+    return this.h1g_1.ruleOf(head, body1, body);
   };
   protoOf(VariablesProviderImpl).directiveOf = function (body1, body) {
-    return this.o1f_1.directiveOf(body1, body);
+    return this.h1g_1.directiveOf(body1, body);
   };
   protoOf(VariablesProviderImpl).clauseOf = function (head, body) {
-    return this.o1f_1.clauseOf(head, body);
+    return this.h1g_1.clauseOf(head, body);
   };
   protoOf(VariablesProviderImpl).consOf = function (head, tail) {
-    return this.o1f_1.consOf(head, tail);
+    return this.h1g_1.consOf(head, tail);
   };
   protoOf(VariablesProviderImpl).indicatorOf = function (name, arity) {
-    return this.o1f_1.indicatorOf(name, arity);
+    return this.h1g_1.indicatorOf(name, arity);
   };
   protoOf(VariablesProviderImpl).indicatorOfStringInt = function (name, arity) {
-    return this.o1f_1.indicatorOfStringInt(name, arity);
+    return this.h1g_1.indicatorOfStringInt(name, arity);
   };
   protoOf(VariablesProviderImpl).anonymous = function () {
-    return this.o1f_1.anonymous();
+    return this.h1g_1.anonymous();
   };
   protoOf(VariablesProviderImpl).whatever = function () {
-    return this.o1f_1.whatever();
+    return this.h1g_1.whatever();
   };
   protoOf(VariablesProviderImpl).numOfBigDecimal = function (value) {
-    return this.o1f_1.numOfBigDecimal(value);
+    return this.h1g_1.numOfBigDecimal(value);
   };
   protoOf(VariablesProviderImpl).numOfDouble = function (value) {
-    return this.o1f_1.numOfDouble(value);
+    return this.h1g_1.numOfDouble(value);
   };
   protoOf(VariablesProviderImpl).numOfFloat = function (value) {
-    return this.o1f_1.numOfFloat(value);
+    return this.h1g_1.numOfFloat(value);
   };
   protoOf(VariablesProviderImpl).numOfBigInteger = function (value) {
-    return this.o1f_1.numOfBigInteger(value);
+    return this.h1g_1.numOfBigInteger(value);
   };
   protoOf(VariablesProviderImpl).numOfInt = function (value) {
-    return this.o1f_1.numOfInt(value);
+    return this.h1g_1.numOfInt(value);
   };
   protoOf(VariablesProviderImpl).numOfLong = function (value) {
-    return this.o1f_1.numOfLong(value);
+    return this.h1g_1.numOfLong(value);
   };
   protoOf(VariablesProviderImpl).numOfShort = function (value) {
-    return this.o1f_1.numOfShort(value);
+    return this.h1g_1.numOfShort(value);
   };
   protoOf(VariablesProviderImpl).numOfByte = function (value) {
-    return this.o1f_1.numOfByte(value);
+    return this.h1g_1.numOfByte(value);
   };
   protoOf(VariablesProviderImpl).parseNum = function (value) {
-    return this.o1f_1.parseNum(value);
+    return this.h1g_1.parseNum(value);
   };
   protoOf(VariablesProviderImpl).numOf = function (value) {
-    return this.o1f_1.numOf(value);
+    return this.h1g_1.numOf(value);
   };
   protoOf(VariablesProviderImpl).intOfBigInteger = function (value) {
-    return this.o1f_1.intOfBigInteger(value);
+    return this.h1g_1.intOfBigInteger(value);
   };
   protoOf(VariablesProviderImpl).intOf = function (value) {
-    return this.o1f_1.intOf(value);
+    return this.h1g_1.intOf(value);
   };
   protoOf(VariablesProviderImpl).intOfLong = function (value) {
-    return this.o1f_1.intOfLong(value);
+    return this.h1g_1.intOfLong(value);
   };
   protoOf(VariablesProviderImpl).intOfShort = function (value) {
-    return this.o1f_1.intOfShort(value);
+    return this.h1g_1.intOfShort(value);
   };
   protoOf(VariablesProviderImpl).intOfByte = function (value) {
-    return this.o1f_1.intOfByte(value);
+    return this.h1g_1.intOfByte(value);
   };
   protoOf(VariablesProviderImpl).parseInt = function (value) {
-    return this.o1f_1.parseInt(value);
+    return this.h1g_1.parseInt(value);
   };
   protoOf(VariablesProviderImpl).parseIntRadix = function (value, radix) {
-    return this.o1f_1.parseIntRadix(value, radix);
+    return this.h1g_1.parseIntRadix(value, radix);
   };
   protoOf(VariablesProviderImpl).realOfBigDecimal = function (value) {
-    return this.o1f_1.realOfBigDecimal(value);
+    return this.h1g_1.realOfBigDecimal(value);
   };
   protoOf(VariablesProviderImpl).realOf = function (value) {
-    return this.o1f_1.realOf(value);
+    return this.h1g_1.realOf(value);
   };
   protoOf(VariablesProviderImpl).realOfFloat = function (value) {
-    return this.o1f_1.realOfFloat(value);
+    return this.h1g_1.realOfFloat(value);
   };
   protoOf(VariablesProviderImpl).parseReal = function (value) {
-    return this.o1f_1.parseReal(value);
+    return this.h1g_1.parseReal(value);
   };
   protoOf(VariablesProviderImpl).truthOf = function (value) {
-    return this.o1f_1.truthOf(value);
+    return this.h1g_1.truthOf(value);
   };
   protoOf(VariablesProviderImpl).unifierOf = function (assignments) {
-    return this.o1f_1.unifierOf(assignments);
+    return this.h1g_1.unifierOf(assignments);
   };
   protoOf(VariablesProviderImpl).unifierOfIterable = function (assignments) {
-    return this.o1f_1.unifierOfIterable(assignments);
+    return this.h1g_1.unifierOfIterable(assignments);
   };
   protoOf(VariablesProviderImpl).unifierOfSequence = function (assignments) {
-    return this.o1f_1.unifierOfSequence(assignments);
+    return this.h1g_1.unifierOfSequence(assignments);
   };
   protoOf(VariablesProviderImpl).substitutionOf = function (assignments) {
-    return this.o1f_1.substitutionOf(assignments);
+    return this.h1g_1.substitutionOf(assignments);
   };
   protoOf(VariablesProviderImpl).substitutionOfIterable = function (assignments) {
-    return this.o1f_1.substitutionOfIterable(assignments);
+    return this.h1g_1.substitutionOfIterable(assignments);
   };
   protoOf(VariablesProviderImpl).substitutionOfSequence = function (assignments) {
-    return this.o1f_1.substitutionOfSequence(assignments);
+    return this.h1g_1.substitutionOfSequence(assignments);
   };
   function Companion_30() {
     Companion_instance_31 = this;
-    this.q1f_1 = 'op';
-    this.r1f_1 = Companion_getInstance_18().of('op', [Companion_getInstance_25().of('P'), Companion_getInstance_25().of('A'), Companion_getInstance_25().of('F')]);
+    this.j1g_1 = 'op';
+    this.k1g_1 = Companion_getInstance_18().of('op', [Companion_getInstance_25().of('P'), Companion_getInstance_25().of('A'), Companion_getInstance_25().of('F')]);
   }
   protoOf(Companion_30).fromTerms = function (priority, specifier, functor) {
     return this.fromTerm(Companion_getInstance_18().of('op', [priority, specifier, functor]));
@@ -8248,31 +8402,31 @@
   }
   function Operator(functor, specifier, priority) {
     Companion_getInstance_32();
-    this.s1f_1 = functor;
-    this.t1f_1 = specifier;
-    this.u1f_1 = priority;
+    this.l1g_1 = functor;
+    this.m1g_1 = specifier;
+    this.n1g_1 = priority;
   }
-  protoOf(Operator).v1f = function (other) {
+  protoOf(Operator).o1g = function (other) {
     var tmp;
-    if (this.u1f_1 > other.u1f_1) {
+    if (this.n1g_1 > other.n1g_1) {
       tmp = 1;
-    } else if (this.u1f_1 < other.u1f_1) {
+    } else if (this.n1g_1 < other.n1g_1) {
       tmp = -1;
     } else {
       // Inline function 'kotlin.let' call
-      var specifierCompareTo = this.t1f_1.o2(other.t1f_1);
-      tmp = specifierCompareTo === 0 ? compareTo(this.s1f_1, other.s1f_1) : specifierCompareTo;
+      var specifierCompareTo = this.m1g_1.o2(other.m1g_1);
+      tmp = specifierCompareTo === 0 ? compareTo(this.l1g_1, other.l1g_1) : specifierCompareTo;
     }
     return tmp;
   };
   protoOf(Operator).d = function (other) {
-    return this.v1f(other instanceof Operator ? other : THROW_CCE());
+    return this.o1g(other instanceof Operator ? other : THROW_CCE());
   };
-  protoOf(Operator).w1f = function () {
-    return Companion_getInstance_18().of('op', [intToTerm(this.u1f_1), this.t1f_1.w1f(), stringToAtom(this.s1f_1)]);
+  protoOf(Operator).p1g = function () {
+    return Companion_getInstance_18().of('op', [intToTerm(this.n1g_1), this.m1g_1.p1g(), stringToAtom(this.l1g_1)]);
   };
   protoOf(Operator).toTerm = function () {
-    return this.w1f();
+    return this.p1g();
   };
   protoOf(Operator).equals = function (other) {
     if (this === other)
@@ -8281,19 +8435,19 @@
       return false;
     if (!(other instanceof Operator))
       THROW_CCE();
-    if (!(this.s1f_1 === other.s1f_1))
+    if (!(this.l1g_1 === other.l1g_1))
       return false;
-    if (!this.t1f_1.equals(other.t1f_1))
+    if (!this.m1g_1.equals(other.m1g_1))
       return false;
     return true;
   };
   protoOf(Operator).hashCode = function () {
-    var result = getStringHashCode(this.s1f_1);
-    result = imul(31, result) + this.t1f_1.hashCode() | 0;
+    var result = getStringHashCode(this.l1g_1);
+    result = imul(31, result) + this.m1g_1.hashCode() | 0;
     return result;
   };
   protoOf(Operator).toString = function () {
-    return 'Operator(' + this.u1f_1 + ', ' + toString(this.t1f_1) + ", '" + this.s1f_1 + "')";
+    return 'Operator(' + this.n1g_1 + ', ' + toString(this.m1g_1) + ", '" + this.l1g_1 + "')";
   };
   function OperatorSet$Companion$ARITHMETIC$lambda(it) {
     return new Operator(it, Specifier_FY_getInstance(), 200);
@@ -8344,7 +8498,7 @@
     return new Operator(it, Specifier_XFX_getInstance(), 1200);
   }
   function _get_operators__lk0kke($this) {
-    var tmp0 = $this.y1f_1;
+    var tmp0 = $this.r1g_1;
     var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
     getPropertyCallableRef('operators', 1, tmp, OperatorSet$_get_operators_$ref_odbydx(), null);
@@ -8407,28 +8561,28 @@
     this.STANDARD = new OperatorSet(plus_2(plus_2(plus_2(plus_2(asSequence_0(this.ARITHMETIC), asSequence_0(this.ARITHMETIC_COMPARISON)), asSequence_0(this.TERM_COMPARISON)), asSequence_0(this.CONTROL_FLOW)), asSequence_0(this.CLAUSES)));
     this.DEFAULT = this.STANDARD;
   }
-  protoOf(Companion_31).z1f = function () {
+  protoOf(Companion_31).s1g = function () {
     return this.EMPTY;
   };
-  protoOf(Companion_31).a1g = function () {
+  protoOf(Companion_31).t1g = function () {
     return this.ARITHMETIC;
   };
-  protoOf(Companion_31).b1g = function () {
+  protoOf(Companion_31).u1g = function () {
     return this.ARITHMETIC_COMPARISON;
   };
-  protoOf(Companion_31).c1g = function () {
+  protoOf(Companion_31).v1g = function () {
     return this.TERM_COMPARISON;
   };
-  protoOf(Companion_31).d1g = function () {
+  protoOf(Companion_31).w1g = function () {
     return this.CONTROL_FLOW;
   };
-  protoOf(Companion_31).e1g = function () {
+  protoOf(Companion_31).x1g = function () {
     return this.CLAUSES;
   };
-  protoOf(Companion_31).f1g = function () {
+  protoOf(Companion_31).y1g = function () {
     return this.STANDARD;
   };
-  protoOf(Companion_31).g1g = function () {
+  protoOf(Companion_31).z1g = function () {
     return this.DEFAULT;
   };
   var Companion_instance_32;
@@ -8449,9 +8603,9 @@
   }
   function OperatorSet(operators) {
     Companion_getInstance_33();
-    this.x1f_1 = toHashSet(operators);
+    this.q1g_1 = toHashSet(operators);
     var tmp = this;
-    tmp.y1f_1 = lazy(OperatorSet$operators$delegate$lambda(operators));
+    tmp.r1g_1 = lazy(OperatorSet$operators$delegate$lambda(operators));
   }
   protoOf(OperatorSet).plus = function (operator) {
     // Inline function 'kotlin.collections.toTypedArray' call
@@ -8488,27 +8642,27 @@
     return 'OperatorSet(' + toString(_get_operators__lk0kke(this)) + ')';
   };
   protoOf(OperatorSet).h = function () {
-    return this.x1f_1.h();
+    return this.q1g_1.h();
   };
-  protoOf(OperatorSet).h1g = function (element) {
-    return this.x1f_1.y(element);
+  protoOf(OperatorSet).a1h = function (element) {
+    return this.q1g_1.y(element);
   };
   protoOf(OperatorSet).y = function (element) {
     if (!(element instanceof Operator))
       return false;
-    return this.h1g(element instanceof Operator ? element : THROW_CCE());
+    return this.a1h(element instanceof Operator ? element : THROW_CCE());
   };
   protoOf(OperatorSet).n = function () {
-    return this.x1f_1.n();
+    return this.q1g_1.n();
   };
-  protoOf(OperatorSet).i1g = function (elements) {
-    return this.x1f_1.c2(elements);
+  protoOf(OperatorSet).b1h = function (elements) {
+    return this.q1g_1.c2(elements);
   };
   protoOf(OperatorSet).c2 = function (elements) {
-    return this.i1g(elements);
+    return this.b1h(elements);
   };
   protoOf(OperatorSet).s = function () {
-    return this.x1f_1.s();
+    return this.q1g_1.s();
   };
   function toOperatorsIndex(_this__u8e3s4) {
     // Inline function 'kotlin.collections.mutableMapOf' call
@@ -8518,17 +8672,17 @@
       var op = _iterator__ex2g4s.r();
       // Inline function 'kotlin.collections.contains' call
       // Inline function 'kotlin.collections.containsKey' call
-      var key = op.s1f_1;
+      var key = op.l1g_1;
       if ((isInterface(temp, KtMap) ? temp : THROW_CCE()).f2(key)) {
-        var opsWithFunctor = ensureNotNull(temp.h2(op.s1f_1));
-        var tmp2 = op.t1f_1;
+        var opsWithFunctor = ensureNotNull(temp.h2(op.l1g_1));
+        var tmp2 = op.m1g_1;
         // Inline function 'kotlin.collections.set' call
-        var value = op.u1f_1;
+        var value = op.n1g_1;
         opsWithFunctor.k4(tmp2, value);
       } else {
-        var tmp2_0 = op.s1f_1;
+        var tmp2_0 = op.l1g_1;
         // Inline function 'kotlin.collections.set' call
-        var value_0 = mutableMapOf([to(op.t1f_1, op.u1f_1)]);
+        var value_0 = mutableMapOf([to(op.m1g_1, op.n1g_1)]);
         temp.k4(tmp2_0, value_0);
       }
     }
@@ -8550,10 +8704,10 @@
   }
   function Companion_32() {
     Companion_instance_33 = this;
-    this.j1g_1 = setOf([Specifier_FX_getInstance(), Specifier_FY_getInstance()]);
-    this.k1g_1 = setOf([Specifier_YF_getInstance(), Specifier_XF_getInstance()]);
-    this.l1g_1 = setOf([Specifier_XFX_getInstance(), Specifier_YFX_getInstance(), Specifier_XFY_getInstance()]);
-    this.m1g_1 = plus_3(this.k1g_1, this.l1g_1);
+    this.c1h_1 = setOf([Specifier_FX_getInstance(), Specifier_FY_getInstance()]);
+    this.d1h_1 = setOf([Specifier_YF_getInstance(), Specifier_XF_getInstance()]);
+    this.e1h_1 = setOf([Specifier_XFX_getInstance(), Specifier_YFX_getInstance(), Specifier_XFY_getInstance()]);
+    this.f1h_1 = plus_3(this.d1h_1, this.e1h_1);
   }
   protoOf(Companion_32).fromAtom = function (atom) {
     try {
@@ -8625,20 +8779,20 @@
   function Specifier(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  protoOf(Specifier).d1e = function () {
-    return Companion_getInstance_34().j1g_1.y(this);
+  protoOf(Specifier).v1e = function () {
+    return Companion_getInstance_34().c1h_1.y(this);
   };
-  protoOf(Specifier).f1e = function () {
-    return Companion_getInstance_34().l1g_1.y(this);
+  protoOf(Specifier).x1e = function () {
+    return Companion_getInstance_34().e1h_1.y(this);
   };
-  protoOf(Specifier).e1e = function () {
-    return Companion_getInstance_34().k1g_1.y(this);
+  protoOf(Specifier).w1e = function () {
+    return Companion_getInstance_34().d1h_1.y(this);
   };
-  protoOf(Specifier).w1f = function () {
+  protoOf(Specifier).p1g = function () {
     return _get_atomRepresentation__p7qnyl(this);
   };
   protoOf(Specifier).toTerm = function () {
-    return this.w1f();
+    return this.p1g();
   };
   function Specifier_XF_getInstance() {
     Specifier_initEntries();
@@ -8860,7 +9014,7 @@
   protoOf(TermImpl).apply = apply;
   protoOf(TermImpl).getSubstituted = getSubstituted;
   protoOf(TermImpl).bv = get_isGround;
-  defineProp(protoOf(TermImpl), 'termMark', protoOf(TermImpl).b14);
+  defineProp(protoOf(TermImpl), 'termMark', protoOf(TermImpl).o14);
   protoOf(AbstractStruct).du = get_isStruct_0;
   protoOf(AbstractStruct).st = get_isAtom_0;
   protoOf(AbstractStruct).ju = get_isList_0;
@@ -8893,7 +9047,7 @@
   protoOf(AbstractCons).xw = asList_0;
   protoOf(AbstractCons).rt = get_arity_2;
   protoOf(AbstractCons).s = get_size;
-  protoOf(AbstractTermFormatter).v11 = format;
+  protoOf(AbstractTermFormatter).i12 = format;
   protoOf(AbstractTermFormatter).visitTerm = visitTerm;
   protoOf(AbstractTermFormatter).visitVar = visitVar;
   protoOf(AbstractTermFormatter).visitConstant = visitConstant;
@@ -9039,9 +9193,9 @@
   protoOf(ScopeImpl).mz = get__;
   protoOf(TruthImpl).uu = get_isTruth_0;
   protoOf(TruthImpl).wt = get_isFail_2;
-  protoOf(TruthImpl).w11 = asTruth_0;
+  protoOf(TruthImpl).j12 = asTruth_0;
   protoOf(TupleImpl).iu = get_isTuple_1;
-  protoOf(TupleImpl).b12 = asTuple_0;
+  protoOf(TupleImpl).o12 = asTuple_0;
   protoOf(TupleImpl).rt = get_arity_4;
   protoOf(TupleImpl).t4 = toArray_4;
   protoOf(TupleImpl).fv = toList_7;
@@ -9068,14 +9222,14 @@
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).visitFact = visitFact;
   protoOf(TupleUnfolder$tupleUnfolderVisitor$1).visitDirective = visitDirective;
   protoOf(VarImpl).tu = get_isVar_0;
-  protoOf(VarImpl).k12 = asVar_0;
+  protoOf(VarImpl).x12 = asVar_0;
   protoOf(VarImpl).zt = get_variables_2;
   protoOf(VariablesProviderImpl).logicListFromFrom = logicListFromFrom;
   protoOf(VariablesProviderImpl).logicListFromIterable = logicListFromIterable;
   protoOf(VariablesProviderImpl).logicListFromSequence = logicListFromSequence;
-  defineProp(protoOf(Specifier), 'isPrefix', protoOf(Specifier).d1e);
-  defineProp(protoOf(Specifier), 'isInfix', protoOf(Specifier).f1e);
-  defineProp(protoOf(Specifier), 'isPostfix', protoOf(Specifier).e1e);
+  defineProp(protoOf(Specifier), 'isPrefix', protoOf(Specifier).v1e);
+  defineProp(protoOf(Specifier), 'isInfix', protoOf(Specifier).x1e);
+  defineProp(protoOf(Specifier), 'isPostfix', protoOf(Specifier).w1e);
   //endregion
   //region block: init
   Companion_instance_1 = new Companion_0();