game_client_logic_deb 1.5.5 → 1.6.20

package/Kodein-kodein-di.js

@@ -16,72 +16,71 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.aa;
-  var classMeta = kotlin_kotlin.$_$.x8;
-  var VOID = kotlin_kotlin.$_$.sd;
-  var setMetadataFor = kotlin_kotlin.$_$.ba;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.s;
-  var first = kotlin_kotlin.$_$.d6;
-  var Unit_getInstance = kotlin_kotlin.$_$.m4;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.j;
-  var filterNotNull = kotlin_kotlin.$_$.a6;
-  var sorted = kotlin_kotlin.$_$.j7;
-  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.b1;
-  var repeat = kotlin_kotlin.$_$.fb;
-  var ensureNotNull = kotlin_kotlin.$_$.fd;
-  var KProperty1 = kotlin_kotlin.$_$.pa;
-  var getPropertyCallableRef = kotlin_kotlin.$_$.d9;
-  var toString = kotlin_kotlin.$_$.qd;
+  var protoOf = kotlin_kotlin.$_$.fa;
+  var classMeta = kotlin_kotlin.$_$.c9;
+  var VOID = kotlin_kotlin.$_$.yd;
+  var setMetadataFor = kotlin_kotlin.$_$.ga;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.u;
+  var first = kotlin_kotlin.$_$.i6;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.l;
+  var filterNotNull = kotlin_kotlin.$_$.f6;
+  var sorted = kotlin_kotlin.$_$.o7;
+  var StringBuilder_init_$Create$ = kotlin_kotlin.$_$.d1;
+  var Unit_getInstance = kotlin_kotlin.$_$.r4;
+  var repeat = kotlin_kotlin.$_$.kb;
+  var ensureNotNull = kotlin_kotlin.$_$.ld;
+  var KProperty1 = kotlin_kotlin.$_$.ua;
+  var getPropertyCallableRef = kotlin_kotlin.$_$.i9;
+  var toString = kotlin_kotlin.$_$.wd;
   var Companion_getInstance = kotlin_org_kodein_type_kaverit.$_$.a;
-  var equals = kotlin_kotlin.$_$.a9;
-  var objectCreate = kotlin_kotlin.$_$.y9;
-  var RuntimeException = kotlin_kotlin.$_$.nc;
-  var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.r1;
-  var captureStack = kotlin_kotlin.$_$.s8;
-  var hashCode = kotlin_kotlin.$_$.f9;
-  var THROW_CCE = kotlin_kotlin.$_$.oc;
-  var interfaceMeta = kotlin_kotlin.$_$.g9;
-  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.l1;
-  var getStringHashCode = kotlin_kotlin.$_$.e9;
-  var objectMeta = kotlin_kotlin.$_$.z9;
+  var equals = kotlin_kotlin.$_$.f9;
+  var objectCreate = kotlin_kotlin.$_$.da;
+  var RuntimeException = kotlin_kotlin.$_$.tc;
+  var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.t1;
+  var captureStack = kotlin_kotlin.$_$.x8;
+  var hashCode = kotlin_kotlin.$_$.k9;
+  var THROW_CCE = kotlin_kotlin.$_$.uc;
+  var interfaceMeta = kotlin_kotlin.$_$.l9;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.n1;
+  var getStringHashCode = kotlin_kotlin.$_$.j9;
+  var objectMeta = kotlin_kotlin.$_$.ea;
   var TypeToken = kotlin_org_kodein_type_kaverit.$_$.b;
-  var isInterface = kotlin_kotlin.$_$.o9;
-  var joinToString = kotlin_kotlin.$_$.m6;
+  var isInterface = kotlin_kotlin.$_$.t9;
+  var joinToString = kotlin_kotlin.$_$.r6;
   var erasedOf = kotlin_org_kodein_type_kaverit.$_$.c;
-  var isObject = kotlin_kotlin.$_$.q9;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.i;
-  var toString_0 = kotlin_kotlin.$_$.fa;
-  var HashSet_init_$Create$ = kotlin_kotlin.$_$.p;
-  var HashMap_init_$Create$ = kotlin_kotlin.$_$.m;
-  var charSequenceLength = kotlin_kotlin.$_$.v8;
-  var Enum = kotlin_kotlin.$_$.dc;
-  var Map = kotlin_kotlin.$_$.v4;
-  var listOf = kotlin_kotlin.$_$.t6;
-  var plus = kotlin_kotlin.$_$.b7;
-  var emptyList = kotlin_kotlin.$_$.x5;
-  var plus_0 = kotlin_kotlin.$_$.c7;
-  var checkIndexOverflow = kotlin_kotlin.$_$.e5;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.z1;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.f5;
-  var mapCapacity = kotlin_kotlin.$_$.v6;
-  var coerceAtLeast = kotlin_kotlin.$_$.ha;
-  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.r;
-  var to = kotlin_kotlin.$_$.rd;
-  var KProperty0 = kotlin_kotlin.$_$.oa;
-  var KMutableProperty0 = kotlin_kotlin.$_$.na;
-  var lazy = kotlin_kotlin.$_$.kd;
-  var asSequence = kotlin_kotlin.$_$.c5;
-  var filter = kotlin_kotlin.$_$.ra;
-  var flatMap = kotlin_kotlin.$_$.ta;
-  var mapNotNull = kotlin_kotlin.$_$.ua;
-  var map = kotlin_kotlin.$_$.va;
-  var toList = kotlin_kotlin.$_$.wa;
-  var Triple = kotlin_kotlin.$_$.qc;
-  var ArrayList_init_$Create$_1 = kotlin_kotlin.$_$.k;
-  var HashMap_init_$Create$_0 = kotlin_kotlin.$_$.n;
-  var Collection = kotlin_kotlin.$_$.o4;
-  var addAll = kotlin_kotlin.$_$.a5;
-  var getOrNull = kotlin_kotlin.$_$.g6;
+  var isObject = kotlin_kotlin.$_$.v9;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.k;
+  var toString_0 = kotlin_kotlin.$_$.ka;
+  var HashSet_init_$Create$ = kotlin_kotlin.$_$.r;
+  var HashMap_init_$Create$ = kotlin_kotlin.$_$.o;
+  var charSequenceLength = kotlin_kotlin.$_$.a9;
+  var Enum = kotlin_kotlin.$_$.jc;
+  var Map = kotlin_kotlin.$_$.a5;
+  var listOf = kotlin_kotlin.$_$.y6;
+  var plus = kotlin_kotlin.$_$.g7;
+  var emptyList = kotlin_kotlin.$_$.c6;
+  var plus_0 = kotlin_kotlin.$_$.h7;
+  var checkIndexOverflow = kotlin_kotlin.$_$.j5;
+  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.e2;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.k5;
+  var mapCapacity = kotlin_kotlin.$_$.a7;
+  var coerceAtLeast = kotlin_kotlin.$_$.na;
+  var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.t;
+  var to = kotlin_kotlin.$_$.xd;
+  var KProperty0 = kotlin_kotlin.$_$.ta;
+  var lazy = kotlin_kotlin.$_$.qd;
+  var asSequence = kotlin_kotlin.$_$.h5;
+  var filter = kotlin_kotlin.$_$.wa;
+  var flatMap = kotlin_kotlin.$_$.ya;
+  var mapNotNull = kotlin_kotlin.$_$.za;
+  var map = kotlin_kotlin.$_$.ab;
+  var toList = kotlin_kotlin.$_$.bb;
+  var Triple = kotlin_kotlin.$_$.wc;
+  var ArrayList_init_$Create$_1 = kotlin_kotlin.$_$.m;
+  var HashMap_init_$Create$_0 = kotlin_kotlin.$_$.p;
+  var Collection = kotlin_kotlin.$_$.t4;
+  var addAll = kotlin_kotlin.$_$.f5;
+  var getOrNull = kotlin_kotlin.$_$.l6;
   //endregion
   //region block: pre-declaration
   setMetadataFor(DIDefining, 'DIDefining', classMeta);
@@ -94,10 +93,10 @@
     allowOverride = allowOverride === VOID ? false : allowOverride;
     var tmp;
     if ($super === VOID) {
-      this.g28(module_0, allowOverride);
+      this.k28(module_0, allowOverride);
       tmp = Unit_getInstance();
     } else {
-      tmp = $super.g28.call(this, module_0, allowOverride);
+      tmp = $super.k28.call(this, module_0, allowOverride);
     }
     return tmp;
   }
@@ -122,28 +121,28 @@
   setMetadataFor(DIWrapper, 'DIWrapper', classMeta, VOID, [DI]);
   function factory$default(key, context, overrideLevel, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
-    return $super === VOID ? this.z28(key, context, overrideLevel) : $super.z28.call(this, key, context, overrideLevel);
+    return $super === VOID ? this.d29(key, context, overrideLevel) : $super.d29.call(this, key, context, overrideLevel);
   }
   function provider(key, context, overrideLevel) {
     var tmp$ret$0;
     // Inline function 'org.kodein.di.toProvider' call
-    var tmp0_toProvider = this.a29(key, context);
+    var tmp0_toProvider = this.e29(key, context);
     tmp$ret$0 = DIContainer$provider$lambda(tmp0_toProvider);
     return tmp$ret$0;
   }
   function provider$default(key, context, overrideLevel, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
-    return $super === VOID ? this.b29(key, context, overrideLevel) : provider(key, context, overrideLevel);
+    return $super === VOID ? this.f29(key, context, overrideLevel) : provider(key, context, overrideLevel);
   }
   setMetadataFor(DIContainer, 'DIContainer', interfaceMeta);
   function find$default(key, overrideLevel, all, $super) {
     overrideLevel = overrideLevel === VOID ? 0 : overrideLevel;
     all = all === VOID ? false : all;
-    return $super === VOID ? this.e29(key, overrideLevel, all) : $super.e29.call(this, key, overrideLevel, all);
+    return $super === VOID ? this.i29(key, overrideLevel, all) : $super.i29.call(this, key, overrideLevel, all);
   }
   setMetadataFor(DITree, 'DITree', interfaceMeta);
   function get_di_0() {
-    return this.i29();
+    return this.m29();
   }
   setMetadataFor(DirectDIBase, 'DirectDIBase', interfaceMeta);
   setMetadataFor(NoDefinedTag, 'NoDefinedTag', objectMeta);
@@ -153,19 +152,19 @@
   setMetadataFor(DIBinding$Copier$Companion$invoke$1, VOID, classMeta);
   setMetadataFor(Companion_1, 'Companion', objectMeta);
   function factoryFullName() {
-    return this.t29();
+    return this.x29();
   }
   function get_scope() {
     return null;
   }
   function get_description() {
-    var arg = !equals(this.x29(), Companion_getInstance().d27_1) ? this.x29().s26() + ' -> ' : '';
+    var arg = !equals(this.b2a(), Companion_getInstance().h27_1) ? this.b2a().w26() + ' -> ' : '';
     var tmp;
-    var tmp_0 = this.v29();
+    var tmp_0 = this.z29();
     if (tmp_0 instanceof NoScope) {
       tmp = null;
     } else {
-      tmp = this.v29();
+      tmp = this.z29();
     }
     var scope = tmp;
     var tmp0_safe_receiver = scope;
@@ -178,22 +177,22 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'org.kodein.di.bindings.DIBinding.<get-description>.<anonymous>' call
-      tmp$ret$0 = 'scoped(' + erasedOf(tmp0_safe_receiver).s26() + ').';
+      tmp$ret$0 = 'scoped(' + erasedOf(tmp0_safe_receiver).w26() + ').';
       tmp$ret$1 = tmp$ret$0;
       tmp_1 = tmp$ret$1;
     }
     var tmp1_elvis_lhs = tmp_1;
-    var context = tmp1_elvis_lhs == null ? !equals(this.w29(), Companion_getInstance().e27_1) ? 'contexted<' + this.w29().s26() + '>().' : '' : tmp1_elvis_lhs;
-    return context + this.t29() + ' { ' + arg + this.y29().s26() + ' }';
+    var context = tmp1_elvis_lhs == null ? !equals(this.a2a(), Companion_getInstance().i27_1) ? 'contexted<' + this.a2a().w26() + '>().' : '' : tmp1_elvis_lhs;
+    return context + this.x29() + ' { ' + arg + this.c2a().w26() + ' }';
   }
   function get_fullDescription() {
-    var arg = !equals(this.x29(), Companion_getInstance().d27_1) ? this.x29().u26() + ' -> ' : '';
+    var arg = !equals(this.b2a(), Companion_getInstance().h27_1) ? this.b2a().y26() + ' -> ' : '';
     var tmp;
-    var tmp_0 = this.v29();
+    var tmp_0 = this.z29();
     if (tmp_0 instanceof NoScope) {
       tmp = null;
     } else {
-      tmp = this.v29();
+      tmp = this.z29();
     }
     var scope = tmp;
     var tmp0_safe_receiver = scope;
@@ -206,28 +205,28 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'org.kodein.di.bindings.DIBinding.<get-fullDescription>.<anonymous>' call
-      tmp$ret$0 = 'scoped(' + erasedOf(tmp0_safe_receiver).u26() + ').';
+      tmp$ret$0 = 'scoped(' + erasedOf(tmp0_safe_receiver).y26() + ').';
       tmp$ret$1 = tmp$ret$0;
       tmp_1 = tmp$ret$1;
     }
     var tmp1_elvis_lhs = tmp_1;
-    var context = tmp1_elvis_lhs == null ? !equals(this.w29(), Companion_getInstance().e27_1) ? 'contexted<' + this.w29().u26() + '>().' : '' : tmp1_elvis_lhs;
-    return context + this.u29() + ' { ' + arg + this.y29().u26() + ' }';
+    var context = tmp1_elvis_lhs == null ? !equals(this.a2a(), Companion_getInstance().i27_1) ? 'contexted<' + this.a2a().y26() + '>().' : '' : tmp1_elvis_lhs;
+    return context + this.y29() + ' { ' + arg + this.c2a().y26() + ' }';
   }
   function get_supportSubTypes() {
     return false;
   }
   setMetadataFor(DIBinding, 'DIBinding', interfaceMeta);
   function get_argType() {
-    return Companion_getInstance().d27_1;
+    return Companion_getInstance().h27_1;
   }
   setMetadataFor(NoArgDIBinding, 'NoArgDIBinding', interfaceMeta, VOID, [DIBinding]);
   setMetadataFor(SingletonReference, 'SingletonReference', objectMeta);
   setMetadataFor(Reference, 'Reference', classMeta);
   setMetadataFor(ContextTranslator, 'ContextTranslator', interfaceMeta);
   setMetadataFor(ScopeRegistry, 'ScopeRegistry', classMeta);
-  setMetadataFor(StandardScopeRegistry, 'StandardScopeRegistry', classMeta, ScopeRegistry);
   setMetadataFor(NoScope, 'NoScope', classMeta);
+  setMetadataFor(StandardScopeRegistry, 'StandardScopeRegistry', classMeta, ScopeRegistry);
   setMetadataFor(CompositeContextTranslator, 'CompositeContextTranslator', classMeta, VOID, [ContextTranslator]);
   setMetadataFor(Singleton, 'Singleton', classMeta, VOID, [NoArgDIBinding]);
   setMetadataFor(Provider, 'Provider', classMeta, VOID, [NoArgDIBinding]);
@@ -256,7 +255,7 @@
   //endregion
   function DIDefinition(binding, fromModule, tree) {
     DIDefining.call(this, binding, fromModule);
-    this.l27_1 = tree;
+    this.p27_1 = tree;
   }
   function description(_this__u8e3s4, withOverrides, ident) {
     withOverrides = withOverrides === VOID ? false : withOverrides;
@@ -264,75 +263,59 @@
     return descriptionImpl(_this__u8e3s4, withOverrides, ident, bindDescription$factory(), description$factory());
   }
   function DIDefining(binding, fromModule) {
-    this.m27_1 = binding;
-    this.n27_1 = fromModule;
+    this.q27_1 = binding;
+    this.r27_1 = fromModule;
   }
   function descriptionImpl(_this__u8e3s4, withOverrides, ident, keyBindDisp, bindingDisp) {
-    var tmp$ret$4;
     // Inline function 'kotlin.collections.groupBy' call
-    var tmp1_groupBy = _this__u8e3s4.o();
-    var tmp$ret$3;
+    var tmp0_groupBy = _this__u8e3s4.o();
     // Inline function 'kotlin.collections.groupByTo' call
     var tmp0_groupByTo = LinkedHashMap_init_$Create$();
-    var tmp0_iterator = tmp1_groupBy.f();
+    var tmp0_iterator = tmp0_groupBy.f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
-      var tmp$ret$0;
       // Inline function 'org.kodein.di.descriptionImpl.<anonymous>' call
-      tmp$ret$0 = first(element.j1()).n27_1;
-      var key = tmp$ret$0;
-      var tmp$ret$2;
+      var key = first(element.j1()).r27_1;
       // Inline function 'kotlin.collections.getOrPut' call
       var value = tmp0_groupByTo.t1(key);
       var tmp;
       if (value == null) {
-        var tmp$ret$1;
         // Inline function 'kotlin.collections.groupByTo.<anonymous>' call
-        tmp$ret$1 = ArrayList_init_$Create$();
-        var answer = tmp$ret$1;
+        var answer = ArrayList_init_$Create$();
         tmp0_groupByTo.v3(key, answer);
         tmp = answer;
       } else {
         tmp = value;
       }
-      tmp$ret$2 = tmp;
-      var list = tmp$ret$2;
+      var list = tmp;
       list.a(element);
     }
-    tmp$ret$3 = tmp0_groupByTo;
-    tmp$ret$4 = tmp$ret$3;
-    var byModule = tmp$ret$4;
+    var byModule = tmp0_groupByTo;
     var modules = sorted(filterNotNull(byModule.u1()));
-    var tmp$ret$7;
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$6;
     // Inline function 'kotlin.apply' call
-    var tmp2_apply = StringBuilder_init_$Create$();
+    var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.descriptionImpl.<anonymous>' call
     var tmp0_safe_receiver = byModule.t1(null);
     if (tmp0_safe_receiver == null)
       null;
     else {
-      var tmp$ret$5;
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
-      descriptionImpl$appendBindings(tmp2_apply, keyBindDisp, bindingDisp, withOverrides, ident, tmp0_safe_receiver);
-      tmp$ret$5 = Unit_getInstance();
+      descriptionImpl$appendBindings(tmp0_apply, keyBindDisp, bindingDisp, withOverrides, ident, tmp0_safe_receiver);
     }
     // Inline function 'kotlin.collections.forEach' call
     var tmp0_iterator_0 = modules.f();
     while (tmp0_iterator_0.g()) {
       var element_0 = tmp0_iterator_0.h();
       // Inline function 'org.kodein.di.descriptionImpl.<anonymous>.<anonymous>' call
-      tmp2_apply.f8(repeat(' ', ident) + 'module ' + element_0 + ' {\n');
-      descriptionImpl$appendBindings(tmp2_apply, keyBindDisp, bindingDisp, withOverrides, ident + 4 | 0, ensureNotNull(byModule.t1(element_0)));
-      tmp2_apply.f8(repeat(' ', ident) + '}\n');
+      tmp0_apply.f8(repeat(' ', ident) + 'module ' + element_0 + ' {\n');
+      descriptionImpl$appendBindings(tmp0_apply, keyBindDisp, bindingDisp, withOverrides, ident + 4 | 0, ensureNotNull(byModule.t1(element_0)));
+      tmp0_apply.f8(repeat(' ', ident) + '}\n');
     }
-    tmp$ret$6 = tmp2_apply;
-    tmp$ret$7 = tmp$ret$6.toString();
-    return tmp$ret$7;
+    return tmp0_apply.toString();
   }
   function fullDescription(_this__u8e3s4, withOverrides, ident) {
     withOverrides = withOverrides === VOID ? false : withOverrides;
@@ -345,16 +328,15 @@
       var element = tmp0_iterator.h();
       // Inline function 'org.kodein.di.descriptionImpl.appendBindings.<anonymous>' call
       var keyDescription = $keyBindDisp(element.h1());
-      _this__u8e3s4.f8(repeat(' ', ident) + keyDescription + ' { ' + $bindingDisp(first(element.j1()).m27_1) + ' }');
+      _this__u8e3s4.f8(repeat(' ', ident) + keyDescription + ' { ' + $bindingDisp(first(element.j1()).q27_1) + ' }');
       if ($withOverrides) {
         var subIdent = keyDescription.length - 4 | 0;
         // Inline function 'kotlin.collections.forEach' call
-        var tmp0_forEach = element.j1().v2(1, element.j1().i());
-        var tmp0_iterator_0 = tmp0_forEach.f();
+        var tmp0_iterator_0 = element.j1().v2(1, element.j1().i()).f();
         while (tmp0_iterator_0.g()) {
           var element_0 = tmp0_iterator_0.h();
           // Inline function 'org.kodein.di.descriptionImpl.appendBindings.<anonymous>.<anonymous>' call
-          _this__u8e3s4.f8(repeat(' ', subIdent) + 'overrides ' + $bindingDisp(element_0.m27_1));
+          _this__u8e3s4.f8(repeat(' ', subIdent) + 'overrides ' + $bindingDisp(element_0.q27_1));
         }
       }
       _this__u8e3s4.f8('\n');
@@ -363,45 +345,45 @@
   }
   function bindDescription$factory() {
     return getPropertyCallableRef('bindDescription', 1, KProperty1, function (receiver) {
-      return receiver.t27();
+      return receiver.x27();
     }, null);
   }
   function description$factory() {
     return getPropertyCallableRef('description', 1, KProperty1, function (receiver) {
-      return receiver.u27();
+      return receiver.y27();
     }, null);
   }
   function bindFullDescription$factory() {
     return getPropertyCallableRef('bindFullDescription', 1, KProperty1, function (receiver) {
-      return receiver.v27();
+      return receiver.z27();
     }, null);
   }
   function fullDescription$factory() {
     return getPropertyCallableRef('fullDescription', 1, KProperty1, function (receiver) {
-      return receiver.w27();
+      return receiver.a28();
     }, null);
   }
   function appendDescription(_this__u8e3s4, $this, displayString) {
-    if (!($this.r27_1 == null)) {
-      _this__u8e3s4.f8(' tagged "' + toString($this.r27_1) + '"');
+    if (!($this.v27_1 == null)) {
+      _this__u8e3s4.f8(' tagged "' + toString($this.v27_1) + '"');
     }
-    if (!equals($this.o27_1, Companion_getInstance().e27_1)) {
-      _this__u8e3s4.f8(' on context ' + displayString($this.o27_1));
+    if (!equals($this.s27_1, Companion_getInstance().i27_1)) {
+      _this__u8e3s4.f8(' on context ' + displayString($this.s27_1));
     }
-    if (!equals($this.p27_1, Companion_getInstance().d27_1)) {
-      _this__u8e3s4.f8(', with argument ' + displayString($this.p27_1));
+    if (!equals($this.t27_1, Companion_getInstance().h27_1)) {
+      _this__u8e3s4.f8(', with argument ' + displayString($this.t27_1));
     }
   }
   function TypeToken$simpleDispString$ref() {
     var l = function (p0) {
-      return p0.s26();
+      return p0.w26();
     };
     l.callableName = 'simpleDispString';
     return l;
   }
   function TypeToken$qualifiedDispString$ref() {
     var l = function (p0) {
-      return p0.u26();
+      return p0.y26();
     };
     l.callableName = 'qualifiedDispString';
     return l;
@@ -410,7 +392,7 @@
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
     prefix = prefix === VOID ? '' : prefix;
     Module.call($this, allowSilentOverride, prefix, init);
-    $this.a28_1 = name;
+    $this.e28_1 = name;
     return $this;
   }
   function Module_init_$Create$(name, allowSilentOverride, prefix, init) {
@@ -423,111 +405,95 @@
   function NotFoundException(key, message) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, NotFoundException);
-    this.b28_1 = key;
+    this.f28_1 = key;
   }
   function OverridingException(message) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, OverridingException);
   }
   function Key(contextType, argType, type, tag) {
-    this.o27_1 = contextType;
-    this.p27_1 = argType;
-    this.q27_1 = type;
-    this.r27_1 = tag;
-    this.s27_1 = 0;
+    this.s27_1 = contextType;
+    this.t27_1 = argType;
+    this.u27_1 = type;
+    this.v27_1 = tag;
+    this.w27_1 = 0;
   }
   protoOf(Key).hashCode = function () {
-    if (this.s27_1 === 0) {
-      this.s27_1 = hashCode(this.o27_1);
-      this.s27_1 = imul(31, this.s27_1) + hashCode(this.p27_1) | 0;
-      this.s27_1 = imul(29, hashCode(this.q27_1));
+    if (this.w27_1 === 0) {
+      this.w27_1 = hashCode(this.s27_1);
+      this.w27_1 = imul(31, this.w27_1) + hashCode(this.t27_1) | 0;
+      this.w27_1 = imul(29, hashCode(this.u27_1));
       var tmp = this;
-      var tmp_0 = imul(23, this.s27_1);
-      var tmp0_safe_receiver = this.r27_1;
+      var tmp_0 = imul(23, this.w27_1);
+      var tmp0_safe_receiver = this.v27_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : hashCode(tmp0_safe_receiver);
-      tmp.s27_1 = tmp_0 + (tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs) | 0;
+      tmp.w27_1 = tmp_0 + (tmp1_elvis_lhs == null ? 0 : tmp1_elvis_lhs) | 0;
     }
-    return this.s27_1;
+    return this.w27_1;
   };
   protoOf(Key).toString = function () {
-    return this.u27();
+    return this.y27();
   };
-  protoOf(Key).t27 = function () {
-    var tmp$ret$1;
+  protoOf(Key).x27 = function () {
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.Key.<get-bindDescription>.<anonymous>' call
-    tmp0_apply.f8('bind<' + this.q27_1.s26() + '>');
-    if (!(this.r27_1 == null)) {
-      tmp0_apply.f8('(tag = "' + toString(this.r27_1) + '")');
+    tmp0_apply.f8('bind<' + this.u27_1.w26() + '>');
+    if (!(this.v27_1 == null)) {
+      tmp0_apply.f8('(tag = "' + toString(this.v27_1) + '")');
     }
-    tmp$ret$0 = tmp0_apply;
-    tmp$ret$1 = tmp$ret$0.toString();
-    return tmp$ret$1;
+    return tmp0_apply.toString();
   };
-  protoOf(Key).v27 = function () {
-    var tmp$ret$1;
+  protoOf(Key).z27 = function () {
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.Key.<get-bindFullDescription>.<anonymous>' call
-    tmp0_apply.f8('bind<' + this.q27_1.u26() + '>');
-    if (!(this.r27_1 == null)) {
-      tmp0_apply.f8('(tag = "' + toString(this.r27_1) + '")');
+    tmp0_apply.f8('bind<' + this.u27_1.y26() + '>');
+    if (!(this.v27_1 == null)) {
+      tmp0_apply.f8('(tag = "' + toString(this.v27_1) + '")');
     }
-    tmp$ret$0 = tmp0_apply;
-    tmp$ret$1 = tmp$ret$0.toString();
-    return tmp$ret$1;
+    return tmp0_apply.toString();
   };
-  protoOf(Key).u27 = function () {
-    var tmp$ret$1;
+  protoOf(Key).y27 = function () {
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.Key.<get-description>.<anonymous>' call
-    tmp0_apply.f8(this.q27_1.s26());
+    tmp0_apply.f8(this.u27_1.w26());
     appendDescription(tmp0_apply, this, TypeToken$simpleDispString$ref());
-    tmp$ret$0 = tmp0_apply;
-    tmp$ret$1 = tmp$ret$0.toString();
-    return tmp$ret$1;
+    return tmp0_apply.toString();
   };
-  protoOf(Key).c28 = function () {
-    return '(context: ' + this.o27_1.s26() + ', arg: ' + this.p27_1.s26() + ', type: ' + this.q27_1.s26() + ', tag: ' + toString(this.r27_1) + ')';
+  protoOf(Key).g28 = function () {
+    return '(context: ' + this.s27_1.w26() + ', arg: ' + this.t27_1.w26() + ', type: ' + this.u27_1.w26() + ', tag: ' + toString(this.v27_1) + ')';
   };
-  protoOf(Key).w27 = function () {
-    var tmp$ret$1;
+  protoOf(Key).a28 = function () {
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$0;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.Key.<get-fullDescription>.<anonymous>' call
-    tmp0_apply.f8(this.q27_1.u26());
+    tmp0_apply.f8(this.u27_1.y26());
     appendDescription(tmp0_apply, this, TypeToken$qualifiedDispString$ref());
-    tmp$ret$0 = tmp0_apply;
-    tmp$ret$1 = tmp$ret$0.toString();
-    return tmp$ret$1;
+    return tmp0_apply.toString();
   };
-  protoOf(Key).d28 = function (contextType, argType, type, tag) {
+  protoOf(Key).h28 = function (contextType, argType, type, tag) {
     return new Key(contextType, argType, type, tag);
   };
-  protoOf(Key).e28 = function (contextType, argType, type, tag, $super) {
-    contextType = contextType === VOID ? this.o27_1 : contextType;
-    argType = argType === VOID ? this.p27_1 : argType;
-    type = type === VOID ? this.q27_1 : type;
-    tag = tag === VOID ? this.r27_1 : tag;
-    return $super === VOID ? this.d28(contextType, argType, type, tag) : $super.d28.call(this, contextType, argType, type, tag);
+  protoOf(Key).i28 = function (contextType, argType, type, tag, $super) {
+    contextType = contextType === VOID ? this.s27_1 : contextType;
+    argType = argType === VOID ? this.t27_1 : argType;
+    type = type === VOID ? this.u27_1 : type;
+    tag = tag === VOID ? this.v27_1 : tag;
+    return $super === VOID ? this.h28(contextType, argType, type, tag) : $super.h28.call(this, contextType, argType, type, tag);
   };
   protoOf(Key).equals = function (other) {
     if (this === other)
@@ -535,13 +501,13 @@
     if (!(other instanceof Key))
       return false;
     var tmp0_other_with_cast = other instanceof Key ? other : THROW_CCE();
-    if (!equals(this.o27_1, tmp0_other_with_cast.o27_1))
+    if (!equals(this.s27_1, tmp0_other_with_cast.s27_1))
       return false;
-    if (!equals(this.p27_1, tmp0_other_with_cast.p27_1))
+    if (!equals(this.t27_1, tmp0_other_with_cast.t27_1))
       return false;
-    if (!equals(this.q27_1, tmp0_other_with_cast.q27_1))
+    if (!equals(this.u27_1, tmp0_other_with_cast.u27_1))
       return false;
-    if (!equals(this.r27_1, tmp0_other_with_cast.r27_1))
+    if (!equals(this.v27_1, tmp0_other_with_cast.v27_1))
       return false;
     return true;
   };
@@ -550,13 +516,13 @@
   function Module(allowSilentOverride, prefix, init) {
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
     prefix = prefix === VOID ? '' : prefix;
-    this.x27_1 = allowSilentOverride;
-    this.y27_1 = prefix;
-    this.z27_1 = init;
-    this.a28_1 = null;
+    this.b28_1 = allowSilentOverride;
+    this.c28_1 = prefix;
+    this.d28_1 = init;
+    this.e28_1 = null;
   }
-  protoOf(Module).qg = function () {
-    var tmp0_elvis_lhs = this.a28_1;
+  protoOf(Module).ug = function () {
+    var tmp0_elvis_lhs = this.e28_1;
     var tmp;
     if (tmp0_elvis_lhs == null) {
       throw IllegalStateException_init_$Create$('module must have a name.');
@@ -566,12 +532,12 @@
     return tmp;
   };
   protoOf(Module).toString = function () {
-    return 'Module(allowSilentOverride=' + this.x27_1 + ', prefix=' + this.y27_1 + ', init=' + this.z27_1 + ')';
+    return 'Module(allowSilentOverride=' + this.b28_1 + ', prefix=' + this.c28_1 + ', init=' + this.d28_1 + ')';
   };
   protoOf(Module).hashCode = function () {
-    var result = this.x27_1 | 0;
-    result = imul(result, 31) + getStringHashCode(this.y27_1) | 0;
-    result = imul(result, 31) + hashCode(this.z27_1) | 0;
+    var result = this.b28_1 | 0;
+    result = imul(result, 31) + getStringHashCode(this.c28_1) | 0;
+    result = imul(result, 31) + hashCode(this.d28_1) | 0;
     return result;
   };
   protoOf(Module).equals = function (other) {
@@ -580,25 +546,25 @@
     if (!(other instanceof Module))
       return false;
     var tmp0_other_with_cast = other instanceof Module ? other : THROW_CCE();
-    if (!(this.x27_1 === tmp0_other_with_cast.x27_1))
+    if (!(this.b28_1 === tmp0_other_with_cast.b28_1))
       return false;
-    if (!(this.y27_1 === tmp0_other_with_cast.y27_1))
+    if (!(this.c28_1 === tmp0_other_with_cast.c28_1))
       return false;
-    if (!equals(this.z27_1, tmp0_other_with_cast.z27_1))
+    if (!equals(this.d28_1, tmp0_other_with_cast.d28_1))
       return false;
     return true;
   };
   function Companion() {
     Companion_instance = this;
-    this.i28_1 = false;
-    this.j28_1 = false;
+    this.m28_1 = false;
+    this.n28_1 = false;
   }
-  protoOf(Companion).k28 = function (allowSilentOverride, init) {
+  protoOf(Companion).o28 = function (allowSilentOverride, init) {
     return DIImpl_init_$Create$(allowSilentOverride, init);
   };
-  protoOf(Companion).l28 = function (allowSilentOverride, init, $super) {
+  protoOf(Companion).p28 = function (allowSilentOverride, init, $super) {
     allowSilentOverride = allowSilentOverride === VOID ? false : allowSilentOverride;
-    return $super === VOID ? this.k28(allowSilentOverride, init) : $super.k28.call(this, allowSilentOverride, init);
+    return $super === VOID ? this.o28(allowSilentOverride, init) : $super.o28.call(this, allowSilentOverride, init);
   };
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -609,26 +575,26 @@
   function DI() {
   }
   function get_direct(_this__u8e3s4) {
-    return new DirectDIImpl(_this__u8e3s4.m28().n28(), _this__u8e3s4.o28());
+    return new DirectDIImpl(_this__u8e3s4.q28().r28(), _this__u8e3s4.s28());
   }
   function DIAware() {
   }
   function Value(type, value) {
-    this.q28_1 = type;
-    this.r28_1 = value;
+    this.u28_1 = type;
+    this.v28_1 = value;
   }
-  protoOf(Value).s28 = function () {
-    return this.q28_1;
+  protoOf(Value).w28 = function () {
+    return this.u28_1;
   };
   protoOf(Value).j1 = function () {
-    return this.r28_1;
+    return this.v28_1;
   };
   protoOf(Value).toString = function () {
-    return 'Value(type=' + this.q28_1 + ', value=' + this.r28_1 + ')';
+    return 'Value(type=' + this.u28_1 + ', value=' + this.v28_1 + ')';
   };
   protoOf(Value).hashCode = function () {
-    var result = hashCode(this.q28_1);
-    result = imul(result, 31) + hashCode(this.r28_1) | 0;
+    var result = hashCode(this.u28_1);
+    result = imul(result, 31) + hashCode(this.v28_1) | 0;
     return result;
   };
   protoOf(Value).equals = function (other) {
@@ -637,16 +603,16 @@
     if (!(other instanceof Value))
       return false;
     var tmp0_other_with_cast = other instanceof Value ? other : THROW_CCE();
-    if (!equals(this.q28_1, tmp0_other_with_cast.q28_1))
+    if (!equals(this.u28_1, tmp0_other_with_cast.u28_1))
       return false;
-    if (!equals(this.r28_1, tmp0_other_with_cast.r28_1))
+    if (!equals(this.v28_1, tmp0_other_with_cast.v28_1))
       return false;
     return true;
   };
   function Companion_0() {
     Companion_instance_0 = this;
   }
-  protoOf(Companion_0).t28 = function (type, value) {
+  protoOf(Companion_0).x28 = function (type, value) {
     return new Value(type, value);
   };
   var Companion_instance_0;
@@ -659,16 +625,16 @@
   }
   function Instance(_this__u8e3s4, type, tag) {
     tag = tag === VOID ? null : tag;
-    var tmp = _this__u8e3s4.p28();
-    var tmp_0 = _this__u8e3s4.o28();
+    var tmp = _this__u8e3s4.t28();
+    var tmp_0 = _this__u8e3s4.s28();
     return new DIProperty(tmp, tmp_0, Instance$lambda(_this__u8e3s4, type, tag));
   }
   function get_AnyDIContext() {
-    return Contexes_getInstance().u28_1;
+    return Contexes_getInstance().y28_1;
   }
   function Contexes() {
     Contexes_instance = this;
-    this.u28_1 = Companion_getInstance_1().t28(Companion_getInstance().e27_1, new Object());
+    this.y28_1 = Companion_getInstance_1().x28(Companion_getInstance().i27_1, new Object());
   }
   var Contexes_instance;
   function Contexes_getInstance() {
@@ -677,14 +643,14 @@
     return Contexes_instance;
   }
   function On(_this__u8e3s4, context, trigger) {
-    context = context === VOID ? _this__u8e3s4.o28() : context;
-    trigger = trigger === VOID ? _this__u8e3s4.p28() : trigger;
+    context = context === VOID ? _this__u8e3s4.s28() : context;
+    trigger = trigger === VOID ? _this__u8e3s4.t28() : trigger;
     return DIWrapper_init_$Create$(_this__u8e3s4, context, trigger);
   }
   function DIWrapper_init_$Init$(base, diContext, trigger, $this) {
-    diContext = diContext === VOID ? base.o28() : diContext;
-    trigger = trigger === VOID ? base.p28() : trigger;
-    DIWrapper.call($this, base.m28(), diContext, trigger);
+    diContext = diContext === VOID ? base.s28() : diContext;
+    trigger = trigger === VOID ? base.t28() : trigger;
+    DIWrapper.call($this, base.q28(), diContext, trigger);
     return $this;
   }
   function DIWrapper_init_$Create$(base, diContext, trigger) {
@@ -692,30 +658,30 @@
   }
   function DIWrapper(_base, diContext, diTrigger) {
     diTrigger = diTrigger === VOID ? null : diTrigger;
-    this.v28_1 = _base;
-    this.w28_1 = diContext;
-    this.x28_1 = diTrigger;
+    this.z28_1 = _base;
+    this.a29_1 = diContext;
+    this.b29_1 = diTrigger;
   }
-  protoOf(DIWrapper).o28 = function () {
-    return this.w28_1;
+  protoOf(DIWrapper).s28 = function () {
+    return this.a29_1;
   };
-  protoOf(DIWrapper).p28 = function () {
-    return this.x28_1;
+  protoOf(DIWrapper).t28 = function () {
+    return this.b29_1;
   };
-  protoOf(DIWrapper).m28 = function () {
+  protoOf(DIWrapper).q28 = function () {
     return this;
   };
-  protoOf(DIWrapper).n28 = function () {
-    return this.v28_1.n28();
+  protoOf(DIWrapper).r28 = function () {
+    return this.z28_1.r28();
   };
   function Instance$lambda($this_Instance, $type, $tag) {
     return function (ctx, _anonymous_parameter_1__qggqgd) {
-      var tmp = $this_Instance.m28().n28();
+      var tmp = $this_Instance.q28().r28();
       var tmp$ret$0;
       // Inline function 'org.kodein.di.anyType' call
-      var tmp_0 = ctx.s28();
+      var tmp_0 = ctx.w28();
       tmp$ret$0 = isInterface(tmp_0, TypeToken) ? tmp_0 : THROW_CCE();
-      return tmp.y28(new Key(tmp$ret$0, Companion_getInstance().d27_1, $type, $tag), ctx.j1())();
+      return tmp.c29(new Key(tmp$ret$0, Companion_getInstance().h27_1, $type, $tag), ctx.j1())();
     };
   }
   function DIContainer$provider$lambda($tmp0_toProvider) {
@@ -743,61 +709,61 @@
     argType = argType === VOID ? null : argType;
     type = type === VOID ? null : type;
     tag = tag === VOID ? NoDefinedTag_getInstance() : tag;
-    this.j29_1 = contextType;
-    this.k29_1 = argType;
-    this.l29_1 = type;
-    this.m29_1 = tag;
+    this.n29_1 = contextType;
+    this.o29_1 = argType;
+    this.p29_1 = type;
+    this.q29_1 = tag;
   }
   protoOf(SearchSpecs).toString = function () {
     var args = ArrayList_init_$Create$();
-    if (!(this.j29_1 == null)) {
+    if (!(this.n29_1 == null)) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp0_safe_receiver = this.j29_1;
-      var tmp0_plusAssign = 'contextType=' + (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.s26());
+      var tmp0_safe_receiver = this.n29_1;
+      var tmp0_plusAssign = 'contextType=' + (tmp0_safe_receiver == null ? null : tmp0_safe_receiver.w26());
       args.a(tmp0_plusAssign);
     }
-    if (!(this.k29_1 == null)) {
+    if (!(this.o29_1 == null)) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp1_safe_receiver = this.k29_1;
-      var tmp1_plusAssign = 'argType=' + (tmp1_safe_receiver == null ? null : tmp1_safe_receiver.s26());
+      var tmp1_safe_receiver = this.o29_1;
+      var tmp1_plusAssign = 'argType=' + (tmp1_safe_receiver == null ? null : tmp1_safe_receiver.w26());
       args.a(tmp1_plusAssign);
     }
-    if (!(this.l29_1 == null)) {
+    if (!(this.p29_1 == null)) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp2_safe_receiver = this.l29_1;
-      var tmp2_plusAssign = 'type=' + (tmp2_safe_receiver == null ? null : tmp2_safe_receiver.s26());
+      var tmp2_safe_receiver = this.p29_1;
+      var tmp2_plusAssign = 'type=' + (tmp2_safe_receiver == null ? null : tmp2_safe_receiver.w26());
       args.a(tmp2_plusAssign);
     }
-    if (!equals(this.m29_1, NoDefinedTag_getInstance())) {
+    if (!equals(this.q29_1, NoDefinedTag_getInstance())) {
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp3_plusAssign = 'tag=' + toString(this.m29_1);
+      var tmp3_plusAssign = 'tag=' + toString(this.q29_1);
       args.a(tmp3_plusAssign);
     }
     return '[' + joinToString(args, ', ') + ']';
   };
   function NoArgBindingDIWrap(_di) {
-    this.n29_1 = _di;
+    this.r29_1 = _di;
   }
-  protoOf(NoArgBindingDIWrap).m28 = function () {
-    return this.n29_1.m28();
+  protoOf(NoArgBindingDIWrap).q28 = function () {
+    return this.r29_1.q28();
   };
-  protoOf(NoArgBindingDIWrap).o29 = function () {
-    return this.n29_1.o29();
+  protoOf(NoArgBindingDIWrap).s29 = function () {
+    return this.r29_1.s29();
   };
-  protoOf(NoArgBindingDIWrap).i29 = function () {
-    return this.n29_1.i29();
+  protoOf(NoArgBindingDIWrap).m29 = function () {
+    return this.r29_1.m29();
   };
-  protoOf(NoArgBindingDIWrap).p29 = function (type, tag) {
-    return this.n29_1.p29(type, tag);
+  protoOf(NoArgBindingDIWrap).t29 = function (type, tag) {
+    return this.r29_1.t29(type, tag);
   };
-  protoOf(NoArgBindingDIWrap).q29 = function (context) {
-    return this.n29_1.q29(context);
+  protoOf(NoArgBindingDIWrap).u29 = function (context) {
+    return this.r29_1.u29(context);
   };
   function ErasedContext() {
     ErasedContext_instance = this;
   }
-  protoOf(ErasedContext).s28 = function () {
-    return Companion_getInstance().e27_1;
+  protoOf(ErasedContext).w28 = function () {
+    return Companion_getInstance().i27_1;
   };
   protoOf(ErasedContext).j1 = function () {
     return ErasedContext_getInstance();
@@ -809,12 +775,12 @@
     return ErasedContext_instance;
   }
   function DIBinding$Copier$Companion$invoke$1($f) {
-    this.r29_1 = $f;
+    this.v29_1 = $f;
   }
   function Companion_1() {
     Companion_instance_1 = this;
   }
-  protoOf(Companion_1).s29 = function (f) {
+  protoOf(Companion_1).w29 = function (f) {
     return new DIBinding$Copier$Companion$invoke$1(f);
   };
   var Companion_instance_1;
@@ -835,7 +801,7 @@
   function SingletonReference() {
     SingletonReference_instance = this;
   }
-  protoOf(SingletonReference).b2a = function (creator) {
+  protoOf(SingletonReference).f2a = function (creator) {
     var value = creator();
     return new Reference(value, SingletonReference$make$lambda(value));
   };
@@ -846,21 +812,21 @@
     return SingletonReference_instance;
   }
   function Reference(current, next) {
-    this.c2a_1 = current;
-    this.d2a_1 = next;
+    this.g2a_1 = current;
+    this.h2a_1 = next;
   }
   protoOf(Reference).t3 = function () {
-    return this.c2a_1;
+    return this.g2a_1;
   };
   protoOf(Reference).u3 = function () {
-    return this.d2a_1;
+    return this.h2a_1;
   };
   protoOf(Reference).toString = function () {
-    return 'Reference(current=' + this.c2a_1 + ', next=' + this.d2a_1 + ')';
+    return 'Reference(current=' + this.g2a_1 + ', next=' + this.h2a_1 + ')';
   };
   protoOf(Reference).hashCode = function () {
-    var result = hashCode(this.c2a_1);
-    result = imul(result, 31) + hashCode(this.d2a_1) | 0;
+    var result = hashCode(this.g2a_1);
+    result = imul(result, 31) + hashCode(this.h2a_1) | 0;
     return result;
   };
   protoOf(Reference).equals = function (other) {
@@ -869,9 +835,9 @@
     if (!(other instanceof Reference))
       return false;
     var tmp0_other_with_cast = other instanceof Reference ? other : THROW_CCE();
-    if (!equals(this.c2a_1, tmp0_other_with_cast.c2a_1))
+    if (!equals(this.g2a_1, tmp0_other_with_cast.g2a_1))
       return false;
-    if (!equals(this.d2a_1, tmp0_other_with_cast.d2a_1))
+    if (!equals(this.h2a_1, tmp0_other_with_cast.h2a_1))
       return false;
     return true;
   };
@@ -879,157 +845,128 @@
   }
   function ScopeRegistry() {
   }
+  function NoScope() {
+    this.l2a_1 = new StandardScopeRegistry();
+  }
+  protoOf(NoScope).m2a = function (context) {
+    return this.l2a_1;
+  };
+  protoOf(NoScope).n2a = function (context) {
+    return this.m2a((context == null ? true : isObject(context)) ? context : THROW_CCE());
+  };
   function StandardScopeRegistry() {
     ScopeRegistry.call(this);
-    this.h2a_1 = newConcurrentMap();
-    this.i2a_1 = new Object();
+    this.o2a_1 = newConcurrentMap();
+    this.p2a_1 = new Object();
   }
-  protoOf(StandardScopeRegistry).g2a = function (key, sync, creator) {
+  protoOf(StandardScopeRegistry).k2a = function (key, sync, creator) {
     var tmp$ret$2;
     $l$block_1: {
       // Inline function 'org.kodein.di.internal.synchronizedIfNull' call
-      var tmp0_synchronizedIfNull = sync ? this.i2a_1 : null;
-      var tmp$ret$0;
+      sync && this.p2a_1;
       // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-      var tmp0_safe_receiver = this.h2a_1.t1(key);
-      tmp$ret$0 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver();
-      var tmp0_safe_receiver_0 = tmp$ret$0;
+      var tmp0_safe_receiver = this.o2a_1.t1(key);
+      var tmp0_safe_receiver_0 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver();
       if (tmp0_safe_receiver_0 == null)
         null;
       else {
-        var tmp$ret$3;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
-        var tmp$ret$1;
         // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-        tmp$ret$1 = tmp0_safe_receiver_0;
-        tmp$ret$2 = tmp$ret$1;
+        tmp$ret$2 = tmp0_safe_receiver_0;
         break $l$block_1;
       }
-      var tmp$ret$8;
       // Inline function 'org.kodein.di.internal.maySynchronized' call
       var tmp$ret$5;
       $l$block_0: {
         // Inline function 'org.kodein.di.internal.synchronizedIfNull.<anonymous>' call
-        var tmp$ret$4;
         // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-        var tmp0_safe_receiver_1 = this.h2a_1.t1(key);
-        tmp$ret$4 = tmp0_safe_receiver_1 == null ? null : tmp0_safe_receiver_1();
-        var tmp0_safe_receiver_2 = tmp$ret$4;
+        var tmp0_safe_receiver_1 = this.o2a_1.t1(key);
+        var tmp0_safe_receiver_2 = tmp0_safe_receiver_1 == null ? null : tmp0_safe_receiver_1();
         if (tmp0_safe_receiver_2 == null)
           null;
         else {
-          var tmp$ret$6;
           // Inline function 'kotlin.let' call
           // Inline function 'kotlin.contracts.contract' call
           tmp$ret$5 = tmp0_safe_receiver_2;
           break $l$block_0;
         }
-        var tmp$ret$7;
         // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
         var tmp0_container = creator();
         var current = tmp0_container.t3();
         var next = tmp0_container.u3();
         // Inline function 'kotlin.collections.set' call
-        var tmp0_set = this.h2a_1;
-        tmp0_set.v3(key, next);
-        tmp$ret$7 = current;
-        tmp$ret$2 = tmp$ret$7;
+        this.o2a_1.v3(key, next);
+        tmp$ret$2 = current;
         break $l$block_1;
       }
-      tmp$ret$8 = tmp$ret$5;
-      var value = tmp$ret$8;
-      var tmp$ret$9;
+      var value = tmp$ret$5;
       // Inline function 'org.kodein.di.bindings.StandardScopeRegistry.getOrCreate.<anonymous>' call
-      tmp$ret$9 = value;
-      tmp$ret$2 = tmp$ret$9;
+      tmp$ret$2 = value;
     }
     return tmp$ret$2;
   };
-  function NoScope() {
-    this.j2a_1 = new StandardScopeRegistry();
-  }
-  protoOf(NoScope).k2a = function (context) {
-    return this.j2a_1;
-  };
-  protoOf(NoScope).l2a = function (context) {
-    return this.k2a((context == null ? true : isObject(context)) ? context : THROW_CCE());
-  };
   function toKContext(_this__u8e3s4, di, ctx) {
-    var tmp0_safe_receiver = _this__u8e3s4.f2a(di, ctx);
+    var tmp0_safe_receiver = _this__u8e3s4.j2a(di, ctx);
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
-      var tmp$ret$1;
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$0;
       // Inline function 'org.kodein.di.bindings.toKContext.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_1().t28(_this__u8e3s4.e2a(), tmp0_safe_receiver);
-      tmp$ret$1 = tmp$ret$0;
-      tmp = tmp$ret$1;
+      tmp = Companion_getInstance_1().x28(_this__u8e3s4.i2a(), tmp0_safe_receiver);
     }
     return tmp;
   }
   function CompositeContextTranslator(src, dst) {
-    this.m2a_1 = src;
-    this.n2a_1 = dst;
+    this.q2a_1 = src;
+    this.r2a_1 = dst;
   }
-  protoOf(CompositeContextTranslator).w29 = function () {
-    return this.m2a_1.w29();
+  protoOf(CompositeContextTranslator).a2a = function () {
+    return this.q2a_1.a2a();
   };
-  protoOf(CompositeContextTranslator).e2a = function () {
-    return this.n2a_1.e2a();
+  protoOf(CompositeContextTranslator).i2a = function () {
+    return this.r2a_1.i2a();
   };
-  protoOf(CompositeContextTranslator).f2a = function (di, ctx) {
-    var tmp0_safe_receiver = this.m2a_1.f2a(di, ctx);
+  protoOf(CompositeContextTranslator).j2a = function (di, ctx) {
+    var tmp0_safe_receiver = this.q2a_1.j2a(di, ctx);
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
-      var tmp$ret$1;
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$0;
       // Inline function 'org.kodein.di.bindings.CompositeContextTranslator.translate.<anonymous>' call
-      tmp$ret$0 = this.n2a_1.f2a(di, tmp0_safe_receiver);
-      tmp$ret$1 = tmp$ret$0;
-      tmp = tmp$ret$1;
+      tmp = this.r2a_1.j2a(di, tmp0_safe_receiver);
     }
     return tmp;
   };
   protoOf(CompositeContextTranslator).toString = function () {
-    return '(' + this.m2a_1 + ' -> ' + this.n2a_1 + ')';
+    return '(' + this.q2a_1 + ' -> ' + this.r2a_1 + ')';
   };
   function factoryName($this, params) {
-    var tmp$ret$2;
     // Inline function 'kotlin.text.buildString' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$1;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = StringBuilder_init_$Create$();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.bindings.Singleton.factoryName.<anonymous>' call
     tmp0_apply.f8('singleton');
-    var tmp$ret$0;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    tmp$ret$0 = !params.l();
-    if (tmp$ret$0) {
+    if (!params.l()) {
       tmp0_apply.f8(joinToString(params, ', ', '(', ')'));
     }
-    tmp$ret$1 = tmp0_apply;
-    tmp$ret$2 = tmp$ret$1.toString();
-    return tmp$ret$2;
+    return tmp0_apply.toString();
   }
   function Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi) {
     return function () {
-      return this$0.t2a_1(new NoArgBindingDIWrap($bindingDi));
+      return this$0.x2a_1(new NoArgBindingDIWrap($bindingDi));
     };
   }
   function Singleton$getFactory$lambda$lambda(this$0, $bindingDi) {
     return function () {
-      return this$0.u2a_1.b2a(Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi));
+      return this$0.y2a_1.f2a(Singleton$getFactory$lambda$lambda$lambda(this$0, $bindingDi));
     };
   }
   function Singleton$getFactory$lambda($lateInitRegistry, this$0, $bindingDi) {
@@ -1039,7 +976,7 @@
       if (tmp0_elvis_lhs == null) {
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = this$0.o2a_1.l2a($bindingDi.t4());
+        var tmp0_also = this$0.s2a_1.n2a($bindingDi.t4());
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'org.kodein.di.bindings.Singleton.getFactory.<anonymous>.<anonymous>' call
         $lateInitRegistry._v = tmp0_also;
@@ -1049,98 +986,97 @@
         tmp = tmp0_elvis_lhs;
       }
       var registry = tmp;
-      var tmp_0 = registry.g2a(this$0.v2a_1, this$0.s2a_1, Singleton$getFactory$lambda$lambda(this$0, $bindingDi));
+      var tmp_0 = registry.k2a(this$0.z2a_1, this$0.w2a_1, Singleton$getFactory$lambda$lambda(this$0, $bindingDi));
       return isObject(tmp_0) ? tmp_0 : THROW_CCE();
     };
   }
   function Singleton$copier$lambda(this$0) {
     return function (it) {
-      return new Singleton(this$0.o2a_1, this$0.p2a_1, this$0.q2a_1, this$0.r2a_1, this$0.u2a_1, this$0.s2a_1, this$0.t2a_1);
+      return new Singleton(this$0.s2a_1, this$0.t2a_1, this$0.u2a_1, this$0.v2a_1, this$0.y2a_1, this$0.w2a_1, this$0.x2a_1);
     };
   }
   function Singleton(scope, contextType, explicitContext, createdType, refMaker, sync, creator) {
     refMaker = refMaker === VOID ? null : refMaker;
     sync = sync === VOID ? true : sync;
-    this.o2a_1 = scope;
-    this.p2a_1 = contextType;
-    this.q2a_1 = explicitContext;
-    this.r2a_1 = createdType;
-    this.s2a_1 = sync;
-    this.t2a_1 = creator;
+    this.s2a_1 = scope;
+    this.t2a_1 = contextType;
+    this.u2a_1 = explicitContext;
+    this.v2a_1 = createdType;
+    this.w2a_1 = sync;
+    this.x2a_1 = creator;
     var tmp = this;
-    var tmp0_elvis_lhs = refMaker;
-    tmp.u2a_1 = tmp0_elvis_lhs == null ? SingletonReference_getInstance() : tmp0_elvis_lhs;
-    this.v2a_1 = new ScopeKey(new Object(), Unit_getInstance());
+    tmp.y2a_1 = refMaker == null ? SingletonReference_getInstance() : refMaker;
+    this.z2a_1 = new ScopeKey(new Object(), Unit_getInstance());
     var tmp_0 = this;
     var tmp_1 = Companion_getInstance_2();
-    tmp_0.w2a_1 = tmp_1.s29(Singleton$copier$lambda(this));
+    tmp_0.a2b_1 = tmp_1.w29(Singleton$copier$lambda(this));
   }
-  protoOf(Singleton).v29 = function () {
-    return this.o2a_1;
+  protoOf(Singleton).z29 = function () {
+    return this.s2a_1;
   };
-  protoOf(Singleton).w29 = function () {
-    return this.p2a_1;
+  protoOf(Singleton).a2a = function () {
+    return this.t2a_1;
   };
-  protoOf(Singleton).y29 = function () {
-    return this.r2a_1;
+  protoOf(Singleton).c2a = function () {
+    return this.v2a_1;
   };
-  protoOf(Singleton).t29 = function () {
+  protoOf(Singleton).x29 = function () {
     var params = ArrayList_init_$Create$_0(2);
-    if (!equals(this.u2a_1, SingletonReference_getInstance())) {
-      params.a('ref = ' + erasedOf(this.u2a_1).s26());
+    if (!equals(this.y2a_1, SingletonReference_getInstance())) {
+      params.a('ref = ' + erasedOf(this.y2a_1).w26());
     }
     return factoryName(this, params);
   };
-  protoOf(Singleton).u29 = function () {
+  protoOf(Singleton).y29 = function () {
     var params = ArrayList_init_$Create$_0(2);
-    if (!equals(this.u2a_1, SingletonReference_getInstance())) {
-      params.a('ref = ' + erasedOf(this.u2a_1).u26());
+    if (!equals(this.y2a_1, SingletonReference_getInstance())) {
+      params.a('ref = ' + erasedOf(this.y2a_1).y26());
     }
     return factoryName(this, params);
   };
-  protoOf(Singleton).x2a = function (key, di) {
+  protoOf(Singleton).b2b = function (key, di) {
     var lateInitRegistry = {_v: null};
-    var bindingDi = this.q2a_1 ? di : di.y2a();
+    var bindingDi = this.u2a_1 ? di : di.c2b();
     return Singleton$getFactory$lambda(lateInitRegistry, this, bindingDi);
   };
-  protoOf(Singleton).a2a = function (key, di) {
-    return this.x2a(key, di);
+  protoOf(Singleton).e2a = function (key, di) {
+    return this.b2b(key, di);
   };
   function Provider$getFactory$lambda(this$0, $di) {
     return function (_anonymous_parameter_0__qggqh8) {
-      return this$0.b2b_1(new NoArgBindingDIWrap($di));
+      return this$0.f2b_1(new NoArgBindingDIWrap($di));
     };
   }
   function Provider(contextType, createdType, creator) {
-    this.z2a_1 = contextType;
-    this.a2b_1 = createdType;
-    this.b2b_1 = creator;
+    this.d2b_1 = contextType;
+    this.e2b_1 = createdType;
+    this.f2b_1 = creator;
   }
-  protoOf(Provider).w29 = function () {
-    return this.z2a_1;
+  protoOf(Provider).a2a = function () {
+    return this.d2b_1;
   };
-  protoOf(Provider).y29 = function () {
-    return this.a2b_1;
+  protoOf(Provider).c2a = function () {
+    return this.e2b_1;
   };
-  protoOf(Provider).t29 = function () {
+  protoOf(Provider).x29 = function () {
     return 'provider';
   };
-  protoOf(Provider).x2a = function (key, di) {
+  protoOf(Provider).b2b = function (key, di) {
     return Provider$getFactory$lambda(this, di);
   };
-  protoOf(Provider).a2a = function (key, di) {
-    return this.x2a(key, di);
+  protoOf(Provider).e2a = function (key, di) {
+    return this.b2b(key, di);
   };
   function ScopeKey(scopeId, arg) {
-    this.c2b_1 = scopeId;
-    this.d2b_1 = arg;
+    this.g2b_1 = scopeId;
+    this.h2b_1 = arg;
   }
   protoOf(ScopeKey).toString = function () {
-    return 'ScopeKey(scopeId=' + toString_0(this.c2b_1) + ', arg=' + this.d2b_1 + ')';
+    return 'ScopeKey(scopeId=' + toString_0(this.g2b_1) + ', arg=' + this.h2b_1 + ')';
   };
   protoOf(ScopeKey).hashCode = function () {
-    var result = hashCode(this.c2b_1);
-    result = imul(result, 31) + (this.d2b_1 == null ? 0 : hashCode(this.d2b_1)) | 0;
+    var result = hashCode(this.g2b_1);
+    result = imul(result, 31) + (this.h2b_1 == null ? 0 : hashCode(this.h2b_1)) | 0;
     return result;
   };
   protoOf(ScopeKey).equals = function (other) {
@@ -1149,95 +1085,88 @@
     if (!(other instanceof ScopeKey))
       return false;
     var tmp0_other_with_cast = other instanceof ScopeKey ? other : THROW_CCE();
-    if (!equals(this.c2b_1, tmp0_other_with_cast.c2b_1))
+    if (!equals(this.g2b_1, tmp0_other_with_cast.g2b_1))
       return false;
-    if (!equals(this.d2b_1, tmp0_other_with_cast.d2b_1))
+    if (!equals(this.h2b_1, tmp0_other_with_cast.h2b_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.j2b_1 = ArrayList_init_$Create$();
-    this.k2b_1 = Companion_getInstance_0().i28_1;
-    this.l2b_1 = Companion_getInstance_0().j28_1;
+    this.n2b_1 = ArrayList_init_$Create$();
+    this.o2b_1 = Companion_getInstance_0().m28_1;
+    this.p2b_1 = Companion_getInstance_0().n28_1;
   }
-  protoOf(DIMainBuilderImpl).d29 = function () {
-    return this.j2b_1;
+  protoOf(DIMainBuilderImpl).h29 = function () {
+    return this.n2b_1;
   };
-  protoOf(DIMainBuilderImpl).m2b = function () {
-    return this.k2b_1;
+  protoOf(DIMainBuilderImpl).q2b = function () {
+    return this.o2b_1;
   };
-  protoOf(DIMainBuilderImpl).n2b = function () {
-    return this.l2b_1;
+  protoOf(DIMainBuilderImpl).r2b = function () {
+    return this.p2b_1;
   };
   function TypeBinder($outer, type, tag, overrides) {
-    this.y2b_1 = $outer;
-    this.v2b_1 = type;
-    this.w2b_1 = tag;
-    this.x2b_1 = overrides;
+    this.c2c_1 = $outer;
+    this.z2b_1 = type;
+    this.a2c_1 = tag;
+    this.b2c_1 = overrides;
   }
-  protoOf(TypeBinder).t2b = function () {
-    return this.y2b_1.t2b();
+  protoOf(TypeBinder).x2b = function () {
+    return this.c2c_1.x2b();
   };
-  protoOf(TypeBinder).z2b = function (binding) {
-    return this.t2b().e2c(new Key(binding.w29(), binding.x29(), this.v2b_1, this.w2b_1), binding, this.y2b_1.o2b_1, this.x2b_1);
+  protoOf(TypeBinder).d2c = function (binding) {
+    return this.x2b().i2c(new Key(binding.a2a(), binding.b2a(), this.z2b_1, this.a2c_1), binding, this.c2c_1.s2b_1, this.b2c_1);
   };
   function DIBuilderImpl(moduleName, prefix, importedModules, containerBuilder) {
-    this.o2b_1 = moduleName;
-    this.p2b_1 = prefix;
-    this.q2b_1 = importedModules;
-    this.r2b_1 = containerBuilder;
-    this.s2b_1 = Companion_getInstance().e27_1;
+    this.s2b_1 = moduleName;
+    this.t2b_1 = prefix;
+    this.u2b_1 = importedModules;
+    this.v2b_1 = containerBuilder;
+    this.w2b_1 = Companion_getInstance().i27_1;
   }
-  protoOf(DIBuilderImpl).t2b = function () {
-    return this.r2b_1;
+  protoOf(DIBuilderImpl).x2b = function () {
+    return this.v2b_1;
   };
-  protoOf(DIBuilderImpl).w29 = function () {
-    return this.s2b_1;
+  protoOf(DIBuilderImpl).a2a = function () {
+    return this.w2b_1;
   };
-  protoOf(DIBuilderImpl).v29 = function () {
+  protoOf(DIBuilderImpl).z29 = function () {
     return new NoScope();
   };
-  protoOf(DIBuilderImpl).u2b = function () {
+  protoOf(DIBuilderImpl).y2b = function () {
     return false;
   };
-  protoOf(DIBuilderImpl).f28 = function (type, tag, overrides) {
+  protoOf(DIBuilderImpl).j28 = function (type, tag, overrides) {
     return new TypeBinder(this, type, tag, overrides);
   };
-  protoOf(DIBuilderImpl).g28 = function (module_0, allowOverride) {
-    var moduleName = this.p2b_1 + module_0.qg();
+  protoOf(DIBuilderImpl).k28 = function (module_0, allowOverride) {
+    var moduleName = this.t2b_1 + module_0.ug();
     var tmp;
-    var tmp$ret$0;
     // Inline function 'kotlin.text.isNotEmpty' call
-    tmp$ret$0 = charSequenceLength(moduleName) > 0;
-    if (tmp$ret$0) {
-      tmp = this.q2b_1.y(moduleName);
+    if (charSequenceLength(moduleName) > 0) {
+      tmp = this.u2b_1.y(moduleName);
     } else {
       tmp = false;
     }
     if (tmp) {
       throw IllegalStateException_init_$Create$('Module "' + moduleName + '" has already been imported!');
     }
-    var tmp0_this = this;
     // Inline function 'kotlin.collections.plusAssign' call
-    var tmp0_plusAssign = tmp0_this.q2b_1;
-    tmp0_plusAssign.a(moduleName);
-    var tmp$ret$1;
+    this.u2b_1.a(moduleName);
     // Inline function 'kotlin.apply' call
-    var tmp1_apply = new DIBuilderImpl(moduleName, this.p2b_1 + module_0.y27_1, this.q2b_1, this.t2b().f2c(allowOverride, module_0.x27_1));
-    var tmp2_apply = module_0.z27_1;
+    var tmp1_apply = new DIBuilderImpl(moduleName, this.t2b_1 + module_0.c28_1, this.u2b_1, this.x2b().j2c(allowOverride, module_0.b28_1));
     // Inline function 'kotlin.contracts.contract' call
-    tmp2_apply(tmp1_apply);
-    tmp$ret$1 = tmp1_apply;
+    module_0.d28_1(tmp1_apply);
   };
   function DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT() {
     OverrideMode.call(this, 'ALLOW_SILENT', 0);
     OverrideMode_ALLOW_SILENT_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).i2c = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).m2c = function () {
     return true;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).j2c = function (overrides) {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_SILENT).n2c = function (overrides) {
     return overrides;
   };
   var OverrideMode_ALLOW_SILENT_instance;
@@ -1245,22 +1174,21 @@
     OverrideMode.call(this, 'ALLOW_EXPLICIT', 1);
     OverrideMode_ALLOW_EXPLICIT_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).i2c = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).m2c = function () {
     return true;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).j2c = function (overrides) {
-    var tmp0_elvis_lhs = overrides;
-    return tmp0_elvis_lhs == null ? false : tmp0_elvis_lhs;
+  protoOf(DIContainerBuilderImpl$OverrideMode$ALLOW_EXPLICIT).n2c = function (overrides) {
+    return overrides == null ? false : overrides;
   };
   var OverrideMode_ALLOW_EXPLICIT_instance;
   function DIContainerBuilderImpl$OverrideMode$FORBID() {
     OverrideMode.call(this, 'FORBID', 2);
     OverrideMode_FORBID_instance = this;
   }
-  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).i2c = function () {
+  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).m2c = function () {
     return false;
   };
-  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).j2c = function (overrides) {
+  protoOf(DIContainerBuilderImpl$OverrideMode$FORBID).n2c = function (overrides) {
     var tmp;
     if (!(overrides == null) ? overrides : false) {
       throw new OverridingException('Overriding has been forbidden');
@@ -1273,7 +1201,7 @@
   function Companion_2() {
     Companion_instance_2 = this;
   }
-  protoOf(Companion_2).o2c = function (allow, silent) {
+  protoOf(Companion_2).s2c = function (allow, silent) {
     if (!allow)
       return OverrideMode_FORBID_getInstance();
     if (silent)
@@ -1301,18 +1229,14 @@
     Enum.call(this, name, ordinal);
   }
   function checkOverrides($this, key, overrides) {
-    var mustOverride = $this.d2c_1.j2c(overrides);
+    var mustOverride = $this.h2c_1.n2c(overrides);
     if (!(mustOverride == null)) {
       var tmp;
       if (mustOverride) {
-        var tmp$ret$1;
         // Inline function 'kotlin.collections.contains' call
-        var tmp0_contains = $this.a2c_1;
-        var tmp$ret$0;
+        var tmp0_contains = $this.e2c_1;
         // Inline function 'kotlin.collections.containsKey' call
-        tmp$ret$0 = (isInterface(tmp0_contains, Map) ? tmp0_contains : THROW_CCE()).q1(key);
-        tmp$ret$1 = tmp$ret$0;
-        tmp = !tmp$ret$1;
+        tmp = !(isInterface(tmp0_contains, Map) ? tmp0_contains : THROW_CCE()).q1(key);
       } else {
         tmp = false;
       }
@@ -1320,14 +1244,10 @@
         throw new OverridingException('Binding ' + key + ' must override an existing binding.');
       var tmp_0;
       if (!mustOverride) {
-        var tmp$ret$3;
         // Inline function 'kotlin.collections.contains' call
-        var tmp1_contains = $this.a2c_1;
-        var tmp$ret$2;
+        var tmp1_contains = $this.e2c_1;
         // Inline function 'kotlin.collections.containsKey' call
-        tmp$ret$2 = (isInterface(tmp1_contains, Map) ? tmp1_contains : THROW_CCE()).q1(key);
-        tmp$ret$3 = tmp$ret$2;
-        tmp_0 = tmp$ret$3;
+        tmp_0 = (isInterface(tmp1_contains, Map) ? tmp1_contains : THROW_CCE()).q1(key);
       } else {
         tmp_0 = false;
       }
@@ -1336,7 +1256,7 @@
     }
   }
   function checkMatch($this, allowOverride) {
-    if (!$this.d2c_1.i2c() ? allowOverride : false)
+    if (!$this.h2c_1.m2c() ? allowOverride : false)
       throw new OverridingException('Overriding has been forbidden');
   }
   function OverrideMode_ALLOW_SILENT_getInstance() {
@@ -1352,38 +1272,34 @@
     return OverrideMode_FORBID_instance;
   }
   function DIContainerBuilderImpl(allowOverride, silentOverride, bindingsMap, callbacks, translators) {
-    this.a2c_1 = bindingsMap;
-    this.b2c_1 = callbacks;
-    this.c2c_1 = translators;
-    this.d2c_1 = Companion_getInstance_3().o2c(allowOverride, silentOverride);
+    this.e2c_1 = bindingsMap;
+    this.f2c_1 = callbacks;
+    this.g2c_1 = translators;
+    this.h2c_1 = Companion_getInstance_3().s2c(allowOverride, silentOverride);
   }
-  protoOf(DIContainerBuilderImpl).e2c = function (key, binding, fromModule, overrides) {
+  protoOf(DIContainerBuilderImpl).i2c = function (key, binding, fromModule, overrides) {
     checkOverrides(this, key, overrides);
-    var tmp$ret$1;
     // Inline function 'kotlin.collections.getOrPut' call
-    var tmp0_getOrPut = this.a2c_1;
+    var tmp0_getOrPut = this.e2c_1;
     var value = tmp0_getOrPut.t1(key);
     var tmp;
     if (value == null) {
-      var tmp$ret$0;
       // Inline function 'org.kodein.di.internal.DIContainerBuilderImpl.bind.<anonymous>' call
-      tmp$ret$0 = newLinkedList();
-      var answer = tmp$ret$0;
+      var answer = newLinkedList();
       tmp0_getOrPut.v3(key, answer);
       tmp = answer;
     } else {
       tmp = value;
     }
-    tmp$ret$1 = tmp;
-    var bindings = tmp$ret$1;
+    var bindings = tmp;
     bindings.k2(0, new DIDefining(isInterface(binding, DIBinding) ? binding : THROW_CCE(), fromModule));
   };
-  protoOf(DIContainerBuilderImpl).f2c = function (allowOverride, silentOverride) {
+  protoOf(DIContainerBuilderImpl).j2c = function (allowOverride, silentOverride) {
     checkMatch(this, allowOverride);
-    return new DIContainerBuilderImpl(allowOverride, silentOverride, this.a2c_1, this.b2c_1, this.c2c_1);
+    return new DIContainerBuilderImpl(allowOverride, silentOverride, this.e2c_1, this.f2c_1, this.g2c_1);
   };
   function displayString($this, key, overrideLevel) {
-    var descProp = $this.u2c_1 ? bindFullDescription$factory_0(key) : bindDescription$factory_0(key);
+    var descProp = $this.y2c_1 ? bindFullDescription$factory_0(key) : bindDescription$factory_0(key);
     return !(overrideLevel === 0) ? 'overridden ' + descProp.get() : descProp.get();
   }
   function recursiveLoop($this, node, firstKey, firstOverrideLevel, tail) {
@@ -1395,18 +1311,15 @@
     $l$1: do {
       $l$0: do {
         var tmp;
-        if (node_0.t2c_1 == null ? true : firstKey_0.equals(node_0.r2c_1) ? firstOverrideLevel_0 === node_0.s2c_1 : false) {
-          tmp = plus(listOf(displayString($this_0, node_0.r2c_1, node_0.s2c_1)), tail_0);
+        if (node_0.x2c_1 == null ? true : firstKey_0.equals(node_0.v2c_1) ? firstOverrideLevel_0 === node_0.w2c_1 : false) {
+          tmp = plus(listOf(displayString($this_0, node_0.v2c_1, node_0.w2c_1)), tail_0);
         } else {
           var tmp0 = $this_0;
-          var tmp1 = node_0.t2c_1;
-          var tmp2 = firstKey_0;
-          var tmp3 = firstOverrideLevel_0;
-          var tmp4 = plus(listOf(displayString($this_0, node_0.r2c_1, node_0.s2c_1)), tail_0);
+          var tmp4 = plus(listOf(displayString($this_0, node_0.v2c_1, node_0.w2c_1)), tail_0);
           $this_0 = tmp0;
-          node_0 = tmp1;
-          firstKey_0 = tmp2;
-          firstOverrideLevel_0 = tmp3;
+          node_0 = node_0.x2c_1;
+          firstKey_0 = firstKey_0;
+          firstOverrideLevel_0 = firstOverrideLevel_0;
           tail_0 = tmp4;
           continue $l$0;
         }
@@ -1424,19 +1337,15 @@
     $l$1: do {
       $l$0: do {
         var tmp;
-        if (node_0.r2c_1.equals(searchedKey_0) ? node_0.s2c_1 === searchedOverrideLevel_0 : false) {
+        if (node_0.v2c_1.equals(searchedKey_0) ? node_0.w2c_1 === searchedOverrideLevel_0 : false) {
           tmp = false;
-        } else if (node_0.t2c_1 == null) {
+        } else if (node_0.x2c_1 == null) {
           tmp = true;
         } else {
-          var tmp0 = $this_0;
-          var tmp1 = node_0.t2c_1;
-          var tmp2 = searchedKey_0;
-          var tmp3 = searchedOverrideLevel_0;
-          $this_0 = tmp0;
-          node_0 = tmp1;
-          searchedKey_0 = tmp2;
-          searchedOverrideLevel_0 = tmp3;
+          $this_0 = $this_0;
+          node_0 = node_0.x2c_1;
+          searchedKey_0 = searchedKey_0;
+          searchedOverrideLevel_0 = searchedOverrideLevel_0;
           continue $l$0;
         }
         return tmp;
@@ -1446,14 +1355,14 @@
      while (true);
   }
   function DIContainerImpl_init_$Init$(builder, externalSources, fullDescriptionOnError, fullContainerTreeOnError, runCallbacks, $this) {
-    DIContainerImpl.call($this, new DITreeImpl(builder.a2c_1, externalSources, builder.c2c_1), null, fullDescriptionOnError, fullContainerTreeOnError);
+    DIContainerImpl.call($this, new DITreeImpl(builder.e2c_1, externalSources, builder.g2c_1), null, fullDescriptionOnError, fullContainerTreeOnError);
     var init = DIContainerImpl$_init_$lambda_r6ib3j($this, builder);
     if (runCallbacks)
       init();
     else {
       var lock = new Object();
       var tmp = $this;
-      tmp.z2c_1 = DIContainerImpl$_init_$lambda_r6ib3j_0($this, init);
+      tmp.d2d_1 = DIContainerImpl$_init_$lambda_r6ib3j_0($this, init);
     }
     return $this;
   }
@@ -1461,14 +1370,14 @@
     return DIContainerImpl_init_$Init$(builder, externalSources, fullDescriptionOnError, fullContainerTreeOnError, runCallbacks, objectCreate(protoOf(DIContainerImpl)));
   }
   function Node(key, overrideLevel, parent, fullDescriptionOnError) {
-    this.r2c_1 = key;
-    this.s2c_1 = overrideLevel;
-    this.t2c_1 = parent;
-    this.u2c_1 = fullDescriptionOnError;
+    this.v2c_1 = key;
+    this.w2c_1 = overrideLevel;
+    this.x2c_1 = parent;
+    this.y2c_1 = fullDescriptionOnError;
   }
-  protoOf(Node).a2d = function (searchedKey, searchedOverrideLevel) {
+  protoOf(Node).e2d = function (searchedKey, searchedOverrideLevel) {
     if (!recursiveCheck(this, this, searchedKey, searchedOverrideLevel)) {
-      var list = plus_0(recursiveLoop(this, this, searchedKey, searchedOverrideLevel, emptyList()), displayString(this, searchedKey, this.s2c_1));
+      var list = plus_0(recursiveLoop(this, this, searchedKey, searchedOverrideLevel, emptyList()), displayString(this, searchedKey, this.w2c_1));
       var sb = StringBuilder_init_$Create$();
       // Inline function 'kotlin.collections.forEachIndexed' call
       var index = 0;
@@ -1478,25 +1387,19 @@
         // Inline function 'org.kodein.di.internal.Node.check.<anonymous>' call
         var tmp1 = index;
         index = tmp1 + 1 | 0;
-        var tmp0__anonymous__q1qw7t = checkIndexOverflow(tmp1);
+        var tmp0_anonymous = checkIndexOverflow(tmp1);
         sb.f8('  ');
-        var tmp0_subject = tmp0__anonymous__q1qw7t;
-        switch (tmp0_subject) {
+        switch (tmp0_anonymous) {
           case 0:
             sb.f8('   ');
-            ;
             break;
           case 1:
             sb.f8('  \u2554\u2569>');
-            ;
             break;
           default:
             sb.f8('  \u2551');
-            ;
-            sb.f8(repeat('  ', tmp0__anonymous__q1qw7t - 1 | 0));
-            ;
+            sb.f8(repeat('  ', tmp0_anonymous - 1 | 0));
             sb.f8('\u255A>');
-            ;
             break;
         }
         sb.f8(item);
@@ -1509,13 +1412,13 @@
     }
   };
   function bindingDI($this, key, context, tree, overrideLevel) {
-    var container = new DIContainerImpl(tree, new Node(key, overrideLevel, $this.w2c_1, $this.x2c_1), $this.x2c_1, $this.y2c_1);
+    var container = new DIContainerImpl(tree, new Node(key, overrideLevel, $this.a2d_1, $this.b2d_1), $this.b2d_1, $this.c2d_1);
     return new BindingDIImpl(new DirectDIImpl(container, context), key, overrideLevel);
   }
   function DIContainerImpl$_init_$lambda_r6ib3j(this$0, $builder) {
     return function () {
       var direct = new DirectDIImpl(this$0, get_AnyDIContext());
-      var tmp0_forEach = $builder.b2c_1;
+      var tmp0_forEach = $builder.f2c_1;
       var tmp0_iterator = tmp0_forEach.f();
       while (tmp0_iterator.g()) {
         var element = tmp0_iterator.h();
@@ -1527,40 +1430,43 @@
   }
   function DIContainerImpl$_init_$lambda_r6ib3j_0(this$0, $init) {
     return function () {
-      var tmp$ret$1;
+      var tmp$ret$2;
       $l$block_1: {
         // Inline function 'org.kodein.di.internal.synchronizedIfNotNull' call
-        var tmp0_synchronizedIfNotNull = initCallbacks$factory(this$0);
-        if (tmp0_synchronizedIfNotNull() == null) {
-          var tmp$ret$0;
+        var tmp$ret$0;
+        tmp$ret$0 = this$0.d2d_1;
+        if (tmp$ret$0 == null) {
+          var tmp$ret$1;
           // Inline function 'org.kodein.di.internal.DIContainerImpl.<init>.<anonymous>.<anonymous>' call
-          tmp$ret$0 = Unit_getInstance();
-          tmp$ret$1 = tmp$ret$0;
+          tmp$ret$1 = Unit_getInstance();
+          tmp$ret$2 = tmp$ret$1;
           break $l$block_1;
         }
-        var tmp$ret$3;
+        var tmp$ret$5;
         // Inline function 'org.kodein.di.internal.maySynchronized' call
-        var tmp$ret$2;
+        var tmp$ret$4;
         $l$block_0: {
           // Inline function 'org.kodein.di.internal.synchronizedIfNotNull.<anonymous>' call
-          var tmp0_elvis_lhs = tmp0_synchronizedIfNotNull();
+          var tmp$ret$3;
+          tmp$ret$3 = this$0.d2d_1;
+          var tmp0_elvis_lhs = tmp$ret$3;
           var tmp;
           if (tmp0_elvis_lhs == null) {
-            tmp$ret$2 = Unit_getInstance();
+            tmp$ret$4 = Unit_getInstance();
             break $l$block_0;
           } else {
             tmp = tmp0_elvis_lhs;
           }
           var value = tmp;
-          this$0.z2c_1 = null;
-          tmp$ret$1 = $init();
+          this$0.d2d_1 = null;
+          tmp$ret$2 = $init();
           break $l$block_1;
         }
-        tmp$ret$3 = tmp$ret$2;
-        var tmp$ret$4;
+        tmp$ret$5 = tmp$ret$4;
+        var tmp$ret$6;
         // Inline function 'org.kodein.di.internal.DIContainerImpl.<init>.<anonymous>.<anonymous>' call
-        tmp$ret$4 = Unit_getInstance();
-        tmp$ret$1 = tmp$ret$4;
+        tmp$ret$6 = Unit_getInstance();
+        tmp$ret$2 = tmp$ret$6;
       }
       return Unit_getInstance();
     };
@@ -1572,200 +1478,156 @@
     return description($this$null, it);
   }
   function DIContainerImpl(tree, node, fullDescriptionOnError, fullContainerTreeOnError) {
-    this.v2c_1 = tree;
-    this.w2c_1 = node;
-    this.x2c_1 = fullDescriptionOnError;
-    this.y2c_1 = fullContainerTreeOnError;
-    this.z2c_1 = null;
-  }
-  protoOf(DIContainerImpl).z28 = function (key, context, overrideLevel) {
-    var result = this.v2c_1.f29(key, overrideLevel);
+    this.z2c_1 = tree;
+    this.a2d_1 = node;
+    this.b2d_1 = fullDescriptionOnError;
+    this.c2d_1 = fullContainerTreeOnError;
+    this.d2d_1 = null;
+  }
+  protoOf(DIContainerImpl).d29 = function (key, context, overrideLevel) {
+    var result = this.z2c_1.j29(key, overrideLevel);
     if (result.i() === 1) {
       var tmp0_container = result.k(0);
       var definition = tmp0_container.u3();
       var translator = tmp0_container.d9();
-      var tmp1_safe_receiver = this.w2c_1;
+      var tmp1_safe_receiver = this.a2d_1;
       if (tmp1_safe_receiver == null)
         null;
       else {
-        tmp1_safe_receiver.a2d(key, overrideLevel);
+        tmp1_safe_receiver.e2d(key, overrideLevel);
       }
-      var tmp = Companion_getInstance_1().t28(key.o27_1, context);
+      var tmp = Companion_getInstance_1().x28(key.s27_1, context);
       var originalContext = isInterface(tmp, DIContext) ? tmp : THROW_CCE();
-      var tmp2_safe_receiver = translator;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : toKContext(tmp2_safe_receiver, new DirectDIImpl(this, originalContext), context);
+      var tmp3_elvis_lhs = translator == null ? null : toKContext(translator, new DirectDIImpl(this, originalContext), context);
       var kContext = tmp3_elvis_lhs == null ? originalContext : tmp3_elvis_lhs;
-      if (key instanceof Key)
-        key;
-      else
+      if (!(key instanceof Key))
         THROW_CCE();
-      var bindingDI_0 = bindingDI(this, key, kContext, definition.l27_1, overrideLevel);
-      return definition.m27_1.a2a(key, bindingDI_0);
+      var bindingDI_0 = bindingDI(this, key, kContext, definition.p27_1, overrideLevel);
+      return definition.q27_1.e2a(key, bindingDI_0);
     }
-    var bindingDI_1 = bindingDI(this, key, Companion_getInstance_1().t28(key.o27_1, context), this.v2c_1, overrideLevel);
+    var bindingDI_1 = bindingDI(this, key, Companion_getInstance_1().x28(key.s27_1, context), this.z2c_1, overrideLevel);
     // Inline function 'kotlin.collections.forEach' call
-    var tmp0_forEach = this.v2c_1.d29();
-    var tmp0_iterator = tmp0_forEach.f();
+    var tmp0_iterator = this.z2c_1.h29().f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
       // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      var tmp0_safe_receiver = element.b2d(bindingDI_1, key);
+      var tmp0_safe_receiver = element.f2d(bindingDI_1, key);
       if (tmp0_safe_receiver == null)
         null;
       else {
-        var tmp$ret$0;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
-        var tmp0_safe_receiver_0 = this.w2c_1;
+        var tmp0_safe_receiver_0 = this.a2d_1;
         if (tmp0_safe_receiver_0 == null)
           null;
         else {
-          tmp0_safe_receiver_0.a2d(key, overrideLevel);
+          tmp0_safe_receiver_0.e2d(key, overrideLevel);
         }
         return (!(tmp0_safe_receiver == null) ? typeof tmp0_safe_receiver === 'function' : false) ? tmp0_safe_receiver : THROW_CCE();
       }
     }
     var withOverrides = !(overrideLevel === 0);
-    var descProp = this.x2c_1 ? fullDescription$factory_0(key) : description$factory_0(key);
+    var descProp = this.b2d_1 ? fullDescription$factory_0(key) : description$factory_0(key);
     var tmp_0;
-    if (this.x2c_1) {
+    if (this.b2d_1) {
       tmp_0 = DIContainerImpl$factory$lambda;
     } else {
       tmp_0 = DIContainerImpl$factory$lambda_0;
     }
     var descFun = tmp_0;
     if (result.l()) {
-      var tmp$ret$7;
       // Inline function 'kotlin.text.buildString' call
       // Inline function 'kotlin.contracts.contract' call
-      var tmp$ret$6;
       // Inline function 'kotlin.apply' call
-      var tmp1_apply = StringBuilder_init_$Create$();
+      var tmp0_apply = StringBuilder_init_$Create$();
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      tmp1_apply.f8('No binding found for ' + descProp.get());
-      if (this.y2c_1) {
-        var tmp$ret$1;
+      tmp0_apply.f8('No binding found for ' + descProp.get());
+      if (this.c2d_1) {
         // Inline function 'kotlin.text.appendLine' call
-        tmp$ret$1 = tmp1_apply.j7(_Char___init__impl__6a9atx(10));
-        var forType = this.v2c_1.g29(new SearchSpecs(VOID, VOID, key.q27_1));
-        var tmp$ret$2;
+        tmp0_apply.j7(_Char___init__impl__6a9atx(10));
+        var forType = this.z2c_1.k29(new SearchSpecs(VOID, VOID, key.u27_1));
         // Inline function 'kotlin.collections.isNotEmpty' call
-        tmp$ret$2 = !forType.l();
-        if (tmp$ret$2) {
-          var tmp$ret$5;
+        if (!forType.l()) {
           // Inline function 'kotlin.collections.associate' call
           var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(forType, 10)), 16);
-          var tmp$ret$4;
           // Inline function 'kotlin.collections.associateTo' call
-          var tmp1_associateTo = LinkedHashMap_init_$Create$_0(capacity);
+          var tmp0_associateTo = LinkedHashMap_init_$Create$_0(capacity);
           var tmp0_iterator_0 = forType.f();
           while (tmp0_iterator_0.g()) {
             var element_0 = tmp0_iterator_0.h();
             // Inline function 'kotlin.collections.plusAssign' call
-            var tmp$ret$3;
             // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>.<anonymous>' call
-            tmp$ret$3 = to(element_0.a9_1, element_0.b9_1);
-            var tmp0_plusAssign = tmp$ret$3;
-            tmp1_associateTo.v3(tmp0_plusAssign.r3_1, tmp0_plusAssign.s3_1);
+            var tmp0_plusAssign = to(element_0.a9_1, element_0.b9_1);
+            tmp0_associateTo.v3(tmp0_plusAssign.r3_1, tmp0_plusAssign.s3_1);
           }
-          tmp$ret$4 = tmp1_associateTo;
-          tmp$ret$5 = tmp$ret$4;
-          tmp1_apply.f8('Available bindings for this type:\n' + descFun(tmp$ret$5, withOverrides));
+          tmp0_apply.f8('Available bindings for this type:\n' + descFun(tmp0_associateTo, withOverrides));
         }
-        tmp1_apply.f8('Registered in this DI container:\n' + descFun(this.v2c_1.c29(), withOverrides));
+        tmp0_apply.f8('Registered in this DI container:\n' + descFun(this.z2c_1.g29(), withOverrides));
       }
-      tmp$ret$6 = tmp1_apply;
-      tmp$ret$7 = tmp$ret$6.toString();
-      var description = tmp$ret$7;
+      var description = tmp0_apply.toString();
       throw new NotFoundException(key, description);
     }
-    var tmp$ret$10;
     // Inline function 'kotlin.collections.associate' call
     var capacity_0 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(result, 10)), 16);
-    var tmp$ret$9;
     // Inline function 'kotlin.collections.associateTo' call
-    var tmp3_associateTo = LinkedHashMap_init_$Create$_0(capacity_0);
+    var tmp0_associateTo_0 = LinkedHashMap_init_$Create$_0(capacity_0);
     var tmp0_iterator_1 = result.f();
     while (tmp0_iterator_1.g()) {
       var element_1 = tmp0_iterator_1.h();
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp$ret$8;
       // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      tmp$ret$8 = to(element_1.a9_1, ensureNotNull(this.v2c_1.h29(element_1.a9_1)).b9_1);
-      var tmp2_plusAssign = tmp$ret$8;
-      tmp3_associateTo.v3(tmp2_plusAssign.r3_1, tmp2_plusAssign.s3_1);
+      var tmp0_plusAssign_0 = to(element_1.a9_1, ensureNotNull(this.z2c_1.l29(element_1.a9_1)).b9_1);
+      tmp0_associateTo_0.v3(tmp0_plusAssign_0.r3_1, tmp0_plusAssign_0.s3_1);
     }
-    tmp$ret$9 = tmp3_associateTo;
-    tmp$ret$10 = tmp$ret$9;
-    var potentials = tmp$ret$10;
-    var tmp$ret$15;
+    var potentials = tmp0_associateTo_0;
     // Inline function 'kotlin.collections.filter' call
-    var tmp5_filter = this.v2c_1.c29();
-    var tmp$ret$14;
+    var tmp1_filter = this.z2c_1.g29();
     // Inline function 'kotlin.collections.filterTo' call
-    var tmp4_filterTo = LinkedHashMap_init_$Create$();
-    var tmp$ret$11;
+    var tmp0_filterTo = LinkedHashMap_init_$Create$();
     // Inline function 'kotlin.collections.iterator' call
-    tmp$ret$11 = tmp5_filter.o().f();
-    var tmp0_iterator_2 = tmp$ret$11;
+    var tmp0_iterator_2 = tmp1_filter.o().f();
     while (tmp0_iterator_2.g()) {
       var element_2 = tmp0_iterator_2.h();
-      var tmp$ret$13;
       // Inline function 'org.kodein.di.internal.DIContainerImpl.factory.<anonymous>' call
-      var tmp$ret$12;
       // Inline function 'kotlin.collections.component1' call
-      tmp$ret$12 = element_2.h1();
-      var key_0 = tmp$ret$12;
-      tmp$ret$13 = !potentials.u1().y(key_0);
-      if (tmp$ret$13) {
-        tmp4_filterTo.v3(element_2.h1(), element_2.j1());
+      var key_0 = element_2.h1();
+      if (!potentials.u1().y(key_0)) {
+        tmp0_filterTo.v3(element_2.h1(), element_2.j1());
       }
     }
-    tmp$ret$14 = tmp4_filterTo;
-    tmp$ret$15 = tmp$ret$14;
-    var others = tmp$ret$15;
+    var others = tmp0_filterTo;
     throw new NotFoundException(key, '' + potentials.i() + ' bindings found that match ' + key + ':\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.v27();
+      return $b0.z27();
     }, null);
   }
   function bindDescription$factory_0($b0) {
     return getPropertyCallableRef('bindDescription', 0, KProperty0, function () {
-      return $b0.t27();
+      return $b0.x27();
     }, null);
   }
   function fullDescription$factory_0($b0) {
     return getPropertyCallableRef('fullDescription', 0, KProperty0, function () {
-      return $b0.w27();
+      return $b0.a28();
     }, null);
   }
   function description$factory_0($b0) {
     return getPropertyCallableRef('description', 0, KProperty0, function () {
-      return $b0.u27();
+      return $b0.y27();
     }, null);
   }
-  function initCallbacks$factory($b0) {
-    return getPropertyCallableRef('initCallbacks', 0, KMutableProperty0, function () {
-      return $b0.z2c_1;
-    }, function (value) {
-      $b0.z2c_1 = value;
-      return Unit_getInstance();
-    });
-  }
   function newBuilder($this, allowSilentOverride, init) {
-    var tmp$ret$0;
     // Inline function 'kotlin.apply' call
     var tmp0_apply = new DIMainBuilderImpl(allowSilentOverride);
     // Inline function 'kotlin.contracts.contract' call
     init(tmp0_apply);
-    tmp$ret$0 = tmp0_apply;
-    return tmp$ret$0;
+    return tmp0_apply;
   }
   function DIImpl_init_$Init$(builder, runCallbacks, $this) {
-    DIImpl.call($this, DIContainerImpl_init_$Create$(builder.t2b(), builder.d29(), builder.m2b(), builder.n2b(), runCallbacks));
+    DIImpl.call($this, DIContainerImpl_init_$Create$(builder.x2b(), builder.h29(), builder.q2b(), builder.r2b(), runCallbacks));
     return $this;
   }
   function DIImpl_init_$Init$_0(allowSilentOverride, init, $this) {
@@ -1788,81 +1650,79 @@
   function DIImpl$container$delegate$lambda(this$0) {
     return function () {
       var tmp;
-      if (!(this$0.c2d_1.z2c_1 == null)) {
+      if (!(this$0.g2d_1.d2d_1 == null)) {
         throw IllegalStateException_init_$Create$('DI has not been initialized');
       }
-      return this$0.c2d_1;
+      return this$0.g2d_1;
     };
   }
   function DIImpl(_container) {
     Companion_getInstance_4();
-    this.c2d_1 = _container;
+    this.g2d_1 = _container;
     var tmp = this;
-    tmp.d2d_1 = lazy(DIImpl$container$delegate$lambda(this));
+    tmp.h2d_1 = lazy(DIImpl$container$delegate$lambda(this));
   }
-  protoOf(DIImpl).n28 = function () {
-    var tmp$ret$0;
+  protoOf(DIImpl).r28 = function () {
     // Inline function 'kotlin.getValue' call
-    var tmp0_getValue = container$factory();
-    tmp$ret$0 = this.d2d_1.j1();
-    return tmp$ret$0;
+    container$factory();
+    return this.h2d_1.j1();
   };
   function BindingDIImpl(directDI, key, overrideLevel) {
-    this.e2d_1 = directDI;
-    this.f2d_1 = key;
-    this.g2d_1 = overrideLevel;
+    this.i2d_1 = directDI;
+    this.j2d_1 = key;
+    this.k2d_1 = overrideLevel;
   }
-  protoOf(BindingDIImpl).o29 = function () {
-    return this.e2d_1;
+  protoOf(BindingDIImpl).s29 = function () {
+    return this.i2d_1;
   };
-  protoOf(BindingDIImpl).m28 = function () {
-    return this.e2d_1.m28();
+  protoOf(BindingDIImpl).q28 = function () {
+    return this.i2d_1.q28();
   };
-  protoOf(BindingDIImpl).i29 = function () {
-    return this.e2d_1.i29();
+  protoOf(BindingDIImpl).m29 = function () {
+    return this.i2d_1.m29();
   };
-  protoOf(BindingDIImpl).p29 = function (type, tag) {
-    return this.e2d_1.p29(type, tag);
+  protoOf(BindingDIImpl).t29 = function (type, tag) {
+    return this.i2d_1.t29(type, tag);
   };
-  protoOf(BindingDIImpl).q29 = function (context) {
-    return this.e2d_1.q29(context);
+  protoOf(BindingDIImpl).u29 = function (context) {
+    return this.i2d_1.u29(context);
   };
   protoOf(BindingDIImpl).t4 = function () {
-    var tmp = this.o29().m28().o28().j1();
+    var tmp = this.s29().q28().s28().j1();
     return isObject(tmp) ? tmp : THROW_CCE();
   };
-  protoOf(BindingDIImpl).y2a = function () {
-    return new BindingDIImpl(this.o29().q29(ErasedContext_getInstance()), this.f2d_1, this.g2d_1);
+  protoOf(BindingDIImpl).c2b = function () {
+    return new BindingDIImpl(this.s29().u29(ErasedContext_getInstance()), this.j2d_1, this.k2d_1);
   };
   function container$factory() {
     return getPropertyCallableRef('container', 1, KProperty1, function (receiver) {
-      return receiver.n28();
+      return receiver.r28();
     }, null);
   }
   function findBySpecs($this, specs) {
-    var bindSeq = asSequence($this.k2d_1);
-    var specsBindType = specs.l29_1;
-    if (!(specsBindType == null) ? !equals(specsBindType, Companion_getInstance().e27_1) : false) {
+    var bindSeq = asSequence($this.o2d_1);
+    var specsBindType = specs.p29_1;
+    if (!(specsBindType == null) ? !equals(specsBindType, Companion_getInstance().i27_1) : false) {
       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.j29_1;
+    var specsContextType = specs.n29_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.k29_1;
+    var specsArgType = specs.o29_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.m29_1;
+    var specsTag = specs.q29_1;
     if (!equals(specsTag, NoDefinedTag_getInstance())) {
       var tmp_5 = tagSeq;
       tagSeq = filter(tmp_5, DITreeImpl$findBySpecs$lambda_5(specsTag));
@@ -1872,9 +1732,9 @@
     return toList(resultSeq);
   }
   function notInMap($this, result, request) {
-    var tmp = result.c28();
-    var tmp_0 = request.c28();
-    var tmp_1 = $this.j2d_1.u1();
+    var tmp = result.g28();
+    var tmp_0 = request.g28();
+    var tmp_1 = $this.n2d_1.u1();
     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) {
@@ -1883,14 +1743,12 @@
       // Inline function 'kotlin.collections.component1' call
       tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.h1();
       var bindType = tmp$ret$0;
-      return bindType.n2d($specsBindType);
+      return bindType.r2d($specsBindType);
     };
   }
   function DITreeImpl$findBySpecs$lambda_0(_name_for_destructuring_parameter_0__wldtmu) {
-    var tmp$ret$0;
     // Inline function 'kotlin.collections.component2' call
-    tmp$ret$0 = _name_for_destructuring_parameter_0__wldtmu.j1();
-    var contextTree = tmp$ret$0;
+    var contextTree = _name_for_destructuring_parameter_0__wldtmu.j1();
     var tmp = asSequence(contextTree);
     return map(tmp, DITreeImpl$findBySpecs$lambda$lambda);
   }
@@ -1902,19 +1760,19 @@
       var tmp0_container = triple;
       var contextType = tmp0_container.t3();
       var tmp;
-      if (contextType.n2d($specsContextType)) {
+      if (contextType.r2d($specsContextType)) {
         tmp = triple;
       } else {
         var tmp$ret$1;
         $l$block: {
           // Inline function 'kotlin.collections.firstOrNull' call
-          var tmp0_firstOrNull = this$0.m2d_1;
+          var tmp0_firstOrNull = this$0.q2d_1;
           var tmp0_iterator = tmp0_firstOrNull.f();
           while (tmp0_iterator.g()) {
             var element = tmp0_iterator.h();
             var tmp$ret$0;
             // Inline function 'org.kodein.di.internal.DITreeImpl.findBySpecs.<anonymous>.<anonymous>' call
-            tmp$ret$0 = element.w29().a27($specsContextType) ? contextType.n2d(element.e2a()) : false;
+            tmp$ret$0 = element.a2a().e27($specsContextType) ? contextType.r2d(element.i2a()) : false;
             if (tmp$ret$0) {
               tmp$ret$1 = element;
               break $l$block;
@@ -1942,7 +1800,7 @@
   function DITreeImpl$findBySpecs$lambda_3($specsArgType) {
     return function (_name_for_destructuring_parameter_0__wldtmu) {
       var argType = _name_for_destructuring_parameter_0__wldtmu.t3();
-      return argType.n2d($specsArgType);
+      return argType.r2d($specsArgType);
     };
   }
   function DITreeImpl$findBySpecs$lambda_4(_name_for_destructuring_parameter_0__wldtmu) {
@@ -1968,33 +1826,25 @@
     return to(key, translator);
   }
   function DITreeImpl$notInMap$lambda(it) {
-    return it.c28();
+    return it.g28();
   }
   function DITreeImpl(map, externalSources, registeredTranslators) {
-    this.h2d_1 = externalSources;
-    this.i2d_1 = registeredTranslators;
-    this.j2d_1 = newConcurrentMap();
-    this.k2d_1 = HashMap_init_$Create$();
-    this.m2d_1 = ArrayList_init_$Create$_1(this.i2d_1);
+    this.l2d_1 = externalSources;
+    this.m2d_1 = registeredTranslators;
+    this.n2d_1 = newConcurrentMap();
+    this.o2d_1 = HashMap_init_$Create$();
+    this.q2d_1 = ArrayList_init_$Create$_1(this.m2d_1);
     // Inline function 'kotlin.collections.forEach' call
-    var tmp$ret$0;
     // Inline function 'kotlin.collections.iterator' call
-    tmp$ret$0 = map.o().f();
-    var tmp0_iterator = tmp$ret$0;
+    var tmp0_iterator = map.o().f();
     while (tmp0_iterator.g()) {
       var element = tmp0_iterator.h();
       // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
-      var tmp$ret$1;
       // Inline function 'kotlin.collections.component1' call
-      tmp$ret$1 = element.h1();
-      var key = tmp$ret$1;
-      var tmp$ret$2;
+      var key = element.h1();
       // Inline function 'kotlin.collections.component2' call
-      tmp$ret$2 = element.j1();
-      var bindings = tmp$ret$2;
-      var tmp$ret$5;
+      var bindings = element.j1();
       // Inline function 'kotlin.collections.map' call
-      var tmp$ret$4;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(bindings, 10));
       var tmp0_iterator_0 = bindings.f();
@@ -2002,121 +1852,97 @@
         var item = tmp0_iterator_0.h();
         var tmp$ret$3;
         // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
-        var tmp0_subject = item;
         var tmp;
-        if (tmp0_subject instanceof DIDefinition) {
+        if (item instanceof DIDefinition) {
           tmp = item;
         } else {
-          tmp = new DIDefinition(item.m27_1, item.n27_1, this);
+          tmp = new DIDefinition(item.q27_1, item.r27_1, this);
         }
         tmp$ret$3 = tmp;
         tmp0_mapTo.a(tmp$ret$3);
       }
-      tmp$ret$4 = tmp0_mapTo;
-      tmp$ret$5 = tmp$ret$4;
-      var definitions = tmp$ret$5;
+      var definitions = tmp0_mapTo;
       // Inline function 'kotlin.collections.set' call
-      var tmp1_set = this.j2d_1;
-      var tmp2_set = new Triple(key, definitions, null);
-      tmp1_set.v3(key, tmp2_set);
-      var typeChecker = first(bindings).m27_1.z29() ? new Down(key.q27_1) : new Up(key.q27_1);
-      var tmp$ret$7;
+      var tmp0_set = this.n2d_1;
+      var tmp1_set = new Triple(key, definitions, null);
+      tmp0_set.v3(key, tmp1_set);
+      var typeChecker = first(bindings).q27_1.d2a() ? new Down(key.u27_1) : new Up(key.u27_1);
       // Inline function 'kotlin.collections.getOrPut' call
-      var tmp3_getOrPut = this.k2d_1;
-      var value = tmp3_getOrPut.t1(typeChecker);
+      var tmp2_getOrPut = this.o2d_1;
+      var value = tmp2_getOrPut.t1(typeChecker);
       var tmp_0;
       if (value == null) {
-        var tmp$ret$6;
         // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
-        tmp$ret$6 = HashMap_init_$Create$();
-        var answer = tmp$ret$6;
-        tmp3_getOrPut.v3(typeChecker, answer);
+        var answer = HashMap_init_$Create$();
+        tmp2_getOrPut.v3(typeChecker, answer);
         tmp_0 = answer;
       } else {
         tmp_0 = value;
       }
-      tmp$ret$7 = tmp_0;
-      var contextTree = tmp$ret$7;
-      var tmp$ret$9;
+      var contextTree = tmp_0;
       // Inline function 'kotlin.collections.getOrPut' call
-      var tmp4_getOrPut = new Down(key.o27_1);
-      var value_0 = contextTree.t1(tmp4_getOrPut);
+      var tmp3_getOrPut = new Down(key.s27_1);
+      var value_0 = contextTree.t1(tmp3_getOrPut);
       var tmp_1;
       if (value_0 == null) {
-        var tmp$ret$8;
         // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
-        tmp$ret$8 = HashMap_init_$Create$();
-        var answer_0 = tmp$ret$8;
-        contextTree.v3(tmp4_getOrPut, answer_0);
+        var answer_0 = HashMap_init_$Create$();
+        contextTree.v3(tmp3_getOrPut, answer_0);
         tmp_1 = answer_0;
       } else {
         tmp_1 = value_0;
       }
-      tmp$ret$9 = tmp_1;
-      var argumentTree = tmp$ret$9;
-      var tmp$ret$11;
+      var argumentTree = tmp_1;
       // Inline function 'kotlin.collections.getOrPut' call
-      var tmp5_getOrPut = new Down(key.p27_1);
-      var value_1 = argumentTree.t1(tmp5_getOrPut);
+      var tmp4_getOrPut = new Down(key.t27_1);
+      var value_1 = argumentTree.t1(tmp4_getOrPut);
       var tmp_2;
       if (value_1 == null) {
-        var tmp$ret$10;
         // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>.<anonymous>' call
-        tmp$ret$10 = HashMap_init_$Create$();
-        var answer_1 = tmp$ret$10;
-        argumentTree.v3(tmp5_getOrPut, answer_1);
+        var answer_1 = HashMap_init_$Create$();
+        argumentTree.v3(tmp4_getOrPut, answer_1);
         tmp_2 = answer_1;
       } else {
         tmp_2 = value_1;
       }
-      tmp$ret$11 = tmp_2;
-      var tagTree = tmp$ret$11;
+      var tagTree = tmp_2;
       // Inline function 'kotlin.collections.set' call
-      var tmp6_set = key.r27_1;
-      tagTree.v3(tmp6_set, key);
+      var tmp5_set = key.v27_1;
+      tagTree.v3(tmp5_set, key);
     }
     var tmp_3 = this;
-    var tmp$ret$16;
     // Inline function 'kotlin.collections.mapValues' call
-    var tmp2_mapValues = this.j2d_1;
-    var tmp$ret$15;
+    var tmp0_mapValues = this.n2d_1;
     // Inline function 'kotlin.collections.mapValuesTo' call
-    var tmp1_mapValuesTo = LinkedHashMap_init_$Create$_0(mapCapacity(tmp2_mapValues.i()));
-    var tmp$ret$14;
+    var tmp0_mapValuesTo = LinkedHashMap_init_$Create$_0(mapCapacity(tmp0_mapValues.i()));
     // Inline function 'kotlin.collections.associateByTo' call
-    var tmp0_associateByTo = tmp2_mapValues.o();
-    var tmp0_iterator_1 = tmp0_associateByTo.f();
+    var tmp0_iterator_1 = tmp0_mapValues.o().f();
     while (tmp0_iterator_1.g()) {
       var element_0 = tmp0_iterator_1.h();
-      var tmp$ret$12;
       // Inline function 'kotlin.collections.mapValuesTo.<anonymous>' call
-      tmp$ret$12 = element_0.h1();
-      var tmp_4 = tmp$ret$12;
+      var tmp_4 = element_0.h1();
       var tmp$ret$13;
       // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
       tmp$ret$13 = element_0.j1().b9_1;
-      tmp1_mapValuesTo.v3(tmp_4, tmp$ret$13);
+      tmp0_mapValuesTo.v3(tmp_4, tmp$ret$13);
     }
-    tmp$ret$14 = tmp1_mapValuesTo;
-    tmp$ret$15 = tmp$ret$14;
-    tmp$ret$16 = tmp$ret$15;
-    tmp_3.l2d_1 = HashMap_init_$Create$_0(tmp$ret$16);
+    tmp_3.p2d_1 = HashMap_init_$Create$_0(tmp0_mapValuesTo);
     $l$loop: while (true) {
       var added = ArrayList_init_$Create$();
-      var tmp0_iterator_2 = this.m2d_1.f();
+      var tmp0_iterator_2 = this.q2d_1.f();
       while (tmp0_iterator_2.g()) {
         var src = tmp0_iterator_2.h();
-        var tmp1_iterator = this.m2d_1.f();
+        var tmp1_iterator = this.q2d_1.f();
         while (tmp1_iterator.g()) {
           var dst = tmp1_iterator.h();
-          if (dst.w29().a27(src.e2a()) ? !equals(src.w29(), dst.e2a()) : false) {
+          if (dst.a2a().e27(src.i2a()) ? !equals(src.a2a(), dst.i2a()) : false) {
             var tmp$ret$17;
             $l$block_0: {
               // Inline function 'kotlin.collections.none' call
-              var tmp3_none = this.m2d_1;
+              var tmp1_none = this.q2d_1;
               var tmp_5;
-              if (isInterface(tmp3_none, Collection)) {
-                tmp_5 = tmp3_none.l();
+              if (isInterface(tmp1_none, Collection)) {
+                tmp_5 = tmp1_none.l();
               } else {
                 tmp_5 = false;
               }
@@ -2124,13 +1950,11 @@
                 tmp$ret$17 = true;
                 break $l$block_0;
               }
-              var tmp0_iterator_3 = tmp3_none.f();
+              var tmp0_iterator_3 = tmp1_none.f();
               while (tmp0_iterator_3.g()) {
                 var element_1 = tmp0_iterator_3.h();
-                var tmp$ret$18;
                 // Inline function 'org.kodein.di.internal.DITreeImpl.<anonymous>' call
-                tmp$ret$18 = equals(element_1.w29(), src.w29()) ? equals(element_1.e2a(), dst.e2a()) : false;
-                if (tmp$ret$18) {
+                if (equals(element_1.a2a(), src.a2a()) ? equals(element_1.i2a(), dst.i2a()) : false) {
                   tmp$ret$17 = false;
                   break $l$block_0;
                 }
@@ -2140,33 +1964,31 @@
             if (tmp$ret$17) {
               // Inline function 'kotlin.collections.plusAssign' call
               var tmp_6 = isInterface(src, ContextTranslator) ? src : THROW_CCE();
-              var tmp4_plusAssign = new CompositeContextTranslator(tmp_6, isInterface(dst, ContextTranslator) ? dst : THROW_CCE());
-              added.a(tmp4_plusAssign);
+              var tmp2_plusAssign = new CompositeContextTranslator(tmp_6, isInterface(dst, ContextTranslator) ? dst : THROW_CCE());
+              added.a(tmp2_plusAssign);
             }
           }
         }
       }
-      var tmp2_this = this;
       // Inline function 'kotlin.collections.plusAssign' call
-      var tmp5_plusAssign = tmp2_this.m2d_1;
-      addAll(tmp5_plusAssign, added);
+      var tmp3_plusAssign = this.q2d_1;
+      addAll(tmp3_plusAssign, added);
       if (added.l())
         break $l$loop;
     }
   }
-  protoOf(DITreeImpl).d29 = function () {
-    return this.h2d_1;
-  };
-  protoOf(DITreeImpl).c29 = function () {
+  protoOf(DITreeImpl).h29 = function () {
     return this.l2d_1;
   };
-  protoOf(DITreeImpl).e29 = function (key, overrideLevel, all) {
+  protoOf(DITreeImpl).g29 = function () {
+    return this.p2d_1;
+  };
+  protoOf(DITreeImpl).i29 = function (key, overrideLevel, all) {
     if (!all) {
-      var tmp0_safe_receiver = this.j2d_1.t1(key);
+      var tmp0_safe_receiver = this.n2d_1.t1(key);
       if (tmp0_safe_receiver == null)
         null;
       else {
-        var tmp$ret$0;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
         var realKey = tmp0_safe_receiver.t3();
@@ -2184,29 +2006,24 @@
         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.o27_1, Companion_getInstance().e27_1)) {
-        var anyContextKey = key.e28(Companion_getInstance().e27_1);
-        var tmp1_safe_receiver = this.j2d_1.t1(anyContextKey);
+      if (!equals(key.s27_1, Companion_getInstance().i27_1)) {
+        var anyContextKey = key.i28(Companion_getInstance().i27_1);
+        var tmp1_safe_receiver = this.n2d_1.t1(anyContextKey);
         if (tmp1_safe_receiver == null)
           null;
         else {
-          var tmp$ret$2;
           // Inline function 'kotlin.let' call
           // Inline function 'kotlin.contracts.contract' call
-          var tmp$ret$1;
           $l$block: {
             // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-            var tmp0_container = tmp1_safe_receiver;
-            var realKey_0 = tmp0_container.t3();
-            var list_0 = tmp0_container.u3();
-            var translator_0 = tmp0_container.d9();
-            if (!(translator_0 == null) ? !equals(translator_0.w29(), key.o27_1) : false) {
-              tmp$ret$1 = Unit_getInstance();
+            var realKey_0 = tmp1_safe_receiver.t3();
+            var list_0 = tmp1_safe_receiver.u3();
+            var translator_0 = tmp1_safe_receiver.d9();
+            if (!(translator_0 == null) ? !equals(translator_0.a2a(), key.s27_1) : false) {
               break $l$block;
             }
             // Inline function 'kotlin.collections.set' call
-            var tmp0_set = this.j2d_1;
-            tmp0_set.v3(key, tmp1_safe_receiver);
+            this.n2d_1.v3(key, tmp1_safe_receiver);
             var tmp1_elvis_lhs = getOrNull(list_0, overrideLevel);
             var tmp_2;
             if (tmp1_elvis_lhs == null) {
@@ -2219,92 +2036,71 @@
             var tmp_4 = definition_0 instanceof DIDefinition ? definition_0 : THROW_CCE();
             return listOf(new Triple(tmp_3, tmp_4, (translator_0 == null ? true : isInterface(translator_0, ContextTranslator)) ? translator_0 : THROW_CCE()));
           }
-          tmp$ret$2 = tmp$ret$1;
         }
       }
-      var tmp$ret$5;
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = this.m2d_1;
-      var tmp$ret$4;
+      var tmp0_filter = this.q2d_1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
-      var tmp0_iterator = tmp1_filter.f();
+      var tmp0_iterator = tmp0_filter.f();
       while (tmp0_iterator.g()) {
         var element = tmp0_iterator.h();
-        var tmp$ret$3;
         // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-        tmp$ret$3 = equals(element.w29(), key.o27_1);
-        if (tmp$ret$3) {
+        if (equals(element.a2a(), key.s27_1)) {
           tmp0_filterTo.a(element);
         }
       }
-      tmp$ret$4 = tmp0_filterTo;
-      tmp$ret$5 = tmp$ret$4;
-      var tmp_5 = tmp$ret$5;
-      var tmp$ret$8;
+      var tmp_5 = tmp0_filterTo;
       // Inline function 'kotlin.collections.filter' call
-      var tmp3_filter = this.m2d_1;
-      var tmp$ret$7;
+      var tmp1_filter = this.q2d_1;
       // Inline function 'kotlin.collections.filterTo' call
-      var tmp2_filterTo = ArrayList_init_$Create$();
-      var tmp0_iterator_0 = tmp3_filter.f();
+      var tmp0_filterTo_0 = ArrayList_init_$Create$();
+      var tmp0_iterator_0 = tmp1_filter.f();
       while (tmp0_iterator_0.g()) {
         var element_0 = tmp0_iterator_0.h();
-        var tmp$ret$6;
         // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-        tmp$ret$6 = equals(element_0.w29(), Companion_getInstance().e27_1);
-        if (tmp$ret$6) {
-          tmp2_filterTo.a(element_0);
+        if (equals(element_0.a2a(), Companion_getInstance().i27_1)) {
+          tmp0_filterTo_0.a(element_0);
         }
       }
-      tmp$ret$7 = tmp2_filterTo;
-      tmp$ret$8 = tmp$ret$7;
-      var applicableTranslators = plus(tmp_5, tmp$ret$8);
+      var applicableTranslators = plus(tmp_5, tmp0_filterTo_0);
       var tmp2_iterator = applicableTranslators.f();
       while (tmp2_iterator.g()) {
         var translator_1 = tmp2_iterator.h();
-        var translatedKey = new Key(translator_1.e2a(), key.p27_1, key.q27_1, key.r27_1);
-        var tmp3_safe_receiver = this.j2d_1.t1(translatedKey);
+        var translatedKey = new Key(translator_1.i2a(), key.t27_1, key.u27_1, key.v27_1);
+        var tmp3_safe_receiver = this.n2d_1.t1(translatedKey);
         var tmp_6;
         if (tmp3_safe_receiver == null) {
           tmp_6 = null;
         } else {
-          var tmp$ret$10;
           // Inline function 'kotlin.takeIf' call
           // Inline function 'kotlin.contracts.contract' call
           var tmp_7;
-          var tmp$ret$9;
           // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
-          tmp$ret$9 = tmp3_safe_receiver.c9_1 == null;
-          if (tmp$ret$9) {
+          if (tmp3_safe_receiver.c9_1 == null) {
             tmp_7 = tmp3_safe_receiver;
           } else {
             tmp_7 = null;
           }
-          tmp$ret$10 = tmp_7;
-          tmp_6 = tmp$ret$10;
+          tmp_6 = tmp_7;
         }
         var tmp4_safe_receiver = tmp_6;
         if (tmp4_safe_receiver == null)
           null;
         else {
-          var tmp$ret$12;
           // Inline function 'kotlin.let' call
           // Inline function 'kotlin.contracts.contract' call
-          var tmp$ret$11;
           $l$block_0: {
             // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
             if (!(tmp4_safe_receiver.c9_1 == null)) {
-              tmp$ret$11 = Unit_getInstance();
               break $l$block_0;
             }
             // Inline function 'kotlin.collections.set' call
-            var tmp0_set_0 = this.j2d_1;
+            var tmp0_set = this.n2d_1;
             var tmp1_set = tmp4_safe_receiver.f9(VOID, VOID, translator_1);
-            tmp0_set_0.v3(key, tmp1_set);
-            var tmp0_container_0 = tmp4_safe_receiver;
-            var realKey_1 = tmp0_container_0.t3();
-            var list_1 = tmp0_container_0.u3();
+            tmp0_set.v3(key, tmp1_set);
+            var realKey_1 = tmp4_safe_receiver.t3();
+            var list_1 = tmp4_safe_receiver.u3();
             var tmp1_elvis_lhs_0 = getOrNull(list_1, overrideLevel);
             var tmp_8;
             if (tmp1_elvis_lhs_0 == null) {
@@ -2317,18 +2113,17 @@
             var tmp_10 = definition_1 instanceof DIDefinition ? definition_1 : THROW_CCE();
             return listOf(new Triple(tmp_9, tmp_10, isInterface(translator_1, ContextTranslator) ? translator_1 : THROW_CCE()));
           }
-          tmp$ret$12 = tmp$ret$11;
         }
       }
     }
-    var result = findBySpecs(this, new SearchSpecs(key.o27_1, key.p27_1, key.q27_1, key.r27_1));
+    var result = findBySpecs(this, new SearchSpecs(key.s27_1, key.t27_1, key.u27_1, key.v27_1));
     if (result.i() === 1) {
       var tmp5_container = first(result);
       var realKey_2 = tmp5_container.t3();
       var translator_2 = tmp5_container.u3();
       // Inline function 'kotlin.collections.set' call
-      var tmp4_set = this.j2d_1;
-      var tmp6_safe_receiver = this.j2d_1.t1(realKey_2);
+      var tmp2_set = this.n2d_1;
+      var tmp6_safe_receiver = this.n2d_1.t1(realKey_2);
       var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : tmp6_safe_receiver.f9(VOID, VOID, translator_2);
       var tmp_11;
       if (tmp7_elvis_lhs == null) {
@@ -2336,14 +2131,12 @@
       } else {
         tmp_11 = tmp7_elvis_lhs;
       }
-      var tmp5_set = tmp_11;
-      tmp4_set.v3(key, tmp5_set);
+      var tmp3_set = tmp_11;
+      tmp2_set.v3(key, tmp3_set);
     }
-    var tmp$ret$16;
     // Inline function 'kotlin.collections.mapNotNull' call
-    var tmp$ret$15;
     // Inline function 'kotlin.collections.mapNotNullTo' call
-    var tmp6_mapNotNullTo = ArrayList_init_$Create$();
+    var tmp0_mapNotNullTo = ArrayList_init_$Create$();
     // Inline function 'kotlin.collections.forEach' call
     var tmp0_iterator_1 = result.f();
     while (tmp0_iterator_1.g()) {
@@ -2354,15 +2147,14 @@
         // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
         var realKey_3 = element_1.t3();
         var translator_3 = element_1.u3();
-        var tmp0_elvis_lhs_0 = this.j2d_1.t1(realKey_3);
+        var tmp0_elvis_lhs_0 = this.n2d_1.t1(realKey_3);
         var tmp_12;
         if (tmp0_elvis_lhs_0 == null) {
           throw notInMap(this, realKey_3, key);
         } else {
           tmp_12 = tmp0_elvis_lhs_0;
         }
-        var tmp1_container = tmp_12;
-        var definitions = tmp1_container.u3();
+        var definitions = tmp_12.u3();
         var tmp2_elvis_lhs = getOrNull(definitions, overrideLevel);
         var tmp_13;
         if (tmp2_elvis_lhs == null) {
@@ -2380,22 +2172,16 @@
       if (tmp0_safe_receiver_0 == null)
         null;
       else {
-        var tmp$ret$14;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
-        tmp6_mapNotNullTo.a(tmp0_safe_receiver_0);
-        tmp$ret$14 = Unit_getInstance();
+        tmp0_mapNotNullTo.a(tmp0_safe_receiver_0);
       }
     }
-    tmp$ret$15 = tmp6_mapNotNullTo;
-    tmp$ret$16 = tmp$ret$15;
-    return tmp$ret$16;
+    return tmp0_mapNotNullTo;
   };
-  protoOf(DITreeImpl).g29 = function (search) {
+  protoOf(DITreeImpl).k29 = function (search) {
     var result = findBySpecs(this, search);
-    var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(result, 10));
     var tmp0_iterator = result.f();
@@ -2405,30 +2191,28 @@
       // Inline function 'org.kodein.di.internal.DITreeImpl.find.<anonymous>' call
       var key = item.t3();
       var translator = item.u3();
-      tmp$ret$0 = new Triple(key, ensureNotNull(this.j2d_1.t1(key)).b9_1, translator);
+      tmp$ret$0 = new Triple(key, ensureNotNull(this.n2d_1.t1(key)).b9_1, translator);
       tmp0_mapTo.a(tmp$ret$0);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return tmp$ret$2;
+    return tmp0_mapTo;
   };
-  protoOf(DITreeImpl).h29 = function (key) {
-    var tmp = this.j2d_1.t1(key);
+  protoOf(DITreeImpl).l29 = function (key) {
+    var tmp = this.n2d_1.t1(key);
     return (tmp == null ? true : tmp instanceof Triple) ? tmp : THROW_CCE();
   };
   function Down(type) {
     TypeChecker.call(this);
-    this.o2d_1 = type;
-    this.p2d_1 = equals(this.o2d_1, Companion_getInstance().e27_1);
+    this.s2d_1 = type;
+    this.t2d_1 = equals(this.s2d_1, Companion_getInstance().i27_1);
   }
-  protoOf(Down).n2d = function (other) {
-    return this.p2d_1 ? true : this.o2d_1.a27(other);
+  protoOf(Down).r2d = function (other) {
+    return this.t2d_1 ? true : this.s2d_1.e27(other);
   };
   protoOf(Down).toString = function () {
-    return 'Down(type=' + this.o2d_1 + ')';
+    return 'Down(type=' + this.s2d_1 + ')';
   };
   protoOf(Down).hashCode = function () {
-    return hashCode(this.o2d_1);
+    return hashCode(this.s2d_1);
   };
   protoOf(Down).equals = function (other) {
     if (this === other)
@@ -2436,22 +2220,22 @@
     if (!(other instanceof Down))
       return false;
     var tmp0_other_with_cast = other instanceof Down ? other : THROW_CCE();
-    if (!equals(this.o2d_1, tmp0_other_with_cast.o2d_1))
+    if (!equals(this.s2d_1, tmp0_other_with_cast.s2d_1))
       return false;
     return true;
   };
   function Up(type) {
     TypeChecker.call(this);
-    this.q2d_1 = type;
+    this.u2d_1 = type;
   }
-  protoOf(Up).n2d = function (other) {
-    return equals(other, Companion_getInstance().e27_1) ? true : other.a27(this.q2d_1);
+  protoOf(Up).r2d = function (other) {
+    return equals(other, Companion_getInstance().i27_1) ? true : other.e27(this.u2d_1);
   };
   protoOf(Up).toString = function () {
-    return 'Up(type=' + this.q2d_1 + ')';
+    return 'Up(type=' + this.u2d_1 + ')';
   };
   protoOf(Up).hashCode = function () {
-    return hashCode(this.q2d_1);
+    return hashCode(this.u2d_1);
   };
   protoOf(Up).equals = function (other) {
     if (this === other)
@@ -2459,71 +2243,68 @@
     if (!(other instanceof Up))
       return false;
     var tmp0_other_with_cast = other instanceof Up ? other : THROW_CCE();
-    if (!equals(this.q2d_1, tmp0_other_with_cast.q2d_1))
+    if (!equals(this.u2d_1, tmp0_other_with_cast.u2d_1))
       return false;
     return true;
   };
   function TypeChecker() {
   }
   function DirectDIBaseImpl(container, context) {
-    this.r2d_1 = container;
-    this.s2d_1 = context;
+    this.v2d_1 = container;
+    this.w2d_1 = context;
   }
-  protoOf(DirectDIBaseImpl).n28 = function () {
-    return this.r2d_1;
+  protoOf(DirectDIBaseImpl).r28 = function () {
+    return this.v2d_1;
   };
-  protoOf(DirectDIBaseImpl).o29 = function () {
+  protoOf(DirectDIBaseImpl).s29 = function () {
     return this;
   };
-  protoOf(DirectDIBaseImpl).i29 = function () {
-    var tmp = this.n28();
-    return On(new DIImpl(tmp instanceof DIContainerImpl ? tmp : THROW_CCE()), this.s2d_1);
+  protoOf(DirectDIBaseImpl).m29 = function () {
+    var tmp = this.r28();
+    return On(new DIImpl(tmp instanceof DIContainerImpl ? tmp : THROW_CCE()), this.w2d_1);
   };
-  protoOf(DirectDIBaseImpl).q29 = function (context) {
-    return new DirectDIImpl(this.n28(), context);
+  protoOf(DirectDIBaseImpl).u29 = function (context) {
+    return new DirectDIImpl(this.r28(), context);
   };
-  protoOf(DirectDIBaseImpl).p29 = function (type, tag) {
-    var tmp = this.n28();
+  protoOf(DirectDIBaseImpl).t29 = function (type, tag) {
+    var tmp = this.r28();
     var tmp$ret$0;
     // Inline function 'org.kodein.di.internal.anyType' call
-    var tmp0__get_anyType__cravgl = this.s2d_1;
-    var tmp_0 = tmp0__get_anyType__cravgl.s28();
+    var tmp_0 = this.w2d_1.w28();
     tmp$ret$0 = isInterface(tmp_0, TypeToken) ? tmp_0 : THROW_CCE();
-    return tmp.y28(new Key(tmp$ret$0, Companion_getInstance().d27_1, type, tag), this.s2d_1.j1())();
+    return tmp.c29(new Key(tmp$ret$0, Companion_getInstance().h27_1, type, tag), this.w2d_1.j1())();
   };
   function DIProperty$provideDelegate$lambda($receiver, this$0, $prop) {
     return function () {
       var tmp;
-      if (!($receiver == null) ? this$0.u2d_1 === get_AnyDIContext() : false) {
+      if (!($receiver == null) ? this$0.y2d_1 === get_AnyDIContext() : false) {
         var tmp_0 = Companion_getInstance_1();
         var tmp_1 = erasedOf($receiver);
-        tmp = tmp_0.t28(isInterface(tmp_1, TypeToken) ? tmp_1 : THROW_CCE(), $receiver);
+        tmp = tmp_0.x28(isInterface(tmp_1, TypeToken) ? tmp_1 : THROW_CCE(), $receiver);
       } else {
-        tmp = this$0.u2d_1;
+        tmp = this$0.y2d_1;
       }
       var context = tmp;
-      return this$0.v2d_1(context, $prop.callableName);
+      return this$0.z2d_1(context, $prop.callableName);
     };
   }
   function DIProperty(trigger, originalContext, get) {
-    this.t2d_1 = trigger;
-    this.u2d_1 = originalContext;
-    this.v2d_1 = get;
+    this.x2d_1 = trigger;
+    this.y2d_1 = originalContext;
+    this.z2d_1 = get;
   }
-  protoOf(DIProperty).w2d = function (receiver, prop) {
-    var tmp$ret$0;
+  protoOf(DIProperty).a2e = function (receiver, prop) {
     // Inline function 'kotlin.also' call
     var tmp0_also = lazy(DIProperty$provideDelegate$lambda(receiver, this, prop));
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'org.kodein.di.DIProperty.provideDelegate.<anonymous>' call
-    var tmp0_safe_receiver = this.t2d_1;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.x2d_1;
+    var tmp0_safe_receiver = this.x2d_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b2e_1;
     if (tmp1_safe_receiver == null)
       null;
     else
       tmp1_safe_receiver.a(tmp0_also);
-    tmp$ret$0 = tmp0_also;
-    return tmp$ret$0;
+    return tmp0_also;
   };
   function DirectDIImpl(container, context) {
     DirectDIBaseImpl.call(this, container, context);
@@ -2535,27 +2316,27 @@
     return ArrayList_init_$Create$();
   }
   //region block: post-declaration
-  protoOf(Singleton).x29 = get_argType;
-  protoOf(Singleton).u27 = get_description;
-  protoOf(Singleton).w27 = get_fullDescription;
-  protoOf(Singleton).z29 = get_supportSubTypes;
-  protoOf(Provider).x29 = get_argType;
-  protoOf(Provider).u29 = factoryFullName;
-  protoOf(Provider).v29 = get_scope;
-  protoOf(Provider).u27 = get_description;
-  protoOf(Provider).w27 = get_fullDescription;
-  protoOf(Provider).z29 = get_supportSubTypes;
-  protoOf(DIBuilderImpl).h28 = import$default;
-  protoOf(DIMainBuilderImpl).h28 = import$default;
-  protoOf(DIContainerImpl).a29 = factory$default;
-  protoOf(DIContainerImpl).b29 = provider;
-  protoOf(DIContainerImpl).y28 = provider$default;
-  protoOf(DIImpl).m28 = get_di;
-  protoOf(DIImpl).o28 = get_diContext;
-  protoOf(DIImpl).p28 = get_diTrigger;
-  protoOf(DITreeImpl).f29 = find$default;
-  protoOf(DirectDIBaseImpl).m28 = get_di_0;
-  protoOf(DirectDIImpl).m28 = get_di_0;
+  protoOf(Singleton).b2a = get_argType;
+  protoOf(Singleton).y27 = get_description;
+  protoOf(Singleton).a28 = get_fullDescription;
+  protoOf(Singleton).d2a = get_supportSubTypes;
+  protoOf(Provider).b2a = get_argType;
+  protoOf(Provider).y29 = factoryFullName;
+  protoOf(Provider).z29 = get_scope;
+  protoOf(Provider).y27 = get_description;
+  protoOf(Provider).a28 = get_fullDescription;
+  protoOf(Provider).d2a = get_supportSubTypes;
+  protoOf(DIBuilderImpl).l28 = import$default;
+  protoOf(DIMainBuilderImpl).l28 = import$default;
+  protoOf(DIContainerImpl).e29 = factory$default;
+  protoOf(DIContainerImpl).f29 = provider;
+  protoOf(DIContainerImpl).c29 = provider$default;
+  protoOf(DIImpl).q28 = get_di;
+  protoOf(DIImpl).s28 = get_diContext;
+  protoOf(DIImpl).t28 = get_diTrigger;
+  protoOf(DITreeImpl).j29 = find$default;
+  protoOf(DirectDIBaseImpl).q28 = get_di_0;
+  protoOf(DirectDIImpl).q28 = get_di_0;
   //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};