raspberry_games_engine_helpers 1.8.342 → 1.8.346

package/Kosi-Kodein-kodein-di.js

@@ -16,71 +16,71 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.q9;
-  var initMetadataForClass = kotlin_kotlin.$_$.t8;
+  var protoOf = kotlin_kotlin.$_$.m9;
+  var initMetadataForClass = kotlin_kotlin.$_$.p8;
   var VOID = kotlin_kotlin.$_$.f;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.u;
-  var first = kotlin_kotlin.$_$.c6;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.l;
-  var Unit_instance = kotlin_kotlin.$_$.k4;
-  var filterNotNull = kotlin_kotlin.$_$.z5;
-  var sorted = kotlin_kotlin.$_$.l7;
-  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.z;
-  var repeat = kotlin_kotlin.$_$.ya;
-  var ensureNotNull = kotlin_kotlin.$_$.yc;
-  var KProperty1 = kotlin_kotlin.$_$.ga;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.q8;
+  var KProperty1 = kotlin_kotlin.$_$.ba;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.m8;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.s;
+  var first = kotlin_kotlin.$_$.x5;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.j;
+  var Unit_instance = kotlin_kotlin.$_$.e4;
+  var filterNotNull = kotlin_kotlin.$_$.u5;
+  var sorted = kotlin_kotlin.$_$.f7;
+  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.x;
+  var repeat = kotlin_kotlin.$_$.ta;
+  var ensureNotNull = kotlin_kotlin.$_$.xc;
   var toString = kotlin_kotlin.$_$.id;
   var Companion_getInstance = kotlin_org_kodein_type_kaverit.$_$.a;
-  var equals = kotlin_kotlin.$_$.m8;
-  var objectCreate = kotlin_kotlin.$_$.p9;
-  var RuntimeException = kotlin_kotlin.$_$.ic;
-  var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.o1;
-  var captureStack = kotlin_kotlin.$_$.f8;
-  var hashCode = kotlin_kotlin.$_$.s8;
-  var THROW_CCE = kotlin_kotlin.$_$.jc;
-  var initMetadataForInterface = kotlin_kotlin.$_$.w8;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.i1;
-  var toString_0 = kotlin_kotlin.$_$.u9;
-  var getBooleanHashCode = kotlin_kotlin.$_$.o8;
-  var getStringHashCode = kotlin_kotlin.$_$.r8;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.u8;
-  var initMetadataForObject = kotlin_kotlin.$_$.y8;
+  var equals = kotlin_kotlin.$_$.j8;
+  var objectCreate = kotlin_kotlin.$_$.l9;
+  var RuntimeException = kotlin_kotlin.$_$.hc;
+  var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.j1;
+  var captureStack = kotlin_kotlin.$_$.a8;
+  var hashCode = kotlin_kotlin.$_$.o8;
+  var THROW_CCE = kotlin_kotlin.$_$.ic;
+  var initMetadataForInterface = kotlin_kotlin.$_$.s8;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.f1;
+  var toString_0 = kotlin_kotlin.$_$.p9;
+  var getBooleanHashCode = kotlin_kotlin.$_$.k8;
+  var getStringHashCode = kotlin_kotlin.$_$.n8;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.q8;
+  var initMetadataForObject = kotlin_kotlin.$_$.u8;
   var TypeToken = kotlin_org_kodein_type_kaverit.$_$.b;
-  var isInterface = kotlin_kotlin.$_$.g9;
-  var joinToString = kotlin_kotlin.$_$.m6;
+  var isInterface = kotlin_kotlin.$_$.c9;
+  var joinToString = kotlin_kotlin.$_$.g6;
   var erasedOf = kotlin_org_kodein_type_kaverit.$_$.c;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.k;
-  var HashSet_init_$Create$ = kotlin_kotlin.$_$.r;
-  var HashMap_init_$Create$ = kotlin_kotlin.$_$.o;
-  var charSequenceLength = kotlin_kotlin.$_$.i8;
-  var Enum = kotlin_kotlin.$_$.cc;
-  var KtMap = kotlin_kotlin.$_$.t4;
-  var listOf = kotlin_kotlin.$_$.v6;
-  var plus = kotlin_kotlin.$_$.c7;
-  var emptyList = kotlin_kotlin.$_$.w5;
-  var plus_0 = kotlin_kotlin.$_$.d7;
-  var checkIndexOverflow = kotlin_kotlin.$_$.e5;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.a2;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.f5;
-  var mapCapacity = kotlin_kotlin.$_$.x6;
-  var coerceAtLeast = kotlin_kotlin.$_$.x9;
-  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.t;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.i;
+  var HashSet_init_$Create$ = kotlin_kotlin.$_$.p;
+  var HashMap_init_$Create$ = kotlin_kotlin.$_$.m;
+  var charSequenceLength = kotlin_kotlin.$_$.f8;
+  var Enum = kotlin_kotlin.$_$.bc;
+  var KtMap = kotlin_kotlin.$_$.n4;
+  var KProperty0 = kotlin_kotlin.$_$.aa;
+  var listOf = kotlin_kotlin.$_$.p6;
+  var plus = kotlin_kotlin.$_$.w6;
+  var emptyList = kotlin_kotlin.$_$.r5;
+  var plus_0 = kotlin_kotlin.$_$.x6;
+  var checkIndexOverflow = kotlin_kotlin.$_$.z4;
+  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.s1;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.a5;
+  var mapCapacity = kotlin_kotlin.$_$.r6;
+  var coerceAtLeast = kotlin_kotlin.$_$.t9;
+  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.r;
   var to = kotlin_kotlin.$_$.jd;
-  var KProperty0 = kotlin_kotlin.$_$.fa;
-  var lazy = kotlin_kotlin.$_$.dd;
-  var asSequence = kotlin_kotlin.$_$.a5;
-  var filter = kotlin_kotlin.$_$.ia;
-  var flatMap = kotlin_kotlin.$_$.ka;
-  var mapNotNull = kotlin_kotlin.$_$.la;
-  var map = kotlin_kotlin.$_$.ma;
-  var toList = kotlin_kotlin.$_$.na;
-  var Triple = kotlin_kotlin.$_$.lc;
-  var ArrayList_init_$Create$_1 = kotlin_kotlin.$_$.m;
-  var HashMap_init_$Create$_0 = kotlin_kotlin.$_$.p;
-  var Collection = kotlin_kotlin.$_$.m4;
-  var addAll = kotlin_kotlin.$_$.y4;
-  var getOrNull = kotlin_kotlin.$_$.g6;
+  var lazy = kotlin_kotlin.$_$.cd;
+  var asSequence = kotlin_kotlin.$_$.v4;
+  var filter = kotlin_kotlin.$_$.da;
+  var flatMap = kotlin_kotlin.$_$.fa;
+  var mapNotNull = kotlin_kotlin.$_$.ga;
+  var map = kotlin_kotlin.$_$.ha;
+  var toList = kotlin_kotlin.$_$.ia;
+  var Triple = kotlin_kotlin.$_$.kc;
+  var ArrayList_init_$Create$_1 = kotlin_kotlin.$_$.k;
+  var HashMap_init_$Create$_0 = kotlin_kotlin.$_$.n;
+  var Collection = kotlin_kotlin.$_$.g4;
+  var addAll = kotlin_kotlin.$_$.s4;
+  var getOrNull = kotlin_kotlin.$_$.b6;
   //endregion
   //region block: pre-declaration
   initMetadataForClass(DIDefining, 'DIDefining');
@@ -93,10 +93,10 @@
     allowOverride = allowOverride === VOID ? false : allowOverride;
     var tmp;
     if ($super === VOID) {
-      this.v1z(module_0, allowOverride);
+      this.f22(module_0, allowOverride);
       tmp = Unit_instance;
     } else {
-      tmp = $super.v1z.call(this, module_0, allowOverride);
+      tmp = $super.f22.call(this, module_0, allowOverride);
     }
     return tmp;
   }
@@ -121,26 +121,26 @@
   initMetadataForClass(DIWrapper, 'DIWrapper', VOID, VOID, [DI]);
   function factory$default(key, context, overrideLevel, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
-    return $super === VOID ? this.r20(key, context, overrideLevel) : $super.r20.call(this, key, context, overrideLevel);
+    return $super === VOID ? this.b23(key, context, overrideLevel) : $super.b23.call(this, key, context, overrideLevel);
   }
   function provider(key, context, overrideLevel) {
     // Inline function 'org.kodein.di.toProvider' call
-    var this_0 = this.s20(key, context);
+    var this_0 = this.c23(key, context);
     return DIContainer$provider$lambda(this_0);
   }
   function provider$default(key, context, overrideLevel, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
-    return $super === VOID ? this.t20(key, context, overrideLevel) : provider(key, context, overrideLevel);
+    return $super === VOID ? this.d23(key, context, overrideLevel) : provider(key, context, overrideLevel);
   }
   initMetadataForInterface(DIContainer, 'DIContainer');
   function find$default(key, overrideLevel, all, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
     all = all === VOID ? false : all;
-    return $super === VOID ? this.w20(key, overrideLevel, all) : $super.w20.call(this, key, overrideLevel, all);
+    return $super === VOID ? this.g23(key, overrideLevel, all) : $super.g23.call(this, key, overrideLevel, all);
   }
   initMetadataForInterface(DITree, 'DITree');
   function get_di_0() {
-    return this.a21();
+    return this.k23();
   }
   initMetadataForInterface(DirectDIBase, 'DirectDIBase');
   initMetadataForObject(NoDefinedTag, 'NoDefinedTag');
@@ -150,19 +150,19 @@
   initMetadataForClass(DIBinding$Copier$Companion$invoke$1);
   initMetadataForCompanion(Companion_1);
   function factoryFullName() {
-    return this.l21();
+    return this.v23();
   }
   function get_scope() {
     return null;
   }
   function get_description() {
-    var arg = !equals(this.n21(), Companion_getInstance().f1y_1) ? this.n21().h1y() + ' -> ' : '';
+    var arg = !equals(this.x23(), Companion_getInstance().p20_1) ? this.x23().r20() + ' -> ' : '';
     var tmp;
-    var tmp_0 = this.z1z();
+    var tmp_0 = this.j22();
     if (tmp_0 instanceof NoScope) {
       tmp = null;
     } else {
-      tmp = this.z1z();
+      tmp = this.j22();
     }
     var scope = tmp;
     var tmp_1;
@@ -170,22 +170,20 @@
       tmp_1 = null;
     } else {
       // Inline function 'kotlin.let' call
-      // Inline function 'kotlin.contracts.contract' call
-      // Inline function 'org.kodein.di.bindings.DIBinding.<get-description>.<anonymous>' call
-      tmp_1 = 'scoped(' + erasedOf(scope).h1y() + ').';
+      tmp_1 = 'scoped(' + erasedOf(scope).r20() + ').';
     }
-    var tmp0_elvis_lhs = tmp_1;
-    var context = tmp0_elvis_lhs == null ? !equals(this.x1z(), Companion_getInstance().g1y_1) ? 'contexted<' + this.x1z().h1y() + '>().' : '' : tmp0_elvis_lhs;
-    return context + this.l21() + ' { ' + arg + this.o21().h1y() + ' }';
+    var tmp1_elvis_lhs = tmp_1;
+    var context = tmp1_elvis_lhs == null ? !equals(this.h22(), Companion_getInstance().q20_1) ? 'contexted<' + this.h22().r20() + '>().' : '' : tmp1_elvis_lhs;
+    return context + this.v23() + ' { ' + arg + this.y23().r20() + ' }';
   }
   function get_fullDescription() {
-    var arg = !equals(this.n21(), Companion_getInstance().f1y_1) ? this.n21().j1y() + ' -> ' : '';
+    var arg = !equals(this.x23(), Companion_getInstance().p20_1) ? this.x23().t20() + ' -> ' : '';
     var tmp;
-    var tmp_0 = this.z1z();
+    var tmp_0 = this.j22();
     if (tmp_0 instanceof NoScope) {
       tmp = null;
     } else {
-      tmp = this.z1z();
+      tmp = this.j22();
     }
     var scope = tmp;
     var tmp_1;
@@ -193,20 +191,18 @@
       tmp_1 = null;
     } else {
       // Inline function 'kotlin.let' call
-      // Inline function 'kotlin.contracts.contract' call
-      // Inline function 'org.kodein.di.bindings.DIBinding.<get-fullDescription>.<anonymous>' call
-      tmp_1 = 'scoped(' + erasedOf(scope).j1y() + ').';
+      tmp_1 = 'scoped(' + erasedOf(scope).t20() + ').';
     }
-    var tmp0_elvis_lhs = tmp_1;
-    var context = tmp0_elvis_lhs == null ? !equals(this.x1z(), Companion_getInstance().g1y_1) ? 'contexted<' + this.x1z().j1y() + '>().' : '' : tmp0_elvis_lhs;
-    return context + this.m21() + ' { ' + arg + this.o21().j1y() + ' }';
+    var tmp1_elvis_lhs = tmp_1;
+    var context = tmp1_elvis_lhs == null ? !equals(this.h22(), Companion_getInstance().q20_1) ? 'contexted<' + this.h22().t20() + '>().' : '' : tmp1_elvis_lhs;
+    return context + this.w23() + ' { ' + arg + this.y23().t20() + ' }';
   }
   function get_supportSubTypes() {
     return false;
   }
   initMetadataForInterface(DIBinding, 'DIBinding');
   function get_argType() {
-    return Companion_getInstance().f1y_1;
+    return Companion_getInstance().p20_1;
   }
   initMetadataForInterface(NoArgDIBinding, 'NoArgDIBinding', VOID, VOID, [DIBinding]);
   initMetadataForObject(SingletonReference, 'SingletonReference');
@@ -243,32 +239,33 @@
   //endregion
   function DIDefinition(binding, fromModule, tree) {
     DIDefining.call(this, binding, fromModule);
-    this.z1y_1 = tree;
+    this.j21_1 = tree;
   }
   function description(_this__u8e3s4, withOverrides, ident) {
     withOverrides = withOverrides === VOID ? false : withOverrides;
     ident = ident === VOID ? 8 : ident;
-    return descriptionImpl(_this__u8e3s4, withOverrides, ident, bindDescription$factory(), description$factory());
+    var tmp = KProperty1;
+    var tmp_0 = getPropertyCallableRef('bindDescription', 1, tmp, DI$Key$_get_bindDescription_$ref_ua6e71(), null);
+    var tmp_1 = KProperty1;
+    return descriptionImpl(_this__u8e3s4, withOverrides, ident, tmp_0, getPropertyCallableRef('description', 1, tmp_1, DIBinding$_get_description_$ref_vam140(), null));
   }
   function DIDefining(binding, fromModule) {
-    this.a1z_1 = binding;
-    this.b1z_1 = fromModule;
+    this.k21_1 = binding;
+    this.l21_1 = fromModule;
   }
   function descriptionImpl(_this__u8e3s4, withOverrides, ident, keyBindDisp, bindingDisp) {
     // Inline function 'kotlin.collections.groupBy' call
+    var tmp0 = _this__u8e3s4.s();
     // Inline function 'kotlin.collections.groupByTo' call
-    var this_0 = _this__u8e3s4.s();
     var destination = LinkedHashMap_init_$Create$();
-    var tmp0_iterator = this_0.j();
-    while (tmp0_iterator.k()) {
-      var element = tmp0_iterator.l();
-      // Inline function 'org.kodein.di.descriptionImpl.<anonymous>' call
-      var key = first(element.a2()).b1z_1;
+    var _iterator__ex2g4s = tmp0.j();
+    while (_iterator__ex2g4s.k()) {
+      var element = _iterator__ex2g4s.l();
+      var key = first(element.a2()).l21_1;
       // Inline function 'kotlin.collections.getOrPut' call
       var value = destination.d2(key);
       var tmp;
       if (value == null) {
-        // Inline function 'kotlin.collections.groupByTo.<anonymous>' call
         var answer = ArrayList_init_$Create$();
         destination.g2(key, answer);
         tmp = answer;
@@ -281,97 +278,94 @@
     var byModule = destination;
     var modules = sorted(filterNotNull(byModule.e2()));
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
-    var this_1 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.descriptionImpl.<anonymous>' call
+    var this_0 = StringBuilder_init_$Create$();
     var tmp0_safe_receiver = byModule.d2(null);
     if (tmp0_safe_receiver == null)
       null;
     else {
       // Inline function 'kotlin.let' call
-      // Inline function 'kotlin.contracts.contract' call
-      descriptionImpl$appendBindings(this_1, keyBindDisp, bindingDisp, withOverrides, ident, tmp0_safe_receiver);
+      descriptionImpl$appendBindings(this_0, keyBindDisp, bindingDisp, withOverrides, ident, tmp0_safe_receiver);
     }
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_iterator_0 = modules.j();
-    while (tmp0_iterator_0.k()) {
-      var element_0 = tmp0_iterator_0.l();
-      // Inline function 'org.kodein.di.descriptionImpl.<anonymous>.<anonymous>' call
-      this_1.f8(repeat(' ', ident) + 'module ' + element_0 + ' {\n');
-      descriptionImpl$appendBindings(this_1, keyBindDisp, bindingDisp, withOverrides, ident + 4 | 0, ensureNotNull(byModule.d2(element_0)));
-      this_1.f8(repeat(' ', ident) + '}\n');
+    var _iterator__ex2g4s_0 = modules.j();
+    while (_iterator__ex2g4s_0.k()) {
+      var element_0 = _iterator__ex2g4s_0.l();
+      this_0.i8(repeat(' ', ident) + 'module ' + element_0 + ' {\n');
+      descriptionImpl$appendBindings(this_0, keyBindDisp, bindingDisp, withOverrides, ident + 4 | 0, ensureNotNull(byModule.d2(element_0)));
+      this_0.i8(repeat(' ', ident) + '}\n');
     }
-    return this_1.toString();
+    return this_0.toString();
   }
   function fullDescription(_this__u8e3s4, withOverrides, ident) {
     withOverrides = withOverrides === VOID ? false : withOverrides;
     ident = ident === VOID ? 8 : ident;
-    return descriptionImpl(_this__u8e3s4, withOverrides, ident, bindFullDescription$factory(), fullDescription$factory());
+    var tmp = KProperty1;
+    var tmp_0 = getPropertyCallableRef('bindFullDescription', 1, tmp, DI$Key$_get_bindFullDescription_$ref_x9pxcc(), null);
+    var tmp_1 = KProperty1;
+    return descriptionImpl(_this__u8e3s4, withOverrides, ident, tmp_0, getPropertyCallableRef('fullDescription', 1, tmp_1, DIBinding$_get_fullDescription_$ref_12omkv(), null));
   }
   function descriptionImpl$appendBindings(_this__u8e3s4, $keyBindDisp, $bindingDisp, $withOverrides, ident, entries) {
-    var tmp0_iterator = entries.j();
-    while (tmp0_iterator.k()) {
-      var element = tmp0_iterator.l();
-      // Inline function 'org.kodein.di.descriptionImpl.appendBindings.<anonymous>' call
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s = entries.j();
+    while (_iterator__ex2g4s.k()) {
+      var element = _iterator__ex2g4s.l();
       var keyDescription = $keyBindDisp(element.z1());
-      _this__u8e3s4.f8(repeat(' ', ident) + keyDescription + ' { ' + $bindingDisp(first(element.a2()).a1z_1) + ' }');
+      _this__u8e3s4.i8(repeat(' ', ident) + keyDescription + ' { ' + $bindingDisp(first(element.a2()).k21_1) + ' }');
       if ($withOverrides) {
         var subIdent = keyDescription.length - 4 | 0;
         // Inline function 'kotlin.collections.forEach' call
-        var tmp0_iterator_0 = element.a2().u1(1, element.a2().m()).j();
-        while (tmp0_iterator_0.k()) {
-          var element_0 = tmp0_iterator_0.l();
-          // Inline function 'org.kodein.di.descriptionImpl.appendBindings.<anonymous>.<anonymous>' call
-          _this__u8e3s4.f8(repeat(' ', subIdent) + 'overrides ' + $bindingDisp(element_0.a1z_1));
+        var _iterator__ex2g4s_0 = element.a2().v1(1, element.a2().m()).j();
+        while (_iterator__ex2g4s_0.k()) {
+          var element_0 = _iterator__ex2g4s_0.l();
+          _this__u8e3s4.i8(repeat(' ', subIdent) + 'overrides ' + $bindingDisp(element_0.k21_1));
         }
       }
-      _this__u8e3s4.f8('\n');
+      _this__u8e3s4.i8('\n');
     }
     return Unit_instance;
   }
-  function bindDescription$factory() {
-    return getPropertyCallableRef('bindDescription', 1, KProperty1, function (receiver) {
-      return receiver.h1z();
-    }, null);
-  }
-  function description$factory() {
-    return getPropertyCallableRef('description', 1, KProperty1, function (receiver) {
-      return receiver.i1z();
-    }, null);
-  }
-  function bindFullDescription$factory() {
-    return getPropertyCallableRef('bindFullDescription', 1, KProperty1, function (receiver) {
-      return receiver.j1z();
-    }, null);
-  }
-  function fullDescription$factory() {
-    return getPropertyCallableRef('fullDescription', 1, KProperty1, function (receiver) {
-      return receiver.k1z();
-    }, null);
-  }
-  function appendDescription(_this__u8e3s4, $this, displayString) {
-    if (!($this.f1z_1 == null)) {
-      _this__u8e3s4.f8(' tagged "' + toString($this.f1z_1) + '"');
+  function DI$Key$_get_bindDescription_$ref_ua6e71() {
+    return function (p0) {
+      return p0.r21();
+    };
+  }
+  function DIBinding$_get_description_$ref_vam140() {
+    return function (p0) {
+      return p0.s21();
+    };
+  }
+  function DI$Key$_get_bindFullDescription_$ref_x9pxcc() {
+    return function (p0) {
+      return p0.t21();
+    };
+  }
+  function DIBinding$_get_fullDescription_$ref_12omkv() {
+    return function (p0) {
+      return p0.u21();
+    };
+  }
+  function appendDescription($this, _this__u8e3s4, displayString) {
+    if (!($this.p21_1 == null)) {
+      _this__u8e3s4.i8(' tagged "' + toString($this.p21_1) + '"');
     }
-    if (!equals($this.c1z_1, Companion_getInstance().g1y_1)) {
-      _this__u8e3s4.f8(' on context ' + displayString($this.c1z_1));
+    if (!equals($this.m21_1, Companion_getInstance().q20_1)) {
+      _this__u8e3s4.i8(' on context ' + displayString($this.m21_1));
     }
-    if (!equals($this.d1z_1, Companion_getInstance().f1y_1)) {
-      _this__u8e3s4.f8(', with argument ' + displayString($this.d1z_1));
+    if (!equals($this.n21_1, Companion_getInstance().p20_1)) {
+      _this__u8e3s4.i8(', with argument ' + displayString($this.n21_1));
     }
   }
   function TypeToken$simpleDispString$ref() {
     var l = function (p0) {
-      return p0.h1y();
+      return p0.r20();
     };
     l.callableName = 'simpleDispString';
     return l;
   }
   function TypeToken$qualifiedDispString$ref() {
     var l = function (p0) {
-      return p0.j1y();
+      return p0.t20();
     };
     l.callableName = 'qualifiedDispString';
     return l;
@@ -380,7 +374,7 @@
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
     prefix = prefix === VOID ? '' : prefix;
     Module.call($this, allowSilentOverride, prefix, init);
-    $this.o1z_1 = name;
+    $this.y21_1 = name;
     return $this;
   }
   function Module_init_$Create$(name, allowSilentOverride, prefix, init) {
@@ -393,95 +387,83 @@
   function NotFoundException(key, message) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, NotFoundException);
-    this.p1z_1 = key;
+    this.z21_1 = key;
   }
   function OverridingException(message) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, OverridingException);
   }
   function Key(contextType, argType, type, tag) {
-    this.c1z_1 = contextType;
-    this.d1z_1 = argType;
-    this.e1z_1 = type;
-    this.f1z_1 = tag;
-    this.g1z_1 = 0;
+    this.m21_1 = contextType;
+    this.n21_1 = argType;
+    this.o21_1 = type;
+    this.p21_1 = tag;
+    this.q21_1 = 0;
   }
   protoOf(Key).hashCode = function () {
-    if (this.g1z_1 === 0) {
-      this.g1z_1 = hashCode(this.c1z_1);
-      this.g1z_1 = imul(31, this.g1z_1) + hashCode(this.d1z_1) | 0;
-      this.g1z_1 = imul(29, hashCode(this.e1z_1));
+    if (this.q21_1 === 0) {
+      this.q21_1 = hashCode(this.m21_1);
+      this.q21_1 = imul(31, this.q21_1) + hashCode(this.n21_1) | 0;
+      this.q21_1 = imul(29, hashCode(this.o21_1));
       var tmp = this;
-      var tmp_0 = imul(23, this.g1z_1);
-      var tmp1_safe_receiver = this.f1z_1;
-      var tmp0_elvis_lhs = tmp1_safe_receiver == null ? null : hashCode(tmp1_safe_receiver);
-      tmp.g1z_1 = tmp_0 + (tmp0_elvis_lhs == null ? 0 : tmp0_elvis_lhs) | 0;
+      var tmp_0 = imul(23, this.q21_1);
+      var tmp0_safe_receiver = this.p21_1;
+      var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : hashCode(tmp0_safe_receiver);
+      tmp.q21_1 = tmp_0 + (tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs) | 0;
     }
-    return this.g1z_1;
+    return this.q21_1;
   };
   protoOf(Key).toString = function () {
-    return this.i1z();
+    return this.s21();
   };
-  protoOf(Key).h1z = function () {
+  protoOf(Key).r21 = function () {
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
     var this_0 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.Key.<get-bindDescription>.<anonymous>' call
-    this_0.f8('bind<' + this.e1z_1.h1y() + '>');
-    if (!(this.f1z_1 == null)) {
-      this_0.f8('(tag = "' + toString(this.f1z_1) + '")');
+    this_0.i8('bind<' + this.o21_1.r20() + '>');
+    if (!(this.p21_1 == null)) {
+      this_0.i8('(tag = "' + toString(this.p21_1) + '")');
     }
     return this_0.toString();
   };
-  protoOf(Key).j1z = function () {
+  protoOf(Key).t21 = function () {
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
     var this_0 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.Key.<get-bindFullDescription>.<anonymous>' call
-    this_0.f8('bind<' + this.e1z_1.j1y() + '>');
-    if (!(this.f1z_1 == null)) {
-      this_0.f8('(tag = "' + toString(this.f1z_1) + '")');
+    this_0.i8('bind<' + this.o21_1.t20() + '>');
+    if (!(this.p21_1 == null)) {
+      this_0.i8('(tag = "' + toString(this.p21_1) + '")');
     }
     return this_0.toString();
   };
-  protoOf(Key).i1z = function () {
+  protoOf(Key).s21 = function () {
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
     var this_0 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.Key.<get-description>.<anonymous>' call
-    this_0.f8(this.e1z_1.h1y());
-    appendDescription(this_0, this, TypeToken$simpleDispString$ref());
+    this_0.i8(this.o21_1.r20());
+    appendDescription(this, this_0, TypeToken$simpleDispString$ref());
     return this_0.toString();
   };
-  protoOf(Key).q1z = function () {
-    return '(context: ' + this.c1z_1.h1y() + ', arg: ' + this.d1z_1.h1y() + ', type: ' + this.e1z_1.h1y() + ', tag: ' + toString(this.f1z_1) + ')';
+  protoOf(Key).a22 = function () {
+    return '(context: ' + this.m21_1.r20() + ', arg: ' + this.n21_1.r20() + ', type: ' + this.o21_1.r20() + ', tag: ' + toString(this.p21_1) + ')';
   };
-  protoOf(Key).k1z = function () {
+  protoOf(Key).u21 = function () {
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
     var this_0 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.Key.<get-fullDescription>.<anonymous>' call
-    this_0.f8(this.e1z_1.j1y());
-    appendDescription(this_0, this, TypeToken$qualifiedDispString$ref());
+    this_0.i8(this.o21_1.t20());
+    appendDescription(this, this_0, TypeToken$qualifiedDispString$ref());
     return this_0.toString();
   };
-  protoOf(Key).r1z = function (contextType, argType, type, tag) {
+  protoOf(Key).b22 = function (contextType, argType, type, tag) {
     return new Key(contextType, argType, type, tag);
   };
-  protoOf(Key).s1z = function (contextType, argType, type, tag, $super) {
-    contextType = contextType === VOID ? this.c1z_1 : contextType;
-    argType = argType === VOID ? this.d1z_1 : argType;
-    type = type === VOID ? this.e1z_1 : type;
-    tag = tag === VOID ? this.f1z_1 : tag;
-    return $super === VOID ? this.r1z(contextType, argType, type, tag) : $super.r1z.call(this, contextType, argType, type, tag);
+  protoOf(Key).c22 = function (contextType, argType, type, tag, $super) {
+    contextType = contextType === VOID ? this.m21_1 : contextType;
+    argType = argType === VOID ? this.n21_1 : argType;
+    type = type === VOID ? this.o21_1 : type;
+    tag = tag === VOID ? this.p21_1 : tag;
+    return $super === VOID ? this.b22(contextType, argType, type, tag) : $super.b22.call(this, contextType, argType, type, tag);
   };
   protoOf(Key).equals = function (other) {
     if (this === other)
@@ -489,13 +471,13 @@
     if (!(other instanceof Key))
       return false;
     var tmp0_other_with_cast = other instanceof Key ? other : THROW_CCE();
-    if (!equals(this.c1z_1, tmp0_other_with_cast.c1z_1))
+    if (!equals(this.m21_1, tmp0_other_with_cast.m21_1))
       return false;
-    if (!equals(this.d1z_1, tmp0_other_with_cast.d1z_1))
+    if (!equals(this.n21_1, tmp0_other_with_cast.n21_1))
       return false;
-    if (!equals(this.e1z_1, tmp0_other_with_cast.e1z_1))
+    if (!equals(this.o21_1, tmp0_other_with_cast.o21_1))
       return false;
-    if (!equals(this.f1z_1, tmp0_other_with_cast.f1z_1))
+    if (!equals(this.p21_1, tmp0_other_with_cast.p21_1))
       return false;
     return true;
   };
@@ -504,13 +486,13 @@
   function Module(allowSilentOverride, prefix, init) {
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
     prefix = prefix === VOID ? '' : prefix;
-    this.l1z_1 = allowSilentOverride;
-    this.m1z_1 = prefix;
-    this.n1z_1 = init;
-    this.o1z_1 = null;
+    this.v21_1 = allowSilentOverride;
+    this.w21_1 = prefix;
+    this.x21_1 = init;
+    this.y21_1 = null;
   }
   protoOf(Module).k2 = function () {
-    var tmp0_elvis_lhs = this.o1z_1;
+    var tmp0_elvis_lhs = this.y21_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       throw IllegalStateException_init_$Create$('module must have a name.');
@@ -520,12 +502,12 @@
     return tmp;
   };
   protoOf(Module).toString = function () {
-    return 'Module(allowSilentOverride=' + this.l1z_1 + ', prefix=' + this.m1z_1 + ', init=' + toString_0(this.n1z_1) + ')';
+    return 'Module(allowSilentOverride=' + this.v21_1 + ', prefix=' + this.w21_1 + ', init=' + toString_0(this.x21_1) + ')';
   };
   protoOf(Module).hashCode = function () {
-    var result = getBooleanHashCode(this.l1z_1);
-    result = imul(result, 31) + getStringHashCode(this.m1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.n1z_1) | 0;
+    var result = getBooleanHashCode(this.v21_1);
+    result = imul(result, 31) + getStringHashCode(this.w21_1) | 0;
+    result = imul(result, 31) + hashCode(this.x21_1) | 0;
     return result;
   };
   protoOf(Module).equals = function (other) {
@@ -534,24 +516,24 @@
     if (!(other instanceof Module))
       return false;
     var tmp0_other_with_cast = other instanceof Module ? other : THROW_CCE();
-    if (!(this.l1z_1 === tmp0_other_with_cast.l1z_1))
+    if (!(this.v21_1 === tmp0_other_with_cast.v21_1))
       return false;
-    if (!(this.m1z_1 === tmp0_other_with_cast.m1z_1))
+    if (!(this.w21_1 === tmp0_other_with_cast.w21_1))
       return false;
-    if (!equals(this.n1z_1, tmp0_other_with_cast.n1z_1))
+    if (!equals(this.x21_1, tmp0_other_with_cast.x21_1))
       return false;
     return true;
   };
   function Companion() {
-    this.a20_1 = false;
-    this.b20_1 = false;
+    this.k22_1 = false;
+    this.l22_1 = false;
   }
-  protoOf(Companion).c20 = function (allowSilentOverride, init) {
+  protoOf(Companion).m22 = function (allowSilentOverride, init) {
     return DIImpl_init_$Create$(allowSilentOverride, init);
   };
-  protoOf(Companion).d20 = function (allowSilentOverride, init, $super) {
+  protoOf(Companion).n22 = function (allowSilentOverride, init, $super) {
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
-    return $super === VOID ? this.c20(allowSilentOverride, init) : $super.c20.call(this, allowSilentOverride, init);
+    return $super === VOID ? this.m22(allowSilentOverride, init) : $super.m22.call(this, allowSilentOverride, init);
   };
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -563,26 +545,26 @@
   }
   function Instance(_this__u8e3s4, type, tag) {
     tag = tag === VOID ? null : tag;
-    var tmp = _this__u8e3s4.h20();
-    var tmp_0 = _this__u8e3s4.g20();
+    var tmp = _this__u8e3s4.r22();
+    var tmp_0 = _this__u8e3s4.q22();
     return new DIProperty(tmp, tmp_0, Instance$lambda(_this__u8e3s4, type, tag));
   }
   function Value(type, value) {
-    this.i20_1 = type;
-    this.j20_1 = value;
+    this.s22_1 = type;
+    this.t22_1 = value;
   }
-  protoOf(Value).k20 = function () {
-    return this.i20_1;
+  protoOf(Value).u22 = function () {
+    return this.s22_1;
   };
   protoOf(Value).a2 = function () {
-    return this.j20_1;
+    return this.t22_1;
   };
   protoOf(Value).toString = function () {
-    return 'Value(type=' + toString_0(this.i20_1) + ', value=' + toString_0(this.j20_1) + ')';
+    return 'Value(type=' + toString_0(this.s22_1) + ', value=' + toString_0(this.t22_1) + ')';
   };
   protoOf(Value).hashCode = function () {
-    var result = hashCode(this.i20_1);
-    result = imul(result, 31) + hashCode(this.j20_1) | 0;
+    var result = hashCode(this.s22_1);
+    result = imul(result, 31) + hashCode(this.t22_1) | 0;
     return result;
   };
   protoOf(Value).equals = function (other) {
@@ -591,15 +573,15 @@
     if (!(other instanceof Value))
       return false;
     var tmp0_other_with_cast = other instanceof Value ? other : THROW_CCE();
-    if (!equals(this.i20_1, tmp0_other_with_cast.i20_1))
+    if (!equals(this.s22_1, tmp0_other_with_cast.s22_1))
       return false;
-    if (!equals(this.j20_1, tmp0_other_with_cast.j20_1))
+    if (!equals(this.t22_1, tmp0_other_with_cast.t22_1))
       return false;
     return true;
   };
   function Companion_0() {
   }
-  protoOf(Companion_0).l20 = function (type, value) {
+  protoOf(Companion_0).v22 = function (type, value) {
     return new Value(type, value);
   };
   var Companion_instance_0;
@@ -609,11 +591,11 @@
   function DIContext() {
   }
   function get_AnyDIContext() {
-    return Contexes_getInstance().m20_1;
+    return Contexes_getInstance().w22_1;
   }
   function Contexes() {
     Contexes_instance = this;
-    this.m20_1 = Companion_instance_0.l20(Companion_getInstance().g1y_1, new Object());
+    this.w22_1 = Companion_instance_0.v22(Companion_getInstance().q20_1, new Object());
   }
   var Contexes_instance;
   function Contexes_getInstance() {
@@ -622,14 +604,14 @@
     return Contexes_instance;
   }
   function On(_this__u8e3s4, context, trigger) {
-    context = context === VOID ? _this__u8e3s4.g20() : context;
-    trigger = trigger === VOID ? _this__u8e3s4.h20() : trigger;
+    context = context === VOID ? _this__u8e3s4.q22() : context;
+    trigger = trigger === VOID ? _this__u8e3s4.r22() : trigger;
     return DIWrapper_init_$Create$(_this__u8e3s4, context, trigger);
   }
   function DIWrapper_init_$Init$(base, diContext, trigger, $this) {
-    diContext = diContext === VOID ? base.g20() : diContext;
-    trigger = trigger === VOID ? base.h20() : trigger;
-    DIWrapper.call($this, base.e20(), diContext, trigger);
+    diContext = diContext === VOID ? base.q22() : diContext;
+    trigger = trigger === VOID ? base.r22() : trigger;
+    DIWrapper.call($this, base.o22(), diContext, trigger);
     return $this;
   }
   function DIWrapper_init_$Create$(base, diContext, trigger) {
@@ -637,34 +619,33 @@
   }
   function DIWrapper(_base, diContext, diTrigger) {
     diTrigger = diTrigger === VOID ? null : diTrigger;
-    this.n20_1 = _base;
-    this.o20_1 = diContext;
-    this.p20_1 = diTrigger;
+    this.x22_1 = _base;
+    this.y22_1 = diContext;
+    this.z22_1 = diTrigger;
   }
-  protoOf(DIWrapper).g20 = function () {
-    return this.o20_1;
+  protoOf(DIWrapper).q22 = function () {
+    return this.y22_1;
   };
-  protoOf(DIWrapper).h20 = function () {
-    return this.p20_1;
+  protoOf(DIWrapper).r22 = function () {
+    return this.z22_1;
   };
-  protoOf(DIWrapper).e20 = function () {
+  protoOf(DIWrapper).o22 = function () {
     return this;
   };
-  protoOf(DIWrapper).f20 = function () {
-    return this.n20_1.f20();
+  protoOf(DIWrapper).p22 = function () {
+    return this.x22_1.p22();
   };
   function Instance$lambda($this_Instance, $type, $tag) {
     return function (ctx, _unused_var__etf5q3) {
-      var tmp = $this_Instance.e20().f20();
+      var tmp = $this_Instance.o22().p22();
       // Inline function 'org.kodein.di.anyType' call
-      var tmp_0 = ctx.k20();
+      var tmp_0 = ctx.u22();
       var tmp$ret$0 = isInterface(tmp_0, TypeToken) ? tmp_0 : THROW_CCE();
-      return tmp.q20(new Key(tmp$ret$0, Companion_getInstance().f1y_1, $type, $tag), ctx.a2())();
+      return tmp.a23(new Key(tmp$ret$0, Companion_getInstance().p20_1, $type, $tag), ctx.a2())();
     };
   }
   function DIContainer$provider$lambda($this) {
     return function () {
-      // Inline function 'org.kodein.di.DIContainer.provider.<anonymous>' call
       return $this(Unit_instance);
     };
   }
@@ -685,60 +666,60 @@
     argType = argType === VOID ? null : argType;
     type = type === VOID ? null : type;
     tag = tag === VOID ? NoDefinedTag_instance : tag;
-    this.e21_1 = contextType;
-    this.f21_1 = argType;
-    this.g21_1 = type;
-    this.h21_1 = tag;
+    this.o23_1 = contextType;
+    this.p23_1 = argType;
+    this.q23_1 = type;
+    this.r23_1 = tag;
   }
   protoOf(SearchSpecs).toString = function () {
     var args = ArrayList_init_$Create$();
-    if (!(this.e21_1 == null)) {
+    if (!(this.o23_1 == null)) {
+      var tmp0_safe_receiver = this.o23_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp9_safe_receiver = this.e21_1;
-      var element = 'contextType=' + (tmp9_safe_receiver == null ? null : tmp9_safe_receiver.h1y());
+      var element = 'contextType=' + (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r20());
       args.e(element);
     }
-    if (!(this.f21_1 == null)) {
+    if (!(this.p23_1 == null)) {
+      var tmp1_safe_receiver = this.p23_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp10_safe_receiver = this.f21_1;
-      var element_0 = 'argType=' + (tmp10_safe_receiver == null ? null : tmp10_safe_receiver.h1y());
+      var element_0 = 'argType=' + (tmp1_safe_receiver == null ? null : tmp1_safe_receiver.r20());
       args.e(element_0);
     }
-    if (!(this.g21_1 == null)) {
+    if (!(this.q23_1 == null)) {
+      var tmp2_safe_receiver = this.q23_1;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp11_safe_receiver = this.g21_1;
-      var element_1 = 'type=' + (tmp11_safe_receiver == null ? null : tmp11_safe_receiver.h1y());
+      var element_1 = 'type=' + (tmp2_safe_receiver == null ? null : tmp2_safe_receiver.r20());
       args.e(element_1);
     }
-    if (!equals(this.h21_1, NoDefinedTag_instance)) {
+    if (!equals(this.r23_1, NoDefinedTag_instance)) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var element_2 = 'tag=' + toString(this.h21_1);
+      var element_2 = 'tag=' + toString(this.r23_1);
       args.e(element_2);
     }
     return '[' + joinToString(args, ', ') + ']';
   };
   function NoArgBindingDIWrap(_di) {
-    this.i21_1 = _di;
+    this.s23_1 = _di;
   }
-  protoOf(NoArgBindingDIWrap).b21 = function (context) {
-    return this.i21_1.b21(context);
+  protoOf(NoArgBindingDIWrap).k23 = function () {
+    return this.s23_1.k23();
   };
-  protoOf(NoArgBindingDIWrap).c21 = function (type, tag) {
-    return this.i21_1.c21(type, tag);
+  protoOf(NoArgBindingDIWrap).o22 = function () {
+    return this.s23_1.o22();
   };
-  protoOf(NoArgBindingDIWrap).a21 = function () {
-    return this.i21_1.a21();
+  protoOf(NoArgBindingDIWrap).l23 = function (context) {
+    return this.s23_1.l23(context);
   };
-  protoOf(NoArgBindingDIWrap).e20 = function () {
-    return this.i21_1.e20();
+  protoOf(NoArgBindingDIWrap).m23 = function (type, tag) {
+    return this.s23_1.m23(type, tag);
   };
-  protoOf(NoArgBindingDIWrap).d21 = function () {
-    return this.i21_1.d21();
+  protoOf(NoArgBindingDIWrap).n23 = function () {
+    return this.s23_1.n23();
   };
   function ErasedContext() {
   }
-  protoOf(ErasedContext).k20 = function () {
-    return Companion_getInstance().g1y_1;
+  protoOf(ErasedContext).u22 = function () {
+    return Companion_getInstance().q20_1;
   };
   protoOf(ErasedContext).a2 = function () {
     return ErasedContext_instance;
@@ -748,11 +729,11 @@
     return ErasedContext_instance;
   }
   function DIBinding$Copier$Companion$invoke$1($f) {
-    this.j21_1 = $f;
+    this.t23_1 = $f;
   }
   function Companion_1() {
   }
-  protoOf(Companion_1).k21 = function (f) {
+  protoOf(Companion_1).u23 = function (f) {
     return new DIBinding$Copier$Companion$invoke$1(f);
   };
   var Companion_instance_1;
@@ -770,7 +751,7 @@
   }
   function SingletonReference() {
   }
-  protoOf(SingletonReference).r21 = function (creator) {
+  protoOf(SingletonReference).b24 = function (creator) {
     var value = creator();
     return new Reference(value, SingletonReference$make$lambda(value));
   };
@@ -779,21 +760,21 @@
     return SingletonReference_instance;
   }
   function Reference(current, next) {
-    this.s21_1 = current;
-    this.t21_1 = next;
+    this.c24_1 = current;
+    this.d24_1 = next;
   }
-  protoOf(Reference).zc = function () {
-    return this.s21_1;
+  protoOf(Reference).nd = function () {
+    return this.c24_1;
   };
-  protoOf(Reference).ad = function () {
-    return this.t21_1;
+  protoOf(Reference).od = function () {
+    return this.d24_1;
   };
   protoOf(Reference).toString = function () {
-    return 'Reference(current=' + toString_0(this.s21_1) + ', next=' + toString_0(this.t21_1) + ')';
+    return 'Reference(current=' + toString_0(this.c24_1) + ', next=' + toString_0(this.d24_1) + ')';
   };
   protoOf(Reference).hashCode = function () {
-    var result = hashCode(this.s21_1);
-    result = imul(result, 31) + hashCode(this.t21_1) | 0;
+    var result = hashCode(this.c24_1);
+    result = imul(result, 31) + hashCode(this.d24_1) | 0;
     return result;
   };
   protoOf(Reference).equals = function (other) {
@@ -802,9 +783,9 @@
     if (!(other instanceof Reference))
       return false;
     var tmp0_other_with_cast = other instanceof Reference ? other : THROW_CCE();
-    if (!equals(this.s21_1, tmp0_other_with_cast.s21_1))
+    if (!equals(this.c24_1, tmp0_other_with_cast.c24_1))
       return false;
-    if (!equals(this.t21_1, tmp0_other_with_cast.t21_1))
+    if (!equals(this.d24_1, tmp0_other_with_cast.d24_1))
       return false;
     return true;
   };
@@ -813,127 +794,138 @@
   function ScopeRegistry() {
   }
   function NoScope() {
-    this.x21_1 = new StandardScopeRegistry();
+    this.h24_1 = new StandardScopeRegistry();
   }
-  protoOf(NoScope).y21 = function (context) {
-    return this.x21_1;
+  protoOf(NoScope).i24 = function (context) {
+    return this.h24_1;
   };
-  protoOf(NoScope).z21 = function (context) {
-    return this.y21((context == null ? true : !(context == null)) ? context : THROW_CCE());
+  protoOf(NoScope).j24 = function (context) {
+    return this.i24((context == null ? true : !(context == null)) ? context : THROW_CCE());
   };
   function StandardScopeRegistry() {
     ScopeRegistry.call(this);
-    this.a22_1 = newConcurrentMap();
-    this.b22_1 = new Object();
+    this.k24_1 = newConcurrentMap();
+    this.l24_1 = new Object();
   }
-  protoOf(StandardScopeRegistry).w21 = function (key, sync, creator) {
+  protoOf(StandardScopeRegistry).g24 = function (key, sync, creator) {
+    var tmp0 = sync ? this.l24_1 : null;
     var tmp$ret$2;
-    $l$block_1: {
+    $l$block_3: {
       // Inline function 'org.kodein.di.internal.synchronizedIfNull' call
-      sync && this.b22_1;
-      // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-      var tmp16_safe_receiver = this.a22_1.d2(key);
-      var tmp60_safe_receiver = tmp16_safe_receiver == null ? null : tmp16_safe_receiver();
-      if (tmp60_safe_receiver == null)
+      var tmp0_safe_receiver = this.k24_1.d2(key);
+      var tmp0_safe_receiver_0 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver();
+      if (tmp0_safe_receiver_0 == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        // Inline function 'kotlin.contracts.contract' call
-        // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-        tmp$ret$2 = tmp60_safe_receiver;
-        break $l$block_1;
+        tmp$ret$2 = tmp0_safe_receiver_0;
+        break $l$block_3;
       }
       // Inline function 'org.kodein.di.internal.maySynchronized' call
-      var tmp$ret$5;
-      $l$block_0: {
-        // Inline function 'org.kodein.di.internal.synchronizedIfNull.<anonymous>' call
-        // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-        var tmp16_safe_receiver_0 = this.a22_1.d2(key);
-        var tmp61_safe_receiver = tmp16_safe_receiver_0 == null ? null : tmp16_safe_receiver_0();
-        if (tmp61_safe_receiver == null)
-          null;
-        else {
-          // Inline function 'kotlin.let' call
-          // Inline function 'kotlin.contracts.contract' call
-          tmp$ret$5 = tmp61_safe_receiver;
-          break $l$block_0;
+      var tmp;
+      if (tmp0 == null) {
+        var tmp$ret$5;
+        $l$block_0: {
+          var tmp0_safe_receiver_1 = this.k24_1.d2(key);
+          var tmp0_safe_receiver_2 = tmp0_safe_receiver_1 == null ? null : tmp0_safe_receiver_1();
+          if (tmp0_safe_receiver_2 == null)
+            null;
+          else {
+            // Inline function 'kotlin.let' call
+            tmp$ret$5 = tmp0_safe_receiver_2;
+            break $l$block_0;
+          }
+          var _destruct__k2r9zo = creator();
+          var current = _destruct__k2r9zo.nd();
+          var next = _destruct__k2r9zo.od();
+          // Inline function 'kotlin.collections.set' call
+          this.k24_1.g2(key, next);
+          tmp$ret$2 = current;
+          break $l$block_3;
         }
-        // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-        var _destruct__k2r9zo = creator();
-        var current = _destruct__k2r9zo.zc();
-        var next = _destruct__k2r9zo.ad();
-        // Inline function 'kotlin.collections.set' call
-        this.a22_1.g2(key, next);
-        tmp$ret$2 = current;
-        break $l$block_1;
+        tmp = tmp$ret$5;
+      } else {
+        // Inline function 'kotlinx.atomicfu.locks.synchronized' call
+        var tmp$ret$10;
+        $l$block_2: {
+          var tmp0_safe_receiver_3 = this.k24_1.d2(key);
+          var tmp0_safe_receiver_4 = tmp0_safe_receiver_3 == null ? null : tmp0_safe_receiver_3();
+          if (tmp0_safe_receiver_4 == null)
+            null;
+          else {
+            // Inline function 'kotlin.let' call
+            tmp$ret$10 = tmp0_safe_receiver_4;
+            break $l$block_2;
+          }
+          var _destruct__k2r9zo_0 = creator();
+          var current_0 = _destruct__k2r9zo_0.nd();
+          var next_0 = _destruct__k2r9zo_0.od();
+          // Inline function 'kotlin.collections.set' call
+          this.k24_1.g2(key, next_0);
+          tmp$ret$2 = current_0;
+          break $l$block_3;
+        }
+        tmp = tmp$ret$10;
       }
-      var value = tmp$ret$5;
-      // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
+      var value = tmp;
       tmp$ret$2 = value;
     }
     return tmp$ret$2;
   };
   function toKContext(_this__u8e3s4, di, ctx) {
-    var tmp30_safe_receiver = _this__u8e3s4.v21(di, ctx);
+    var tmp0_safe_receiver = _this__u8e3s4.f24(di, ctx);
     var tmp;
-    if (tmp30_safe_receiver == null) {
+    if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      // Inline function 'kotlin.contracts.contract' call
-      // Inline function 'org.kodein.di.bindings.toKContext.<anonymous>' call
-      tmp = Companion_instance_0.l20(_this__u8e3s4.u21(), tmp30_safe_receiver);
+      tmp = Companion_instance_0.v22(_this__u8e3s4.e24(), tmp0_safe_receiver);
     }
     return tmp;
   }
   function CompositeContextTranslator(src, dst) {
-    this.c22_1 = src;
-    this.d22_1 = dst;
+    this.m24_1 = src;
+    this.n24_1 = dst;
   }
-  protoOf(CompositeContextTranslator).x1z = function () {
-    return this.c22_1.x1z();
+  protoOf(CompositeContextTranslator).h22 = function () {
+    return this.m24_1.h22();
   };
-  protoOf(CompositeContextTranslator).u21 = function () {
-    return this.d22_1.u21();
+  protoOf(CompositeContextTranslator).e24 = function () {
+    return this.n24_1.e24();
   };
-  protoOf(CompositeContextTranslator).v21 = function (di, ctx) {
-    var tmp31_safe_receiver = this.c22_1.v21(di, ctx);
+  protoOf(CompositeContextTranslator).f24 = function (di, ctx) {
+    var tmp0_safe_receiver = this.m24_1.f24(di, ctx);
     var tmp;
-    if (tmp31_safe_receiver == null) {
+    if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      // Inline function 'kotlin.contracts.contract' call
-      // Inline function 'org.kodein.di.bindings.CompositeContextTranslator.translate.<anonymous>' call
-      tmp = this.d22_1.v21(di, tmp31_safe_receiver);
+      tmp = this.n24_1.f24(di, tmp0_safe_receiver);
     }
     return tmp;
   };
   protoOf(CompositeContextTranslator).toString = function () {
-    return '(' + toString_0(this.c22_1) + ' -> ' + toString_0(this.d22_1) + ')';
+    return '(' + toString_0(this.m24_1) + ' -> ' + toString_0(this.n24_1) + ')';
   };
   function factoryName($this, params) {
     // Inline function 'kotlin.text.buildString' call
-    // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.apply' call
     var this_0 = StringBuilder_init_$Create$();
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.bindings.Singleton.factoryName.<anonymous>' call
-    this_0.f8('singleton');
+    this_0.i8('singleton');
     // Inline function 'kotlin.collections.isNotEmpty' call
     if (!params.p()) {
-      this_0.f8(joinToString(params, ', ', '(', ')'));
+      this_0.i8(joinToString(params, ', ', '(', ')'));
     }
     return this_0.toString();
   }
   function Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi) {
     return function () {
-      return this$0.j22_1(new NoArgBindingDIWrap($bindingDi));
+      return this$0.t24_1(new NoArgBindingDIWrap($bindingDi));
     };
   }
   function Singleton$getFactory$lambda$lambda(this$0, $bindingDi) {
     return function () {
-      return this$0.k22_1.r21(Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi));
+      return this$0.u24_1.b24(Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi));
     };
   }
   function Singleton$getFactory$lambda($lateInitRegistry, this$0, $bindingDi) {
@@ -942,106 +934,104 @@
       var tmp;
       if (tmp0_elvis_lhs == null) {
         // Inline function 'kotlin.also' call
-        var this_0 = this$0.e22_1.z21($bindingDi.v8());
-        // Inline function 'kotlin.contracts.contract' call
-        // Inline function 'org.kodein.di.bindings.Singleton.getFactory.<anonymous>.<anonymous>' call
+        var this_0 = this$0.o24_1.j24($bindingDi.w8());
         $lateInitRegistry._v = this_0;
         tmp = this_0;
       } else {
         tmp = tmp0_elvis_lhs;
       }
       var registry = tmp;
-      var tmp_0 = registry.w21(this$0.l22_1, this$0.i22_1, Singleton$getFactory$lambda$lambda(this$0, $bindingDi));
+      var tmp_0 = registry.g24(this$0.v24_1, this$0.s24_1, Singleton$getFactory$lambda$lambda(this$0, $bindingDi));
       return !(tmp_0 == null) ? tmp_0 : THROW_CCE();
     };
   }
   function Singleton$copier$lambda(this$0) {
     return function (it) {
-      return new Singleton(this$0.e22_1, this$0.f22_1, this$0.g22_1, this$0.h22_1, this$0.k22_1, this$0.i22_1, this$0.j22_1);
+      return new Singleton(this$0.o24_1, this$0.p24_1, this$0.q24_1, this$0.r24_1, this$0.u24_1, this$0.s24_1, this$0.t24_1);
     };
   }
   function Singleton(scope, contextType, explicitContext, createdType, refMaker, sync, creator) {
     refMaker = refMaker === VOID ? null : refMaker;
     sync = sync === VOID ? true : sync;
-    this.e22_1 = scope;
-    this.f22_1 = contextType;
-    this.g22_1 = explicitContext;
-    this.h22_1 = createdType;
-    this.i22_1 = sync;
-    this.j22_1 = creator;
+    this.o24_1 = scope;
+    this.p24_1 = contextType;
+    this.q24_1 = explicitContext;
+    this.r24_1 = createdType;
+    this.s24_1 = sync;
+    this.t24_1 = creator;
     var tmp = this;
-    tmp.k22_1 = refMaker == null ? SingletonReference_instance : refMaker;
-    this.l22_1 = new ScopeKey(new Object(), Unit_instance);
+    tmp.u24_1 = refMaker == null ? SingletonReference_instance : refMaker;
+    this.v24_1 = new ScopeKey(new Object(), Unit_instance);
     var tmp_0 = this;
     var tmp_1 = Companion_instance_1;
-    tmp_0.m22_1 = tmp_1.k21(Singleton$copier$lambda(this));
+    tmp_0.w24_1 = tmp_1.u23(Singleton$copier$lambda(this));
   }
-  protoOf(Singleton).z1z = function () {
-    return this.e22_1;
+  protoOf(Singleton).j22 = function () {
+    return this.o24_1;
   };
-  protoOf(Singleton).x1z = function () {
-    return this.f22_1;
+  protoOf(Singleton).h22 = function () {
+    return this.p24_1;
   };
-  protoOf(Singleton).o21 = function () {
-    return this.h22_1;
+  protoOf(Singleton).y23 = function () {
+    return this.r24_1;
   };
-  protoOf(Singleton).l21 = function () {
+  protoOf(Singleton).v23 = function () {
     var params = ArrayList_init_$Create$_0(2);
-    if (!equals(this.k22_1, SingletonReference_instance)) {
-      params.e('ref = ' + erasedOf(this.k22_1).h1y());
+    if (!equals(this.u24_1, SingletonReference_instance)) {
+      params.e('ref = ' + erasedOf(this.u24_1).r20());
     }
     return factoryName(this, params);
   };
-  protoOf(Singleton).m21 = function () {
+  protoOf(Singleton).w23 = function () {
     var params = ArrayList_init_$Create$_0(2);
-    if (!equals(this.k22_1, SingletonReference_instance)) {
-      params.e('ref = ' + erasedOf(this.k22_1).j1y());
+    if (!equals(this.u24_1, SingletonReference_instance)) {
+      params.e('ref = ' + erasedOf(this.u24_1).t20());
     }
     return factoryName(this, params);
   };
-  protoOf(Singleton).n22 = function (key, di) {
+  protoOf(Singleton).x24 = function (key, di) {
     var lateInitRegistry = {_v: null};
-    var bindingDi = this.g22_1 ? di : di.o22();
+    var bindingDi = this.q24_1 ? di : di.y24();
     return Singleton$getFactory$lambda(lateInitRegistry, this, bindingDi);
   };
-  protoOf(Singleton).q21 = function (key, di) {
-    return this.n22(key, di);
+  protoOf(Singleton).a24 = function (key, di) {
+    return this.x24(key, di);
   };
   function Provider$getFactory$lambda(this$0, $di) {
     return function (_unused_var__etf5q3) {
-      return this$0.r22_1(new NoArgBindingDIWrap($di));
+      return this$0.b25_1(new NoArgBindingDIWrap($di));
     };
   }
   function Provider(contextType, createdType, creator) {
-    this.p22_1 = contextType;
-    this.q22_1 = createdType;
-    this.r22_1 = creator;
+    this.z24_1 = contextType;
+    this.a25_1 = createdType;
+    this.b25_1 = creator;
   }
-  protoOf(Provider).x1z = function () {
-    return this.p22_1;
+  protoOf(Provider).h22 = function () {
+    return this.z24_1;
   };
-  protoOf(Provider).o21 = function () {
-    return this.q22_1;
+  protoOf(Provider).y23 = function () {
+    return this.a25_1;
   };
-  protoOf(Provider).l21 = function () {
+  protoOf(Provider).v23 = function () {
     return 'provider';
   };
-  protoOf(Provider).n22 = function (key, di) {
+  protoOf(Provider).x24 = function (key, di) {
     return Provider$getFactory$lambda(this, di);
   };
-  protoOf(Provider).q21 = function (key, di) {
-    return this.n22(key, di);
+  protoOf(Provider).a24 = function (key, di) {
+    return this.x24(key, di);
   };
   function ScopeKey(scopeId, arg) {
-    this.s22_1 = scopeId;
-    this.t22_1 = arg;
+    this.c25_1 = scopeId;
+    this.d25_1 = arg;
   }
   protoOf(ScopeKey).toString = function () {
-    return 'ScopeKey(scopeId=' + toString_0(this.s22_1) + ', arg=' + toString(this.t22_1) + ')';
+    return 'ScopeKey(scopeId=' + toString_0(this.c25_1) + ', arg=' + toString(this.d25_1) + ')';
   };
   protoOf(ScopeKey).hashCode = function () {
-    var result = hashCode(this.s22_1);
-    result = imul(result, 31) + (this.t22_1 == null ? 0 : hashCode(this.t22_1)) | 0;
+    var result = hashCode(this.c25_1);
+    result = imul(result, 31) + (this.d25_1 == null ? 0 : hashCode(this.d25_1)) | 0;
     return result;
   };
   protoOf(ScopeKey).equals = function (other) {
@@ -1050,67 +1040,67 @@
     if (!(other instanceof ScopeKey))
       return false;
     var tmp0_other_with_cast = other instanceof ScopeKey ? other : THROW_CCE();
-    if (!equals(this.s22_1, tmp0_other_with_cast.s22_1))
+    if (!equals(this.c25_1, tmp0_other_with_cast.c25_1))
       return false;
-    if (!equals(this.t22_1, tmp0_other_with_cast.t22_1))
+    if (!equals(this.d25_1, tmp0_other_with_cast.d25_1))
       return false;
     return true;
   };
   function DIMainBuilderImpl(allowSilentOverride) {
     DIBuilderImpl.call(this, null, '', HashSet_init_$Create$(), new DIContainerBuilderImpl(true, allowSilentOverride, HashMap_init_$Create$(), ArrayList_init_$Create$(), ArrayList_init_$Create$()));
-    this.z22_1 = ArrayList_init_$Create$();
-    this.a23_1 = Companion_instance.a20_1;
-    this.b23_1 = Companion_instance.b20_1;
+    this.j25_1 = ArrayList_init_$Create$();
+    this.k25_1 = Companion_instance.k22_1;
+    this.l25_1 = Companion_instance.l22_1;
   }
-  protoOf(DIMainBuilderImpl).v20 = function () {
-    return this.z22_1;
+  protoOf(DIMainBuilderImpl).f23 = function () {
+    return this.j25_1;
   };
-  protoOf(DIMainBuilderImpl).c23 = function () {
-    return this.a23_1;
+  protoOf(DIMainBuilderImpl).m25 = function () {
+    return this.k25_1;
   };
-  protoOf(DIMainBuilderImpl).d23 = function () {
-    return this.b23_1;
+  protoOf(DIMainBuilderImpl).n25 = function () {
+    return this.l25_1;
   };
   function TypeBinder($outer, type, tag, overrides) {
-    this.m23_1 = $outer;
-    this.j23_1 = type;
-    this.k23_1 = tag;
-    this.l23_1 = overrides;
+    this.w25_1 = $outer;
+    this.t25_1 = type;
+    this.u25_1 = tag;
+    this.v25_1 = overrides;
   }
-  protoOf(TypeBinder).n23 = function () {
-    return this.m23_1.t1z();
+  protoOf(TypeBinder).x25 = function () {
+    return this.w25_1.d22();
   };
-  protoOf(TypeBinder).o23 = function (binding) {
-    return this.n23().t23(new Key(binding.x1z(), binding.n21(), this.j23_1, this.k23_1), binding, this.m23_1.e23_1, this.l23_1);
+  protoOf(TypeBinder).y25 = function (binding) {
+    return this.x25().d26(new Key(binding.h22(), binding.x23(), this.t25_1, this.u25_1), binding, this.w25_1.o25_1, this.v25_1);
   };
   function DIBuilderImpl(moduleName, prefix, importedModules, containerBuilder) {
-    this.e23_1 = moduleName;
-    this.f23_1 = prefix;
-    this.g23_1 = importedModules;
-    this.h23_1 = containerBuilder;
-    this.i23_1 = Companion_getInstance().g1y_1;
+    this.o25_1 = moduleName;
+    this.p25_1 = prefix;
+    this.q25_1 = importedModules;
+    this.r25_1 = containerBuilder;
+    this.s25_1 = Companion_getInstance().q20_1;
   }
-  protoOf(DIBuilderImpl).t1z = function () {
-    return this.h23_1;
+  protoOf(DIBuilderImpl).d22 = function () {
+    return this.r25_1;
   };
-  protoOf(DIBuilderImpl).x1z = function () {
-    return this.i23_1;
+  protoOf(DIBuilderImpl).h22 = function () {
+    return this.s25_1;
   };
-  protoOf(DIBuilderImpl).z1z = function () {
+  protoOf(DIBuilderImpl).j22 = function () {
     return new NoScope();
   };
-  protoOf(DIBuilderImpl).y1z = function () {
+  protoOf(DIBuilderImpl).i22 = function () {
     return false;
   };
-  protoOf(DIBuilderImpl).u1z = function (type, tag, overrides) {
+  protoOf(DIBuilderImpl).e22 = function (type, tag, overrides) {
     return new TypeBinder(this, type, tag, overrides);
   };
-  protoOf(DIBuilderImpl).v1z = function (module_0, allowOverride) {
-    var moduleName = this.f23_1 + module_0.k2();
+  protoOf(DIBuilderImpl).f22 = function (module_0, allowOverride) {
+    var moduleName = this.p25_1 + module_0.k2();
     var tmp;
     // Inline function 'kotlin.text.isNotEmpty' call
     if (charSequenceLength(moduleName) > 0) {
-      tmp = this.g23_1.p1(moduleName);
+      tmp = this.q25_1.q1(moduleName);
     } else {
       tmp = false;
     }
@@ -1118,20 +1108,19 @@
       throw IllegalStateException_init_$Create$('Module "' + moduleName + '" has already been imported!');
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    this.g23_1.e(moduleName);
+    this.q25_1.e(moduleName);
+    var tmp0 = new DIBuilderImpl(moduleName, this.p25_1 + module_0.w21_1, this.q25_1, this.d22().e26(allowOverride, module_0.v21_1));
     // Inline function 'kotlin.apply' call
-    var this_0 = new DIBuilderImpl(moduleName, this.f23_1 + module_0.m1z_1, this.g23_1, this.t1z().u23(allowOverride, module_0.l1z_1));
-    // Inline function 'kotlin.contracts.contract' call
-    module_0.n1z_1(this_0);
+    module_0.x21_1(tmp0);
   };
   function DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT() {
     OverrideMode.call(this, 'ALLOW_SILENT', 0);
     OverrideMode_ALLOW_SILENT_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).x23 = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).h26 = function () {
     return true;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).y23 = function (overrides) {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).i26 = function (overrides) {
     return overrides;
   };
   var OverrideMode_ALLOW_SILENT_instance;
@@ -1139,10 +1128,10 @@
     OverrideMode.call(this, 'ALLOW_EXPLICIT', 1);
     OverrideMode_ALLOW_EXPLICIT_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).x23 = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).h26 = function () {
     return true;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).y23 = function (overrides) {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).i26 = function (overrides) {
     return overrides == null ? false : overrides;
   };
   var OverrideMode_ALLOW_EXPLICIT_instance;
@@ -1150,10 +1139,10 @@
     OverrideMode.call(this, 'FORBID', 2);
     OverrideMode_FORBID_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).x23 = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).h26 = function () {
     return false;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).y23 = function (overrides) {
+  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).i26 = function (overrides) {
     var tmp;
     if (!(overrides == null) && overrides) {
       throw new OverridingException('Overriding has been forbidden');
@@ -1165,7 +1154,7 @@
   var OverrideMode_FORBID_instance;
   function Companion_2() {
   }
-  protoOf(Companion_2).d24 = function (allow, silent) {
+  protoOf(Companion_2).n26 = function (allow, silent) {
     if (!allow)
       return OverrideMode_FORBID_getInstance();
     if (silent)
@@ -1189,13 +1178,13 @@
     Enum.call(this, name, ordinal);
   }
   function checkOverrides($this, key, overrides) {
-    var mustOverride = $this.s23_1.y23(overrides);
+    var mustOverride = $this.c26_1.i26(overrides);
     if (!(mustOverride == null)) {
       var tmp;
       if (mustOverride) {
         // Inline function 'kotlin.collections.contains' call
         // Inline function 'kotlin.collections.containsKey' call
-        var this_0 = $this.p23_1;
+        var this_0 = $this.z25_1;
         tmp = !(isInterface(this_0, KtMap) ? this_0 : THROW_CCE()).b2(key);
       } else {
         tmp = false;
@@ -1206,7 +1195,7 @@
       if (!mustOverride) {
         // Inline function 'kotlin.collections.contains' call
         // Inline function 'kotlin.collections.containsKey' call
-        var this_1 = $this.p23_1;
+        var this_1 = $this.z25_1;
         tmp_0 = (isInterface(this_1, KtMap) ? this_1 : THROW_CCE()).b2(key);
       } else {
         tmp_0 = false;
@@ -1216,7 +1205,7 @@
     }
   }
   function checkMatch($this, allowOverride) {
-    if (!$this.s23_1.x23() && allowOverride)
+    if (!$this.c26_1.h26() && allowOverride)
       throw new OverridingException('Overriding has been forbidden');
   }
   function OverrideMode_ALLOW_SILENT_getInstance() {
@@ -1232,19 +1221,18 @@
     return OverrideMode_FORBID_instance;
   }
   function DIContainerBuilderImpl(allowOverride, silentOverride, bindingsMap, callbacks, translators) {
-    this.p23_1 = bindingsMap;
-    this.q23_1 = callbacks;
-    this.r23_1 = translators;
-    this.s23_1 = Companion_instance_2.d24(allowOverride, silentOverride);
+    this.z25_1 = bindingsMap;
+    this.a26_1 = callbacks;
+    this.b26_1 = translators;
+    this.c26_1 = Companion_instance_2.n26(allowOverride, silentOverride);
   }
-  protoOf(DIContainerBuilderImpl).t23 = function (key, binding, fromModule, overrides) {
+  protoOf(DIContainerBuilderImpl).d26 = function (key, binding, fromModule, overrides) {
     checkOverrides(this, key, overrides);
     // Inline function 'kotlin.collections.getOrPut' call
-    var this_0 = this.p23_1;
+    var this_0 = this.z25_1;
     var value = this_0.d2(key);
     var tmp;
     if (value == null) {
-      // Inline function 'org.kodein.di.internal.DIContainerBuilderImpl.bind.<anonymous>' call
       var answer = newLinkedList();
       this_0.g2(key, answer);
       tmp = answer;
@@ -1254,12 +1242,20 @@
     var bindings = tmp;
     bindings.x1(0, new DIDefining(isInterface(binding, DIBinding) ? binding : THROW_CCE(), fromModule));
   };
-  protoOf(DIContainerBuilderImpl).u23 = function (allowOverride, silentOverride) {
+  protoOf(DIContainerBuilderImpl).e26 = function (allowOverride, silentOverride) {
     checkMatch(this, allowOverride);
-    return new DIContainerBuilderImpl(allowOverride, silentOverride, this.p23_1, this.q23_1, this.r23_1);
+    return new DIContainerBuilderImpl(allowOverride, silentOverride, this.z25_1, this.a26_1, this.b26_1);
   };
   function displayString($this, key, overrideLevel) {
-    var descProp = $this.j24_1 ? bindFullDescription$factory_0(key) : bindDescription$factory_0(key);
+    var tmp;
+    if ($this.t26_1) {
+      var tmp_0 = KProperty0;
+      tmp = getPropertyCallableRef('bindFullDescription', 0, tmp_0, DI$Key$_get_bindFullDescription_$ref_x9pxcc_0(key), null);
+    } else {
+      var tmp_1 = KProperty0;
+      tmp = getPropertyCallableRef('bindDescription', 0, tmp_1, DI$Key$_get_bindDescription_$ref_ua6e71_0(key), null);
+    }
+    var descProp = tmp;
     return !(overrideLevel === 0) ? 'overridden ' + descProp.get() : descProp.get();
   }
   function recursiveLoop($this, node, firstKey, firstOverrideLevel, tail) {
@@ -1271,15 +1267,18 @@
     $l$1: do {
       $l$0: do {
         var tmp;
-        if (node_0.i24_1 == null || (firstKey_0.equals(node_0.g24_1) && firstOverrideLevel_0 === node_0.h24_1)) {
-          tmp = plus(listOf(displayString($this_0, node_0.g24_1, node_0.h24_1)), tail_0);
+        if (node_0.s26_1 == null || (firstKey_0.equals(node_0.q26_1) && firstOverrideLevel_0 === node_0.r26_1)) {
+          tmp = plus(listOf(displayString($this_0, node_0.q26_1, node_0.r26_1)), tail_0);
         } else {
           var tmp0 = $this_0;
-          var tmp4 = plus(listOf(displayString($this_0, node_0.g24_1, node_0.h24_1)), tail_0);
+          var tmp1 = node_0.s26_1;
+          var tmp2 = firstKey_0;
+          var tmp3 = firstOverrideLevel_0;
+          var tmp4 = plus(listOf(displayString($this_0, node_0.q26_1, node_0.r26_1)), tail_0);
           $this_0 = tmp0;
-          node_0 = node_0.i24_1;
-          firstKey_0 = firstKey_0;
-          firstOverrideLevel_0 = firstOverrideLevel_0;
+          node_0 = tmp1;
+          firstKey_0 = tmp2;
+          firstOverrideLevel_0 = tmp3;
           tail_0 = tmp4;
           continue $l$0;
         }
@@ -1297,15 +1296,19 @@
     $l$1: do {
       $l$0: do {
         var tmp;
-        if (node_0.g24_1.equals(searchedKey_0) && node_0.h24_1 === searchedOverrideLevel_0) {
+        if (node_0.q26_1.equals(searchedKey_0) && node_0.r26_1 === searchedOverrideLevel_0) {
           tmp = false;
-        } else if (node_0.i24_1 == null) {
+        } else if (node_0.s26_1 == null) {
           tmp = true;
         } else {
-          $this_0 = $this_0;
-          node_0 = node_0.i24_1;
-          searchedKey_0 = searchedKey_0;
-          searchedOverrideLevel_0 = searchedOverrideLevel_0;
+          var tmp0 = $this_0;
+          var tmp1 = node_0.s26_1;
+          var tmp2 = searchedKey_0;
+          var tmp3 = searchedOverrideLevel_0;
+          $this_0 = tmp0;
+          node_0 = tmp1;
+          searchedKey_0 = tmp2;
+          searchedOverrideLevel_0 = tmp3;
           continue $l$0;
         }
         return tmp;
@@ -1314,15 +1317,25 @@
     }
      while (true);
   }
+  function DI$Key$_get_bindFullDescription_$ref_x9pxcc_0(p0) {
+    return function () {
+      return p0.t21();
+    };
+  }
+  function DI$Key$_get_bindDescription_$ref_ua6e71_0(p0) {
+    return function () {
+      return p0.r21();
+    };
+  }
   function DIContainerImpl_init_$Init$(builder, externalSources, fullDescriptionOnError, fullContainerTreeOnError, runCallbacks, $this) {
-    DIContainerImpl.call($this, new DITreeImpl(builder.p23_1, externalSources, builder.r23_1), null, fullDescriptionOnError, fullContainerTreeOnError);
+    DIContainerImpl.call($this, new DITreeImpl(builder.z25_1, externalSources, builder.b26_1), null, fullDescriptionOnError, fullContainerTreeOnError);
     var init = DIContainerImpl$_init_$lambda_r6ib3j($this, builder);
     if (runCallbacks)
       init();
     else {
       var lock = new Object();
       var tmp = $this;
-      tmp.o24_1 = DIContainerImpl$_init_$lambda_r6ib3j_0(lock, $this, init);
+      tmp.y26_1 = DIContainerImpl$_init_$lambda_r6ib3j_0(lock, $this, init);
     }
     return $this;
   }
@@ -1330,58 +1343,57 @@
     return DIContainerImpl_init_$Init$(builder, externalSources, fullDescriptionOnError, fullContainerTreeOnError, runCallbacks, objectCreate(protoOf(DIContainerImpl)));
   }
   function Node(key, overrideLevel, parent, fullDescriptionOnError) {
-    this.g24_1 = key;
-    this.h24_1 = overrideLevel;
-    this.i24_1 = parent;
-    this.j24_1 = fullDescriptionOnError;
+    this.q26_1 = key;
+    this.r26_1 = overrideLevel;
+    this.s26_1 = parent;
+    this.t26_1 = fullDescriptionOnError;
   }
-  protoOf(Node).p24 = function (searchedKey, searchedOverrideLevel) {
+  protoOf(Node).z26 = function (searchedKey, searchedOverrideLevel) {
     if (!recursiveCheck(this, this, searchedKey, searchedOverrideLevel)) {
-      var list = plus_0(recursiveLoop(this, this, searchedKey, searchedOverrideLevel, emptyList()), displayString(this, searchedKey, this.h24_1));
+      var list = plus_0(recursiveLoop(this, this, searchedKey, searchedOverrideLevel, emptyList()), displayString(this, searchedKey, this.r26_1));
       var sb = StringBuilder_init_$Create$();
       // Inline function 'kotlin.collections.forEachIndexed' call
       var index = 0;
-      var tmp0_iterator = list.j();
-      while (tmp0_iterator.k()) {
-        var item = tmp0_iterator.l();
-        // Inline function 'org.kodein.di.internal.Node.check.<anonymous>' call
-        var tmp1 = index;
-        index = tmp1 + 1 | 0;
-        var index_0 = checkIndexOverflow(tmp1);
-        sb.f8('  ');
+      var _iterator__ex2g4s = list.j();
+      while (_iterator__ex2g4s.k()) {
+        var item = _iterator__ex2g4s.l();
+        var _unary__edvuaz = index;
+        index = _unary__edvuaz + 1 | 0;
+        var index_0 = checkIndexOverflow(_unary__edvuaz);
+        sb.i8('  ');
         switch (index_0) {
           case 0:
-            sb.f8('   ');
+            sb.i8('   ');
             break;
           case 1:
-            sb.f8('  \u2554\u2569>');
+            sb.i8('  \u2554\u2569>');
             break;
           default:
-            sb.f8('  \u2551');
-            sb.f8(repeat('  ', index_0 - 1 | 0));
-            sb.f8('\u255A>');
+            sb.i8('  \u2551');
+            sb.i8(repeat('  ', index_0 - 1 | 0));
+            sb.i8('\u255A>');
             break;
         }
-        sb.f8(item);
-        sb.f8('\n');
+        sb.i8(item);
+        sb.i8('\n');
       }
-      sb.f8('    \u255A');
-      sb.f8(repeat('\u2550\u2550', list.m() - 1 | 0));
-      sb.f8('\u255D');
+      sb.i8('    \u255A');
+      sb.i8(repeat('\u2550\u2550', list.m() - 1 | 0));
+      sb.i8('\u255D');
       throw new DependencyLoopException('Dependency recursion:\n' + sb.toString());
     }
   };
   function bindingDI($this, key, context, tree, overrideLevel) {
-    var container = new DIContainerImpl(tree, new Node(key, overrideLevel, $this.l24_1, $this.m24_1), $this.m24_1, $this.n24_1);
+    var container = new DIContainerImpl(tree, new Node(key, overrideLevel, $this.v26_1, $this.w26_1), $this.w26_1, $this.x26_1);
     return new BindingDIImpl(createDirectDI(container, context), key, overrideLevel);
   }
   function DIContainerImpl$_init_$lambda_r6ib3j(this$0, $builder) {
     return function () {
       var direct = createDirectDI(this$0, get_AnyDIContext());
-      var tmp0_iterator = $builder.q23_1.j();
-      while (tmp0_iterator.k()) {
-        var element = tmp0_iterator.l();
-        // Inline function 'org.kodein.di.internal.DIContainerImpl.<init>.<anonymous>.<anonymous>' call
+      // Inline function 'kotlin.collections.forEach' call
+      var _iterator__ex2g4s = $builder.a26_1.j();
+      while (_iterator__ex2g4s.k()) {
+        var element = _iterator__ex2g4s.l();
         element(direct);
       }
       return Unit_instance;
@@ -1389,32 +1401,57 @@
   }
   function DIContainerImpl$_init_$lambda_r6ib3j_0($lock, this$0, $init) {
     return function () {
-      $l$block_1: {
+      var tmp0 = $lock;
+      $l$block_3: {
         // Inline function 'org.kodein.di.internal.synchronizedIfNotNull' call
-        if (this$0.o24_1 == null) {
-          // Inline function 'org.kodein.di.internal.DIContainerImpl.<init>.<anonymous>.<anonymous>' call
-          break $l$block_1;
+        if (this$0.y26_1 == null) {
+          break $l$block_3;
         }
         // Inline function 'org.kodein.di.internal.maySynchronized' call
-        $l$block_0: {
-          // Inline function 'org.kodein.di.internal.synchronizedIfNotNull.<anonymous>' call
-          var tmp0_elvis_lhs = this$0.o24_1;
-          var tmp;
-          if (tmp0_elvis_lhs == null) {
-            break $l$block_0;
-          } else {
-            tmp = tmp0_elvis_lhs;
+        if (tmp0 == null) {
+          $l$block_0: {
+            var tmp0_elvis_lhs = this$0.y26_1;
+            var tmp;
+            if (tmp0_elvis_lhs == null) {
+              break $l$block_0;
+            } else {
+              tmp = tmp0_elvis_lhs;
+            }
+            var value = tmp;
+            this$0.y26_1 = null;
+            $init();
+            break $l$block_3;
+          }
+        } else {
+          // Inline function 'kotlinx.atomicfu.locks.synchronized' call
+          $l$block_2: {
+            var tmp0_elvis_lhs_0 = this$0.y26_1;
+            var tmp_0;
+            if (tmp0_elvis_lhs_0 == null) {
+              break $l$block_2;
+            } else {
+              tmp_0 = tmp0_elvis_lhs_0;
+            }
+            var value_0 = tmp_0;
+            this$0.y26_1 = null;
+            $init();
+            break $l$block_3;
           }
-          var value = tmp;
-          this$0.o24_1 = null;
-          $init();
-          break $l$block_1;
         }
-        // Inline function 'org.kodein.di.internal.DIContainerImpl.<init>.<anonymous>.<anonymous>' call
       }
       return Unit_instance;
     };
   }
+  function DI$Key$_get_fullDescription_$ref_ncsvgx(p0) {
+    return function () {
+      return p0.u21();
+    };
+  }
+  function DI$Key$_get_description_$ref_pfaykg(p0) {
+    return function () {
+      return p0.s21();
+    };
+  }
   function DIContainerImpl$factory$lambda(_this__u8e3s4, it) {
     return fullDescription(_this__u8e3s4, it);
   }
@@ -1422,92 +1459,94 @@
     return description(_this__u8e3s4, it);
   }
   function DIContainerImpl(tree, node, fullDescriptionOnError, fullContainerTreeOnError) {
-    this.k24_1 = tree;
-    this.l24_1 = node;
-    this.m24_1 = fullDescriptionOnError;
-    this.n24_1 = fullContainerTreeOnError;
-    this.o24_1 = null;
-  }
-  protoOf(DIContainerImpl).r20 = function (key, context, overrideLevel) {
-    var result = this.k24_1.x20(key, overrideLevel);
+    this.u26_1 = tree;
+    this.v26_1 = node;
+    this.w26_1 = fullDescriptionOnError;
+    this.x26_1 = fullContainerTreeOnError;
+    this.y26_1 = null;
+  }
+  protoOf(DIContainerImpl).b23 = function (key, context, overrideLevel) {
+    var result = this.u26_1.h23(key, overrideLevel);
     if (result.m() === 1) {
       var _destruct__k2r9zo = result.o(0);
-      var definition = _destruct__k2r9zo.ad();
-      var translator = _destruct__k2r9zo.dh();
-      var tmp44_safe_receiver = this.l24_1;
-      if (tmp44_safe_receiver == null)
+      var definition = _destruct__k2r9zo.od();
+      var translator = _destruct__k2r9zo.zi();
+      var tmp0_safe_receiver = this.v26_1;
+      if (tmp0_safe_receiver == null)
         null;
       else {
-        tmp44_safe_receiver.p24(key, overrideLevel);
+        tmp0_safe_receiver.z26(key, overrideLevel);
       }
-      var tmp = Companion_instance_0.l20(key.c1z_1, context);
+      var tmp = Companion_instance_0.v22(key.m21_1, context);
       var originalContext = isInterface(tmp, DIContext) ? tmp : THROW_CCE();
-      var tmp0_elvis_lhs = translator == null ? null : toKContext(translator, createDirectDI(this, originalContext), context);
-      var kContext = tmp0_elvis_lhs == null ? originalContext : tmp0_elvis_lhs;
+      var tmp2_elvis_lhs = translator == null ? null : toKContext(translator, createDirectDI(this, originalContext), context);
+      var kContext = tmp2_elvis_lhs == null ? originalContext : tmp2_elvis_lhs;
       if (!(key instanceof Key))
         THROW_CCE();
-      var bindingDI_0 = bindingDI(this, key, kContext, definition.z1y_1, overrideLevel);
-      return definition.a1z_1.q21(key, bindingDI_0);
+      var bindingDI_0 = bindingDI(this, key, kContext, definition.j21_1, overrideLevel);
+      return definition.k21_1.a24(key, bindingDI_0);
     }
-    var bindingDI_1 = bindingDI(this, key, Companion_instance_0.l20(key.c1z_1, context), this.k24_1, overrideLevel);
+    var bindingDI_1 = bindingDI(this, key, Companion_instance_0.v22(key.m21_1, context), this.u26_1, overrideLevel);
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_iterator = this.k24_1.v20().j();
-    while (tmp0_iterator.k()) {
-      var element = tmp0_iterator.l();
-      // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      var tmp46_safe_receiver = element.q24(bindingDI_1, key);
-      if (tmp46_safe_receiver == null)
+    var _iterator__ex2g4s = this.u26_1.f23().j();
+    while (_iterator__ex2g4s.k()) {
+      var element = _iterator__ex2g4s.l();
+      var tmp0_safe_receiver_0 = element.a27(bindingDI_1, key);
+      if (tmp0_safe_receiver_0 == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        // Inline function 'kotlin.contracts.contract' call
-        var tmp47_safe_receiver = this.l24_1;
-        if (tmp47_safe_receiver == null)
+        var tmp0_safe_receiver_1 = this.v26_1;
+        if (tmp0_safe_receiver_1 == null)
           null;
         else {
-          tmp47_safe_receiver.p24(key, overrideLevel);
+          tmp0_safe_receiver_1.z26(key, overrideLevel);
         }
-        return (!(tmp46_safe_receiver == null) ? typeof tmp46_safe_receiver === 'function' : false) ? tmp46_safe_receiver : THROW_CCE();
+        return typeof tmp0_safe_receiver_0 === 'function' ? tmp0_safe_receiver_0 : THROW_CCE();
       }
     }
     var withOverrides = !(overrideLevel === 0);
-    var descProp = this.m24_1 ? fullDescription$factory_0(key) : description$factory_0(key);
     var tmp_0;
-    if (this.m24_1) {
-      tmp_0 = DIContainerImpl$factory$lambda;
+    if (this.w26_1) {
+      var tmp_1 = KProperty0;
+      tmp_0 = getPropertyCallableRef('fullDescription', 0, tmp_1, DI$Key$_get_fullDescription_$ref_ncsvgx(key), null);
+    } else {
+      var tmp_2 = KProperty0;
+      tmp_0 = getPropertyCallableRef('description', 0, tmp_2, DI$Key$_get_description_$ref_pfaykg(key), null);
+    }
+    var descProp = tmp_0;
+    var tmp_3;
+    if (this.w26_1) {
+      tmp_3 = DIContainerImpl$factory$lambda;
     } else {
-      tmp_0 = DIContainerImpl$factory$lambda_0;
+      tmp_3 = DIContainerImpl$factory$lambda_0;
     }
-    var descFun = tmp_0;
+    var descFun = tmp_3;
     if (result.p()) {
       // Inline function 'kotlin.text.buildString' call
-      // Inline function 'kotlin.contracts.contract' call
       // Inline function 'kotlin.apply' call
       var this_0 = StringBuilder_init_$Create$();
-      // Inline function 'kotlin.contracts.contract' call
-      // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      this_0.f8('No binding found for ' + descProp.get());
-      if (this.n24_1) {
+      this_0.i8('No binding found for ' + descProp.get());
+      if (this.x26_1) {
         // Inline function 'kotlin.text.appendLine' call
-        this_0.g8(_Char___init__impl__6a9atx(10));
-        var forType = this.k24_1.y20(new SearchSpecs(VOID, VOID, key.e1z_1));
+        this_0.j8(_Char___init__impl__6a9atx(10));
+        var forType = this.u26_1.i23(new SearchSpecs(VOID, VOID, key.o21_1));
         // Inline function 'kotlin.collections.isNotEmpty' call
         if (!forType.p()) {
           // Inline function 'kotlin.collections.associate' call
           var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(forType, 10)), 16);
           // Inline function 'kotlin.collections.associateTo' call
           var destination = LinkedHashMap_init_$Create$_0(capacity);
-          var tmp0_iterator_0 = forType.j();
-          while (tmp0_iterator_0.k()) {
-            var element_0 = tmp0_iterator_0.l();
+          var _iterator__ex2g4s_0 = forType.j();
+          while (_iterator__ex2g4s_0.k()) {
+            var element_0 = _iterator__ex2g4s_0.l();
             // Inline function 'kotlin.collections.plusAssign' call
-            // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>.<anonymous>' call
-            var pair = to(element_0.ah_1, element_0.bh_1);
-            destination.g2(pair.xc_1, pair.yc_1);
+            var pair = to(element_0.wi_1, element_0.xi_1);
+            destination.g2(pair.ld_1, pair.md_1);
           }
-          this_0.f8('Available bindings for this type:\n' + descFun(destination, withOverrides));
+          this_0.i8('Available bindings for this type:\n' + descFun(destination, withOverrides));
         }
-        this_0.f8('Registered in this DI container:\n' + descFun(this.k24_1.u20(), withOverrides));
+        this_0.i8('Registered in this DI container:\n' + descFun(this.u26_1.e23(), withOverrides));
       }
       var description = this_0.toString();
       throw new NotFoundException(key, description);
@@ -1516,62 +1555,39 @@
     var capacity_0 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(result, 10)), 16);
     // Inline function 'kotlin.collections.associateTo' call
     var destination_0 = LinkedHashMap_init_$Create$_0(capacity_0);
-    var tmp0_iterator_1 = result.j();
-    while (tmp0_iterator_1.k()) {
-      var element_1 = tmp0_iterator_1.l();
+    var _iterator__ex2g4s_1 = result.j();
+    while (_iterator__ex2g4s_1.k()) {
+      var element_1 = _iterator__ex2g4s_1.l();
       // Inline function 'kotlin.collections.plusAssign' call
-      // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      var pair_0 = to(element_1.ah_1, ensureNotNull(this.k24_1.z20(element_1.ah_1)).bh_1);
-      destination_0.g2(pair_0.xc_1, pair_0.yc_1);
+      var pair_0 = to(element_1.wi_1, ensureNotNull(this.u26_1.j23(element_1.wi_1)).xi_1);
+      destination_0.g2(pair_0.ld_1, pair_0.md_1);
     }
     var potentials = destination_0;
     // Inline function 'kotlin.collections.filter' call
+    var tmp0 = this.u26_1.e23();
     // Inline function 'kotlin.collections.filterTo' call
-    var this_1 = this.k24_1.u20();
     var destination_1 = LinkedHashMap_init_$Create$();
     // Inline function 'kotlin.collections.iterator' call
-    var tmp0_iterator_2 = this_1.s().j();
-    while (tmp0_iterator_2.k()) {
-      var element_2 = tmp0_iterator_2.l();
-      // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
+    var _iterator__ex2g4s_2 = tmp0.s().j();
+    while (_iterator__ex2g4s_2.k()) {
+      var element_2 = _iterator__ex2g4s_2.l();
       // Inline function 'kotlin.collections.component1' call
       var key_0 = element_2.z1();
-      if (!potentials.e2().p1(key_0)) {
+      if (!potentials.e2().q1(key_0)) {
         destination_1.g2(element_2.z1(), element_2.a2());
       }
     }
     var others = destination_1;
     throw new NotFoundException(key, '' + potentials.m() + ' bindings found that match ' + key.toString() + ':\n' + descFun(potentials, withOverrides) + 'Other bindings registered in DI:\n' + descFun(others, withOverrides));
   };
-  function bindFullDescription$factory_0($b0) {
-    return getPropertyCallableRef('bindFullDescription', 0, KProperty0, function () {
-      return $b0.j1z();
-    }, null);
-  }
-  function bindDescription$factory_0($b0) {
-    return getPropertyCallableRef('bindDescription', 0, KProperty0, function () {
-      return $b0.h1z();
-    }, null);
-  }
-  function fullDescription$factory_0($b0) {
-    return getPropertyCallableRef('fullDescription', 0, KProperty0, function () {
-      return $b0.k1z();
-    }, null);
-  }
-  function description$factory_0($b0) {
-    return getPropertyCallableRef('description', 0, KProperty0, function () {
-      return $b0.i1z();
-    }, null);
-  }
   function newBuilder($this, allowSilentOverride, init) {
     // Inline function 'kotlin.apply' call
     var this_0 = new DIMainBuilderImpl(allowSilentOverride);
-    // Inline function 'kotlin.contracts.contract' call
     init(this_0);
     return this_0;
   }
   function DIImpl_init_$Init$(builder, runCallbacks, $this) {
-    DIImpl.call($this, DIContainerImpl_init_$Create$(builder.t1z(), builder.v20(), builder.c23(), builder.d23(), runCallbacks));
+    DIImpl.call($this, DIContainerImpl_init_$Create$(builder.d22(), builder.f23(), builder.m25(), builder.n25(), runCallbacks));
     return $this;
   }
   function DIImpl_init_$Init$_0(allowSilentOverride, init, $this) {
@@ -1591,79 +1607,80 @@
   function DIImpl$container$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (!(this$0.r24_1.o24_1 == null)) {
+      if (!(this$0.b27_1.y26_1 == null)) {
         throw IllegalStateException_init_$Create$('DI has not been initialized');
       }
-      return this$0.r24_1;
+      return this$0.b27_1;
+    };
+  }
+  function DIImpl$_get_container_$ref_luzrb4() {
+    return function (p0) {
+      return p0.p22();
     };
   }
   function DIImpl(_container) {
-    this.r24_1 = _container;
+    this.b27_1 = _container;
     var tmp = this;
-    tmp.s24_1 = lazy(DIImpl$container$delegate$lambda(this));
+    tmp.c27_1 = lazy(DIImpl$container$delegate$lambda(this));
   }
-  protoOf(DIImpl).f20 = function () {
+  protoOf(DIImpl).p22 = function () {
+    var tmp0 = this.c27_1;
+    var tmp = KProperty1;
     // Inline function 'kotlin.getValue' call
-    var this_0 = this.s24_1;
-    container$factory();
-    return this_0.a2();
+    getPropertyCallableRef('container', 1, tmp, DIImpl$_get_container_$ref_luzrb4(), null);
+    return tmp0.a2();
   };
   function BindingDIImpl(directDI, key, overrideLevel) {
-    this.t24_1 = directDI;
-    this.u24_1 = key;
-    this.v24_1 = overrideLevel;
+    this.d27_1 = directDI;
+    this.e27_1 = key;
+    this.f27_1 = overrideLevel;
   }
-  protoOf(BindingDIImpl).d21 = function () {
-    return this.t24_1;
+  protoOf(BindingDIImpl).n23 = function () {
+    return this.d27_1;
   };
-  protoOf(BindingDIImpl).b21 = function (context) {
-    return this.t24_1.b21(context);
+  protoOf(BindingDIImpl).w8 = function () {
+    var tmp = this.n23().o22().q22().a2();
+    return !(tmp == null) ? tmp : THROW_CCE();
   };
-  protoOf(BindingDIImpl).c21 = function (type, tag) {
-    return this.t24_1.c21(type, tag);
+  protoOf(BindingDIImpl).y24 = function () {
+    return new BindingDIImpl(this.n23().l23(ErasedContext_instance), this.e27_1, this.f27_1);
   };
-  protoOf(BindingDIImpl).a21 = function () {
-    return this.t24_1.a21();
+  protoOf(BindingDIImpl).k23 = function () {
+    return this.d27_1.k23();
   };
-  protoOf(BindingDIImpl).e20 = function () {
-    return this.t24_1.e20();
+  protoOf(BindingDIImpl).o22 = function () {
+    return this.d27_1.o22();
   };
-  protoOf(BindingDIImpl).v8 = function () {
-    var tmp = this.d21().e20().g20().a2();
-    return !(tmp == null) ? tmp : THROW_CCE();
+  protoOf(BindingDIImpl).l23 = function (context) {
+    return this.d27_1.l23(context);
   };
-  protoOf(BindingDIImpl).o22 = function () {
-    return new BindingDIImpl(this.d21().b21(ErasedContext_instance), this.u24_1, this.v24_1);
+  protoOf(BindingDIImpl).m23 = function (type, tag) {
+    return this.d27_1.m23(type, tag);
   };
-  function container$factory() {
-    return getPropertyCallableRef('container', 1, KProperty1, function (receiver) {
-      return receiver.f20();
-    }, null);
-  }
   function findBySpecs($this, specs) {
-    var bindSeq = asSequence($this.z24_1);
-    var specsBindType = specs.g21_1;
-    if (!(specsBindType == null) && !equals(specsBindType, Companion_getInstance().g1y_1)) {
+    var bindSeq = asSequence($this.j27_1);
+    var specsBindType = specs.q23_1;
+    if (!(specsBindType == null) && !equals(specsBindType, Companion_getInstance().q20_1)) {
       var tmp = bindSeq;
       bindSeq = filter(tmp, DITreeImpl$findBySpecs$lambda(specsBindType));
     }
     var tmp_0 = bindSeq;
     var contextSeq = flatMap(tmp_0, DITreeImpl$findBySpecs$lambda_0);
-    var specsContextType = specs.e21_1;
+    var specsContextType = specs.o23_1;
     if (!(specsContextType == null)) {
       var tmp_1 = contextSeq;
       contextSeq = mapNotNull(tmp_1, DITreeImpl$findBySpecs$lambda_1(specsContextType, $this));
     }
     var tmp_2 = contextSeq;
     var argSeq = flatMap(tmp_2, DITreeImpl$findBySpecs$lambda_2);
-    var specsArgType = specs.f21_1;
+    var specsArgType = specs.p23_1;
     if (!(specsArgType == null)) {
       var tmp_3 = argSeq;
       argSeq = filter(tmp_3, DITreeImpl$findBySpecs$lambda_3(specsArgType));
     }
     var tmp_4 = argSeq;
     var tagSeq = flatMap(tmp_4, DITreeImpl$findBySpecs$lambda_4);
-    var specsTag = specs.h21_1;
+    var specsTag = specs.r23_1;
     if (!equals(specsTag, NoDefinedTag_instance)) {
       var tmp_5 = tagSeq;
       tagSeq = filter(tmp_5, DITreeImpl$findBySpecs$lambda_5(specsTag));
@@ -1673,16 +1690,16 @@
     return toList(resultSeq);
   }
   function notInMap($this, result, request) {
-    var tmp = result.q1z();
-    var tmp_0 = request.q1z();
-    var tmp_1 = $this.y24_1.e2();
+    var tmp = result.a22();
+    var tmp_0 = request.a22();
+    var tmp_1 = $this.i27_1.e2();
     return IllegalStateException_init_$Create$('Tree returned key ' + tmp + ' that is not in cache when searching for ' + tmp_0 + '.\nKeys in cache:\n' + joinToString(tmp_1, '\n', VOID, VOID, VOID, VOID, DITreeImpl$notInMap$lambda));
   }
   function DITreeImpl$findBySpecs$lambda($specsBindType) {
     return function (_destruct__k2r9zo) {
       // Inline function 'kotlin.collections.component1' call
       var bindType = _destruct__k2r9zo.z1();
-      return bindType.c25($specsBindType);
+      return bindType.m27($specsBindType);
     };
   }
   function DITreeImpl$findBySpecs$lambda_0(_destruct__k2r9zo) {
@@ -1696,19 +1713,19 @@
   }
   function DITreeImpl$findBySpecs$lambda_1($specsContextType, this$0) {
     return function (triple) {
-      var contextType = triple.zc();
+      var contextType = triple.nd();
       var tmp;
-      if (contextType.c25($specsContextType)) {
+      if (contextType.m27($specsContextType)) {
         tmp = triple;
       } else {
+        var tmp0 = this$0.l27_1;
         var tmp$ret$1;
         $l$block: {
           // Inline function 'kotlin.collections.firstOrNull' call
-          var tmp0_iterator = this$0.b25_1.j();
-          while (tmp0_iterator.k()) {
-            var element = tmp0_iterator.l();
-            // Inline function 'org.kodein.di.internal.DITreeImpl.findBySpecs.<anonymous>.<anonymous>' call
-            if (element.x1z().p1y($specsContextType) && contextType.c25(element.u21())) {
+          var _iterator__ex2g4s = tmp0.j();
+          while (_iterator__ex2g4s.k()) {
+            var element = _iterator__ex2g4s.l();
+            if (element.h22().z20($specsContextType) && contextType.m27(element.e24())) {
               tmp$ret$1 = element;
               break $l$block;
             }
@@ -1716,14 +1733,14 @@
           tmp$ret$1 = null;
         }
         var translator = tmp$ret$1;
-        tmp = !(translator == null) ? triple.fh(VOID, VOID, translator) : null;
+        tmp = !(translator == null) ? triple.bj(VOID, VOID, translator) : null;
       }
       return tmp;
     };
   }
   function DITreeImpl$findBySpecs$lambda_2(_destruct__k2r9zo) {
-    var argumentTree = _destruct__k2r9zo.ad();
-    var translator = _destruct__k2r9zo.dh();
+    var argumentTree = _destruct__k2r9zo.od();
+    var translator = _destruct__k2r9zo.zi();
     var tmp = asSequence(argumentTree);
     return map(tmp, DITreeImpl$findBySpecs$lambda$lambda_0(translator));
   }
@@ -1734,13 +1751,13 @@
   }
   function DITreeImpl$findBySpecs$lambda_3($specsArgType) {
     return function (_destruct__k2r9zo) {
-      var argType = _destruct__k2r9zo.zc();
-      return argType.c25($specsArgType);
+      var argType = _destruct__k2r9zo.nd();
+      return argType.m27($specsArgType);
     };
   }
   function DITreeImpl$findBySpecs$lambda_4(_destruct__k2r9zo) {
-    var tagTree = _destruct__k2r9zo.ad();
-    var translator = _destruct__k2r9zo.dh();
+    var tagTree = _destruct__k2r9zo.od();
+    var translator = _destruct__k2r9zo.zi();
     var tmp = asSequence(tagTree);
     return map(tmp, DITreeImpl$findBySpecs$lambda$lambda_1(translator));
   }
@@ -1751,30 +1768,29 @@
   }
   function DITreeImpl$findBySpecs$lambda_5($specsTag) {
     return function (_destruct__k2r9zo) {
-      var tag = _destruct__k2r9zo.zc();
+      var tag = _destruct__k2r9zo.nd();
       return equals(tag, $specsTag);
     };
   }
   function DITreeImpl$findBySpecs$lambda_6(_destruct__k2r9zo) {
-    var key = _destruct__k2r9zo.ad();
-    var translator = _destruct__k2r9zo.dh();
+    var key = _destruct__k2r9zo.od();
+    var translator = _destruct__k2r9zo.zi();
     return to(key, translator);
   }
   function DITreeImpl$notInMap$lambda(it) {
-    return it.q1z();
+    return it.a22();
   }
   function DITreeImpl(map, externalSources, registeredTranslators) {
-    this.w24_1 = externalSources;
-    this.x24_1 = registeredTranslators;
-    this.y24_1 = newConcurrentMap();
-    this.z24_1 = HashMap_init_$Create$();
-    this.b25_1 = ArrayList_init_$Create$_1(this.x24_1);
+    this.g27_1 = externalSources;
+    this.h27_1 = registeredTranslators;
+    this.i27_1 = newConcurrentMap();
+    this.j27_1 = HashMap_init_$Create$();
+    this.l27_1 = ArrayList_init_$Create$_1(this.h27_1);
     // Inline function 'kotlin.collections.forEach' call
     // Inline function 'kotlin.collections.iterator' call
-    var tmp0_iterator = map.s().j();
-    while (tmp0_iterator.k()) {
-      var element = tmp0_iterator.l();
-      // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
+    var _iterator__ex2g4s = map.s().j();
+    while (_iterator__ex2g4s.k()) {
+      var element = _iterator__ex2g4s.l();
       // Inline function 'kotlin.collections.component1' call
       var key = element.z1();
       // Inline function 'kotlin.collections.component2' call
@@ -1782,44 +1798,41 @@
       // Inline function 'kotlin.collections.map' call
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(bindings, 10));
-      var tmp0_iterator_0 = bindings.j();
-      while (tmp0_iterator_0.k()) {
-        var item = tmp0_iterator_0.l();
-        // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
+      var _iterator__ex2g4s_0 = bindings.j();
+      while (_iterator__ex2g4s_0.k()) {
+        var item = _iterator__ex2g4s_0.l();
         var tmp;
         if (item instanceof DIDefinition) {
           tmp = item;
         } else {
-          tmp = new DIDefinition(item.a1z_1, item.b1z_1, this);
+          tmp = new DIDefinition(item.k21_1, item.l21_1, this);
         }
         var tmp$ret$3 = tmp;
         destination.e(tmp$ret$3);
       }
       var definitions = destination;
+      var tmp0 = this.i27_1;
       // Inline function 'kotlin.collections.set' call
-      var this_0 = this.y24_1;
       var value = new Triple(key, definitions, null);
-      this_0.g2(key, value);
-      var typeChecker = first(bindings).a1z_1.p21() ? new Down(key.e1z_1) : new Up(key.e1z_1);
+      tmp0.g2(key, value);
+      var typeChecker = first(bindings).k21_1.z23() ? new Down(key.o21_1) : new Up(key.o21_1);
       // Inline function 'kotlin.collections.getOrPut' call
-      var this_1 = this.z24_1;
-      var value_0 = this_1.d2(typeChecker);
+      var this_0 = this.j27_1;
+      var value_0 = this_0.d2(typeChecker);
       var tmp_0;
       if (value_0 == null) {
-        // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
         var answer = HashMap_init_$Create$();
-        this_1.g2(typeChecker, answer);
+        this_0.g2(typeChecker, answer);
         tmp_0 = answer;
       } else {
         tmp_0 = value_0;
       }
       var contextTree = tmp_0;
       // Inline function 'kotlin.collections.getOrPut' call
-      var key_0 = new Down(key.c1z_1);
+      var key_0 = new Down(key.m21_1);
       var value_1 = contextTree.d2(key_0);
       var tmp_1;
       if (value_1 == null) {
-        // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
         var answer_0 = HashMap_init_$Create$();
         contextTree.g2(key_0, answer_0);
         tmp_1 = answer_0;
@@ -1828,11 +1841,10 @@
       }
       var argumentTree = tmp_1;
       // Inline function 'kotlin.collections.getOrPut' call
-      var key_1 = new Down(key.d1z_1);
+      var key_1 = new Down(key.n21_1);
       var value_2 = argumentTree.d2(key_1);
       var tmp_2;
       if (value_2 == null) {
-        // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
         var answer_1 = HashMap_init_$Create$();
         argumentTree.g2(key_1, answer_1);
         tmp_2 = answer_1;
@@ -1841,62 +1853,59 @@
       }
       var tagTree = tmp_2;
       // Inline function 'kotlin.collections.set' call
-      var key_2 = key.f1z_1;
+      var key_2 = key.p21_1;
       tagTree.g2(key_2, key);
     }
     var tmp_3 = this;
     // Inline function 'kotlin.collections.mapValues' call
-    var this_2 = this.y24_1;
+    var this_1 = this.i27_1;
     // Inline function 'kotlin.collections.mapValuesTo' call
-    var destination_0 = LinkedHashMap_init_$Create$_0(mapCapacity(this_2.m()));
+    var destination_0 = LinkedHashMap_init_$Create$_0(mapCapacity(this_1.m()));
     // Inline function 'kotlin.collections.associateByTo' call
-    var tmp0_iterator_1 = this_2.s().j();
-    while (tmp0_iterator_1.k()) {
-      var element_0 = tmp0_iterator_1.l();
-      // Inline function 'kotlin.collections.mapValuesTo.<anonymous>' call
+    var _iterator__ex2g4s_1 = this_1.s().j();
+    while (_iterator__ex2g4s_1.k()) {
+      var element_0 = _iterator__ex2g4s_1.l();
       var tmp_4 = element_0.z1();
-      // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
-      var tmp$ret$13 = element_0.a2().bh_1;
-      destination_0.g2(tmp_4, tmp$ret$13);
+      var tmp$ret$17 = element_0.a2().xi_1;
+      destination_0.g2(tmp_4, tmp$ret$17);
     }
-    tmp_3.a25_1 = HashMap_init_$Create$_0(destination_0);
+    tmp_3.k27_1 = HashMap_init_$Create$_0(destination_0);
     $l$loop: while (true) {
       var added = ArrayList_init_$Create$();
-      var _iterator__ex2g4s = this.b25_1.j();
-      while (_iterator__ex2g4s.k()) {
-        var src = _iterator__ex2g4s.l();
-        var _iterator__ex2g4s_0 = this.b25_1.j();
-        while (_iterator__ex2g4s_0.k()) {
-          var dst = _iterator__ex2g4s_0.l();
-          if (dst.x1z().p1y(src.u21()) && !equals(src.x1z(), dst.u21())) {
-            var tmp$ret$17;
+      var _iterator__ex2g4s_2 = this.l27_1.j();
+      while (_iterator__ex2g4s_2.k()) {
+        var src = _iterator__ex2g4s_2.l();
+        var _iterator__ex2g4s_3 = this.l27_1.j();
+        while (_iterator__ex2g4s_3.k()) {
+          var dst = _iterator__ex2g4s_3.l();
+          if (dst.h22().z20(src.e24()) && !equals(src.h22(), dst.e24())) {
+            var tmp0_0 = this.l27_1;
+            var tmp$ret$21;
             $l$block_0: {
               // Inline function 'kotlin.collections.none' call
-              var this_3 = this.b25_1;
               var tmp_5;
-              if (isInterface(this_3, Collection)) {
-                tmp_5 = this_3.p();
+              if (isInterface(tmp0_0, Collection)) {
+                tmp_5 = tmp0_0.p();
               } else {
                 tmp_5 = false;
               }
               if (tmp_5) {
-                tmp$ret$17 = true;
+                tmp$ret$21 = true;
                 break $l$block_0;
               }
-              var tmp0_iterator_2 = this_3.j();
-              while (tmp0_iterator_2.k()) {
-                var element_1 = tmp0_iterator_2.l();
-                // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
-                if (equals(element_1.x1z(), src.x1z()) && equals(element_1.u21(), dst.u21())) {
-                  tmp$ret$17 = false;
+              var _iterator__ex2g4s_4 = tmp0_0.j();
+              while (_iterator__ex2g4s_4.k()) {
+                var element_1 = _iterator__ex2g4s_4.l();
+                if (equals(element_1.h22(), src.h22()) && equals(element_1.e24(), dst.e24())) {
+                  tmp$ret$21 = false;
                   break $l$block_0;
                 }
               }
-              tmp$ret$17 = true;
+              tmp$ret$21 = true;
             }
-            if (tmp$ret$17) {
-              // Inline function 'kotlin.collections.plusAssign' call
+            if (tmp$ret$21) {
               var tmp_6 = isInterface(src, ContextTranslator) ? src : THROW_CCE();
+              // Inline function 'kotlin.collections.plusAssign' call
               var element_2 = new CompositeContextTranslator(tmp_6, isInterface(dst, ContextTranslator) ? dst : THROW_CCE());
               added.e(element_2);
             }
@@ -1904,29 +1913,28 @@
         }
       }
       // Inline function 'kotlin.collections.plusAssign' call
-      var this_4 = this.b25_1;
-      addAll(this_4, added);
+      var this_2 = this.l27_1;
+      addAll(this_2, added);
       if (added.p())
         break $l$loop;
     }
   }
-  protoOf(DITreeImpl).v20 = function () {
-    return this.w24_1;
+  protoOf(DITreeImpl).f23 = function () {
+    return this.g27_1;
   };
-  protoOf(DITreeImpl).u20 = function () {
-    return this.a25_1;
+  protoOf(DITreeImpl).e23 = function () {
+    return this.k27_1;
   };
-  protoOf(DITreeImpl).w20 = function (key, overrideLevel, all) {
+  protoOf(DITreeImpl).g23 = function (key, overrideLevel, all) {
     if (!all) {
-      var tmp52_safe_receiver = this.y24_1.d2(key);
-      if (tmp52_safe_receiver == null)
+      var tmp0_safe_receiver = this.i27_1.d2(key);
+      if (tmp0_safe_receiver == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        // Inline function 'kotlin.contracts.contract' call
-        var realKey = tmp52_safe_receiver.zc();
-        var list = tmp52_safe_receiver.ad();
-        var translator = tmp52_safe_receiver.dh();
+        var realKey = tmp0_safe_receiver.nd();
+        var list = tmp0_safe_receiver.od();
+        var translator = tmp0_safe_receiver.zi();
         var tmp0_elvis_lhs = getOrNull(list, overrideLevel);
         var tmp;
         if (tmp0_elvis_lhs == null) {
@@ -1939,24 +1947,22 @@
         var tmp_1 = definition instanceof DIDefinition ? definition : THROW_CCE();
         return listOf(new Triple(tmp_0, tmp_1, (translator == null ? true : isInterface(translator, ContextTranslator)) ? translator : THROW_CCE()));
       }
-      if (!equals(key.c1z_1, Companion_getInstance().g1y_1)) {
-        var anyContextKey = key.s1z(Companion_getInstance().g1y_1);
-        var tmp53_safe_receiver = this.y24_1.d2(anyContextKey);
-        if (tmp53_safe_receiver == null)
+      if (!equals(key.m21_1, Companion_getInstance().q20_1)) {
+        var anyContextKey = key.c22(Companion_getInstance().q20_1);
+        var tmp1_safe_receiver = this.i27_1.d2(anyContextKey);
+        if (tmp1_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
-          // Inline function 'kotlin.contracts.contract' call
           $l$block: {
-            // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-            var realKey_0 = tmp53_safe_receiver.zc();
-            var list_0 = tmp53_safe_receiver.ad();
-            var translator_0 = tmp53_safe_receiver.dh();
-            if (!(translator_0 == null) && !equals(translator_0.x1z(), key.c1z_1)) {
+            var realKey_0 = tmp1_safe_receiver.nd();
+            var list_0 = tmp1_safe_receiver.od();
+            var translator_0 = tmp1_safe_receiver.zi();
+            if (!(translator_0 == null) && !equals(translator_0.h22(), key.m21_1)) {
               break $l$block;
             }
             // Inline function 'kotlin.collections.set' call
-            this.y24_1.g2(key, tmp53_safe_receiver);
+            this.i27_1.g2(key, tmp1_safe_receiver);
             var tmp0_elvis_lhs_0 = getOrNull(list_0, overrideLevel);
             var tmp_2;
             if (tmp0_elvis_lhs_0 == null) {
@@ -1972,68 +1978,62 @@
         }
       }
       // Inline function 'kotlin.collections.filter' call
+      var tmp0 = this.l27_1;
       // Inline function 'kotlin.collections.filterTo' call
-      var this_0 = this.b25_1;
       var destination = ArrayList_init_$Create$();
-      var tmp0_iterator = this_0.j();
-      while (tmp0_iterator.k()) {
-        var element = tmp0_iterator.l();
-        // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-        if (equals(element.x1z(), key.c1z_1)) {
+      var _iterator__ex2g4s = tmp0.j();
+      while (_iterator__ex2g4s.k()) {
+        var element = _iterator__ex2g4s.l();
+        if (equals(element.h22(), key.m21_1)) {
           destination.e(element);
         }
       }
       var tmp_5 = destination;
       // Inline function 'kotlin.collections.filter' call
+      var tmp0_0 = this.l27_1;
       // Inline function 'kotlin.collections.filterTo' call
-      var this_1 = this.b25_1;
       var destination_0 = ArrayList_init_$Create$();
-      var tmp0_iterator_0 = this_1.j();
-      while (tmp0_iterator_0.k()) {
-        var element_0 = tmp0_iterator_0.l();
-        // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-        if (equals(element_0.x1z(), Companion_getInstance().g1y_1)) {
+      var _iterator__ex2g4s_0 = tmp0_0.j();
+      while (_iterator__ex2g4s_0.k()) {
+        var element_0 = _iterator__ex2g4s_0.l();
+        if (equals(element_0.h22(), Companion_getInstance().q20_1)) {
           destination_0.e(element_0);
         }
       }
       var applicableTranslators = plus(tmp_5, destination_0);
-      var _iterator__ex2g4s = applicableTranslators.j();
-      while (_iterator__ex2g4s.k()) {
-        var translator_1 = _iterator__ex2g4s.l();
-        var translatedKey = new Key(translator_1.u21(), key.d1z_1, key.e1z_1, key.f1z_1);
-        var tmp54_safe_receiver = this.y24_1.d2(translatedKey);
+      var _iterator__ex2g4s_1 = applicableTranslators.j();
+      while (_iterator__ex2g4s_1.k()) {
+        var translator_1 = _iterator__ex2g4s_1.l();
+        var translatedKey = new Key(translator_1.e24(), key.n21_1, key.o21_1, key.p21_1);
+        var tmp2_safe_receiver = this.i27_1.d2(translatedKey);
         var tmp_6;
-        if (tmp54_safe_receiver == null) {
+        if (tmp2_safe_receiver == null) {
           tmp_6 = null;
         } else {
           // Inline function 'kotlin.takeIf' call
-          // Inline function 'kotlin.contracts.contract' call
           var tmp_7;
-          // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-          if (tmp54_safe_receiver.ch_1 == null) {
-            tmp_7 = tmp54_safe_receiver;
+          if (tmp2_safe_receiver.yi_1 == null) {
+            tmp_7 = tmp2_safe_receiver;
           } else {
             tmp_7 = null;
           }
           tmp_6 = tmp_7;
         }
-        var tmp55_safe_receiver = tmp_6;
-        if (tmp55_safe_receiver == null)
+        var tmp3_safe_receiver = tmp_6;
+        if (tmp3_safe_receiver == null)
           null;
         else {
           // Inline function 'kotlin.let' call
-          // Inline function 'kotlin.contracts.contract' call
           $l$block_0: {
-            // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-            if (!(tmp55_safe_receiver.ch_1 == null)) {
+            if (!(tmp3_safe_receiver.yi_1 == null)) {
               break $l$block_0;
             }
+            var tmp0_1 = this.i27_1;
             // Inline function 'kotlin.collections.set' call
-            var this_2 = this.y24_1;
-            var value = tmp55_safe_receiver.fh(VOID, VOID, translator_1);
-            this_2.g2(key, value);
-            var realKey_1 = tmp55_safe_receiver.zc();
-            var list_1 = tmp55_safe_receiver.ad();
+            var value = tmp3_safe_receiver.bj(VOID, VOID, translator_1);
+            tmp0_1.g2(key, value);
+            var realKey_1 = tmp3_safe_receiver.nd();
+            var list_1 = tmp3_safe_receiver.od();
             var tmp0_elvis_lhs_1 = getOrNull(list_1, overrideLevel);
             var tmp_8;
             if (tmp0_elvis_lhs_1 == null) {
@@ -2049,49 +2049,47 @@
         }
       }
     }
-    var result = findBySpecs(this, new SearchSpecs(key.c1z_1, key.d1z_1, key.e1z_1, key.f1z_1));
+    var result = findBySpecs(this, new SearchSpecs(key.m21_1, key.n21_1, key.o21_1, key.p21_1));
     if (result.m() === 1) {
       var _destruct__k2r9zo = first(result);
-      var realKey_2 = _destruct__k2r9zo.zc();
-      var translator_2 = _destruct__k2r9zo.ad();
-      // Inline function 'kotlin.collections.set' call
-      var this_3 = this.y24_1;
-      var tmp56_safe_receiver = this.y24_1.d2(realKey_2);
-      var tmp0_elvis_lhs_2 = tmp56_safe_receiver == null ? null : tmp56_safe_receiver.fh(VOID, VOID, translator_2);
+      var realKey_2 = _destruct__k2r9zo.nd();
+      var translator_2 = _destruct__k2r9zo.od();
+      var tmp0_2 = this.i27_1;
+      var tmp4_safe_receiver = this.i27_1.d2(realKey_2);
+      var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.bj(VOID, VOID, translator_2);
       var tmp_11;
-      if (tmp0_elvis_lhs_2 == null) {
+      if (tmp5_elvis_lhs == null) {
         throw notInMap(this, realKey_2, key);
       } else {
-        tmp_11 = tmp0_elvis_lhs_2;
+        tmp_11 = tmp5_elvis_lhs;
       }
+      // Inline function 'kotlin.collections.set' call
       var value_0 = tmp_11;
-      this_3.g2(key, value_0);
+      tmp0_2.g2(key, value_0);
     }
     // Inline function 'kotlin.collections.mapNotNull' call
     // Inline function 'kotlin.collections.mapNotNullTo' call
     var destination_1 = ArrayList_init_$Create$();
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_iterator_1 = result.j();
-    while (tmp0_iterator_1.k()) {
-      var element_1 = tmp0_iterator_1.l();
-      // Inline function 'kotlin.collections.mapNotNullTo.<anonymous>' call
-      var tmp$ret$13;
+    var _iterator__ex2g4s_2 = result.j();
+    while (_iterator__ex2g4s_2.k()) {
+      var element_1 = _iterator__ex2g4s_2.l();
+      var tmp$ret$16;
       $l$block_1: {
-        // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-        var realKey_3 = element_1.zc();
-        var translator_3 = element_1.ad();
-        var tmp0_elvis_lhs_3 = this.y24_1.d2(realKey_3);
+        var realKey_3 = element_1.nd();
+        var translator_3 = element_1.od();
+        var tmp0_elvis_lhs_2 = this.i27_1.d2(realKey_3);
         var tmp_12;
-        if (tmp0_elvis_lhs_3 == null) {
+        if (tmp0_elvis_lhs_2 == null) {
           throw notInMap(this, realKey_3, key);
         } else {
-          tmp_12 = tmp0_elvis_lhs_3;
+          tmp_12 = tmp0_elvis_lhs_2;
         }
-        var definitions = tmp_12.ad();
+        var definitions = tmp_12.od();
         var tmp1_elvis_lhs = getOrNull(definitions, overrideLevel);
         var tmp_13;
         if (tmp1_elvis_lhs == null) {
-          tmp$ret$13 = null;
+          tmp$ret$16 = null;
           break $l$block_1;
         } else {
           tmp_13 = tmp1_elvis_lhs;
@@ -2099,52 +2097,50 @@
         var definition_2 = tmp_13;
         var tmp_14 = realKey_3 instanceof Key ? realKey_3 : THROW_CCE();
         var tmp_15 = definition_2 instanceof DIDefinition ? definition_2 : THROW_CCE();
-        tmp$ret$13 = new Triple(tmp_14, tmp_15, (translator_3 == null ? true : isInterface(translator_3, ContextTranslator)) ? translator_3 : THROW_CCE());
+        tmp$ret$16 = new Triple(tmp_14, tmp_15, (translator_3 == null ? true : isInterface(translator_3, ContextTranslator)) ? translator_3 : THROW_CCE());
       }
-      var tmp0_safe_receiver = tmp$ret$13;
-      if (tmp0_safe_receiver == null)
+      var tmp0_safe_receiver_0 = tmp$ret$16;
+      if (tmp0_safe_receiver_0 == null)
         null;
       else {
         // Inline function 'kotlin.let' call
-        // Inline function 'kotlin.contracts.contract' call
-        destination_1.e(tmp0_safe_receiver);
+        destination_1.e(tmp0_safe_receiver_0);
       }
     }
     return destination_1;
   };
-  protoOf(DITreeImpl).y20 = function (search) {
+  protoOf(DITreeImpl).i23 = function (search) {
     var result = findBySpecs(this, search);
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(result, 10));
-    var tmp0_iterator = result.j();
-    while (tmp0_iterator.k()) {
-      var item = tmp0_iterator.l();
-      // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-      var key = item.zc();
-      var translator = item.ad();
-      var tmp$ret$0 = new Triple(key, ensureNotNull(this.y24_1.d2(key)).bh_1, translator);
+    var _iterator__ex2g4s = result.j();
+    while (_iterator__ex2g4s.k()) {
+      var item = _iterator__ex2g4s.l();
+      var key = item.nd();
+      var translator = item.od();
+      var tmp$ret$0 = new Triple(key, ensureNotNull(this.i27_1.d2(key)).xi_1, translator);
       destination.e(tmp$ret$0);
     }
     return destination;
   };
-  protoOf(DITreeImpl).z20 = function (key) {
-    var tmp = this.y24_1.d2(key);
+  protoOf(DITreeImpl).j23 = function (key) {
+    var tmp = this.i27_1.d2(key);
     return (tmp == null ? true : tmp instanceof Triple) ? tmp : THROW_CCE();
   };
   function Down(type) {
     TypeChecker.call(this);
-    this.d25_1 = type;
-    this.e25_1 = equals(this.d25_1, Companion_getInstance().g1y_1);
+    this.n27_1 = type;
+    this.o27_1 = equals(this.n27_1, Companion_getInstance().q20_1);
   }
-  protoOf(Down).c25 = function (other) {
-    return this.e25_1 || this.d25_1.p1y(other);
+  protoOf(Down).m27 = function (other) {
+    return this.o27_1 || this.n27_1.z20(other);
   };
   protoOf(Down).toString = function () {
-    return 'Down(type=' + toString_0(this.d25_1) + ')';
+    return 'Down(type=' + toString_0(this.n27_1) + ')';
   };
   protoOf(Down).hashCode = function () {
-    return hashCode(this.d25_1);
+    return hashCode(this.n27_1);
   };
   protoOf(Down).equals = function (other) {
     if (this === other)
@@ -2152,22 +2148,22 @@
     if (!(other instanceof Down))
       return false;
     var tmp0_other_with_cast = other instanceof Down ? other : THROW_CCE();
-    if (!equals(this.d25_1, tmp0_other_with_cast.d25_1))
+    if (!equals(this.n27_1, tmp0_other_with_cast.n27_1))
       return false;
     return true;
   };
   function Up(type) {
     TypeChecker.call(this);
-    this.f25_1 = type;
+    this.p27_1 = type;
   }
-  protoOf(Up).c25 = function (other) {
-    return equals(other, Companion_getInstance().g1y_1) || other.p1y(this.f25_1);
+  protoOf(Up).m27 = function (other) {
+    return equals(other, Companion_getInstance().q20_1) || other.z20(this.p27_1);
   };
   protoOf(Up).toString = function () {
-    return 'Up(type=' + toString_0(this.f25_1) + ')';
+    return 'Up(type=' + toString_0(this.p27_1) + ')';
   };
   protoOf(Up).hashCode = function () {
-    return hashCode(this.f25_1);
+    return hashCode(this.p27_1);
   };
   protoOf(Up).equals = function (other) {
     if (this === other)
@@ -2175,66 +2171,64 @@
     if (!(other instanceof Up))
       return false;
     var tmp0_other_with_cast = other instanceof Up ? other : THROW_CCE();
-    if (!equals(this.f25_1, tmp0_other_with_cast.f25_1))
+    if (!equals(this.p27_1, tmp0_other_with_cast.p27_1))
       return false;
     return true;
   };
   function TypeChecker() {
   }
   function DirectDIBaseImpl(container, context) {
-    this.g25_1 = container;
-    this.h25_1 = context;
+    this.q27_1 = container;
+    this.r27_1 = context;
   }
-  protoOf(DirectDIBaseImpl).f20 = function () {
-    return this.g25_1;
+  protoOf(DirectDIBaseImpl).p22 = function () {
+    return this.q27_1;
   };
-  protoOf(DirectDIBaseImpl).d21 = function () {
+  protoOf(DirectDIBaseImpl).n23 = function () {
     return this;
   };
-  protoOf(DirectDIBaseImpl).a21 = function () {
-    var tmp = this.f20();
-    return On(new DIImpl(tmp instanceof DIContainerImpl ? tmp : THROW_CCE()), this.h25_1);
+  protoOf(DirectDIBaseImpl).k23 = function () {
+    var tmp = this.p22();
+    return On(new DIImpl(tmp instanceof DIContainerImpl ? tmp : THROW_CCE()), this.r27_1);
   };
-  protoOf(DirectDIBaseImpl).b21 = function (context) {
-    return createDirectDI(this.f20(), context);
+  protoOf(DirectDIBaseImpl).l23 = function (context) {
+    return createDirectDI(this.p22(), context);
   };
-  protoOf(DirectDIBaseImpl).c21 = function (type, tag) {
-    var tmp = this.f20();
+  protoOf(DirectDIBaseImpl).m23 = function (type, tag) {
+    var tmp = this.p22();
     // Inline function 'org.kodein.di.internal.anyType' call
-    var tmp_0 = this.h25_1.k20();
+    var tmp_0 = this.r27_1.u22();
     var tmp$ret$0 = isInterface(tmp_0, TypeToken) ? tmp_0 : THROW_CCE();
-    return tmp.q20(new Key(tmp$ret$0, Companion_getInstance().f1y_1, type, tag), this.h25_1.a2())();
+    return tmp.a23(new Key(tmp$ret$0, Companion_getInstance().p20_1, type, tag), this.r27_1.a2())();
   };
   function DIProperty$provideDelegate$lambda($receiver, this$0, $prop) {
     return function () {
       var tmp;
-      if (!($receiver == null) && this$0.j25_1 === get_AnyDIContext()) {
+      if (!($receiver == null) && this$0.t27_1 === get_AnyDIContext()) {
         var tmp_0 = Companion_instance_0;
         var tmp_1 = erasedOf($receiver);
-        tmp = tmp_0.l20(isInterface(tmp_1, TypeToken) ? tmp_1 : THROW_CCE(), $receiver);
+        tmp = tmp_0.v22(isInterface(tmp_1, TypeToken) ? tmp_1 : THROW_CCE(), $receiver);
       } else {
-        tmp = this$0.j25_1;
+        tmp = this$0.t27_1;
       }
       var context = tmp;
-      return this$0.k25_1(context, $prop.callableName);
+      return this$0.u27_1(context, $prop.callableName);
     };
   }
   function DIProperty(trigger, originalContext, get) {
-    this.i25_1 = trigger;
-    this.j25_1 = originalContext;
-    this.k25_1 = get;
+    this.s27_1 = trigger;
+    this.t27_1 = originalContext;
+    this.u27_1 = get;
   }
-  protoOf(DIProperty).l25 = function (receiver, prop) {
+  protoOf(DIProperty).v27 = function (receiver, prop) {
     // Inline function 'kotlin.also' call
     var this_0 = lazy(DIProperty$provideDelegate$lambda(receiver, this, prop));
-    // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'org.kodein.di.DIProperty.provideDelegate.<anonymous>' call
-    var tmp62_safe_receiver = this.i25_1;
-    var tmp63_safe_receiver = tmp62_safe_receiver == null ? null : tmp62_safe_receiver.m25_1;
-    if (tmp63_safe_receiver == null)
+    var tmp0_safe_receiver = this.s27_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w27_1;
+    if (tmp1_safe_receiver == null)
       null;
     else
-      tmp63_safe_receiver.e(this_0);
+      tmp1_safe_receiver.e(this_0);
     return this_0;
   };
   function createDirectDI(container, context) {
@@ -2250,25 +2244,25 @@
     return ArrayList_init_$Create$();
   }
   //region block: post-declaration
-  protoOf(Singleton).n21 = get_argType;
-  protoOf(Singleton).i1z = get_description;
-  protoOf(Singleton).k1z = get_fullDescription;
-  protoOf(Singleton).p21 = get_supportSubTypes;
-  protoOf(Provider).n21 = get_argType;
-  protoOf(Provider).m21 = factoryFullName;
-  protoOf(Provider).z1z = get_scope;
-  protoOf(Provider).i1z = get_description;
-  protoOf(Provider).k1z = get_fullDescription;
-  protoOf(Provider).p21 = get_supportSubTypes;
-  protoOf(DIBuilderImpl).w1z = import$default;
-  protoOf(DIContainerImpl).s20 = factory$default;
-  protoOf(DIContainerImpl).t20 = provider;
-  protoOf(DIContainerImpl).q20 = provider$default;
-  protoOf(DIImpl).e20 = get_di;
-  protoOf(DIImpl).g20 = get_diContext;
-  protoOf(DIImpl).h20 = get_diTrigger;
-  protoOf(DITreeImpl).x20 = find$default;
-  protoOf(DirectDIBaseImpl).e20 = get_di_0;
+  protoOf(Singleton).x23 = get_argType;
+  protoOf(Singleton).s21 = get_description;
+  protoOf(Singleton).u21 = get_fullDescription;
+  protoOf(Singleton).z23 = get_supportSubTypes;
+  protoOf(Provider).x23 = get_argType;
+  protoOf(Provider).w23 = factoryFullName;
+  protoOf(Provider).j22 = get_scope;
+  protoOf(Provider).s21 = get_description;
+  protoOf(Provider).u21 = get_fullDescription;
+  protoOf(Provider).z23 = get_supportSubTypes;
+  protoOf(DIBuilderImpl).g22 = import$default;
+  protoOf(DIContainerImpl).c23 = factory$default;
+  protoOf(DIContainerImpl).d23 = provider;
+  protoOf(DIContainerImpl).a23 = provider$default;
+  protoOf(DIImpl).o22 = get_di;
+  protoOf(DIImpl).q22 = get_diContext;
+  protoOf(DIImpl).r22 = get_diTrigger;
+  protoOf(DITreeImpl).h23 = find$default;
+  protoOf(DirectDIBaseImpl).o22 = get_di_0;
   //endregion
   //region block: init
   Companion_instance = new Companion();